NTB: unify translation addresses

There is no need for the upstream and downstream addresses to be different
for the NTB configs. Go to using a single set of address. It is still
possible to configure them differently using module parameter override
however.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked and Tested-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 865a3e3cc581670bbd78a49166067ae955545de9..a198f82982582a155b230e3964db17b6e01479d1 100644 (file)
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2204,17 +2204,17 @@ static const struct intel_ntb_xlat_reg xeon_sec_xlat = {
 };
 
 static struct intel_b2b_addr xeon_b2b_usd_addr = {
-       .bar2_addr64            = XEON_B2B_BAR2_USD_ADDR64,
-       .bar4_addr64            = XEON_B2B_BAR4_USD_ADDR64,
-       .bar4_addr32            = XEON_B2B_BAR4_USD_ADDR32,
-       .bar5_addr32            = XEON_B2B_BAR5_USD_ADDR32,
+       .bar2_addr64            = XEON_B2B_BAR2_ADDR64,
+       .bar4_addr64            = XEON_B2B_BAR4_ADDR64,
+       .bar4_addr32            = XEON_B2B_BAR4_ADDR32,
+       .bar5_addr32            = XEON_B2B_BAR5_ADDR32,
 };
 
 static struct intel_b2b_addr xeon_b2b_dsd_addr = {
-       .bar2_addr64            = XEON_B2B_BAR2_DSD_ADDR64,
-       .bar4_addr64            = XEON_B2B_BAR4_DSD_ADDR64,
-       .bar4_addr32            = XEON_B2B_BAR4_DSD_ADDR32,
-       .bar5_addr32            = XEON_B2B_BAR5_DSD_ADDR32,
+       .bar2_addr64            = XEON_B2B_BAR2_ADDR64,
+       .bar4_addr64            = XEON_B2B_BAR4_ADDR64,
+       .bar4_addr32            = XEON_B2B_BAR4_ADDR32,
+       .bar5_addr32            = XEON_B2B_BAR5_ADDR32,
 };
 
 /* operations for primary side of local ntb */

diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.h b/drivers/ntb/hw/intel/ntb_hw_intel.h
index ea0612f797df61e9087b101df592d61c9d33e1ef..2eb4addd10d082c03184469619b6bafece08ddde 100644 (file)
--- 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