diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:07:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:07:50 -0800 |
| commit | 1eb196c3c01f364d6cd3e8c0e16dc4702fdaffd9 (patch) | |
| tree | 1b6ef1cd28b0f172a05e79f0406ab4504f83671b /drivers/ntb/hw/intel/ntb_hw_intel.h | |
| parent | 041c79514af9080c75197078283134f538f46b44 (diff) | |
| parent | fdcb4b2e78220bde95ce4ba3213088e3a1f1cec6 (diff) | |
Merge tag 'ntb-4.4' of git://github.com/jonmason/ntb
Pull NTB bugfixes from Jon Mason:
"NTB Bug fixes for potential NULL pointer accesses, accesses of a freed
pointer, invalid buffer pointer, and a compiler warning.
Also, unification of upstream/downstream addresses"
* tag 'ntb-4.4' of git://github.com/jonmason/ntb:
NTB: fix 32-bit compiler warning
NTB: unify translation addresses
NTB: invalid buf pointer in multi-MW setups
NTB: remove unused variable
NTB: fix access of free-ed pointer
NTB: Fix issue where we may be accessing NULL ptr
Diffstat (limited to 'drivers/ntb/hw/intel/ntb_hw_intel.h')
| -rw-r--r-- | drivers/ntb/hw/intel/ntb_hw_intel.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.h b/drivers/ntb/hw/intel/ntb_hw_intel.h index ea0612f797df..2eb4addd10d0 100644 --- a/drivers/ntb/hw/intel/ntb_hw_intel.h +++ b/drivers/ntb/hw/intel/ntb_hw_intel.h @@ -227,16 +227,11 @@ /* Use the following addresses for translation between b2b ntb devices in case * the hardware default values are not reliable. */ -#define XEON_B2B_BAR0_USD_ADDR 0x1000000000000000ull -#define XEON_B2B_BAR2_USD_ADDR64 0x2000000000000000ull -#define XEON_B2B_BAR4_USD_ADDR64 0x4000000000000000ull -#define XEON_B2B_BAR4_USD_ADDR32 0x20000000u -#define XEON_B2B_BAR5_USD_ADDR32 0x40000000u -#define XEON_B2B_BAR0_DSD_ADDR 0x9000000000000000ull -#define XEON_B2B_BAR2_DSD_ADDR64 0xa000000000000000ull -#define XEON_B2B_BAR4_DSD_ADDR64 0xc000000000000000ull -#define XEON_B2B_BAR4_DSD_ADDR32 0xa0000000u -#define XEON_B2B_BAR5_DSD_ADDR32 0xc0000000u +#define XEON_B2B_BAR0_ADDR 0x1000000000000000ull +#define XEON_B2B_BAR2_ADDR64 0x2000000000000000ull +#define XEON_B2B_BAR4_ADDR64 0x4000000000000000ull +#define XEON_B2B_BAR4_ADDR32 0x20000000u +#define XEON_B2B_BAR5_ADDR32 0x40000000u /* The peer ntb secondary config space is 32KB fixed size */ #define XEON_B2B_MIN_SIZE 0x8000 |