* [PATCH] NTB: unify translation addresses
@ 2015-09-24 20:03 Dave Jiang
2015-09-24 20:20 ` Allen Hubbe
0 siblings, 1 reply; 3+ messages in thread
From: Dave Jiang @ 2015-09-24 20:03 UTC (permalink / raw)
To: jdmason; +Cc: linux-ntb, allen.hubbe
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>
---
drivers/ntb/hw/intel/ntb_hw_intel.c | 16 ++++++++--------
drivers/ntb/hw/intel/ntb_hw_intel.h | 15 +++++----------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 6e4f7be..c45850a 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2481,17 +2481,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 e261a8b..0e9acd9 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.h
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.h
@@ -228,16 +228,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] NTB: unify translation addresses
2015-09-24 20:03 [PATCH] NTB: unify translation addresses Dave Jiang
@ 2015-09-24 20:20 ` Allen Hubbe
2015-10-05 2:29 ` Jon Mason
0 siblings, 1 reply; 3+ messages in thread
From: Allen Hubbe @ 2015-09-24 20:20 UTC (permalink / raw)
To: 'Dave Jiang', jdmason; +Cc: linux-ntb
From: Dave Jiang [dave.jiang@intel.com]
> 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>
Thanks for leaving in the separately configurable usd/dsd addrs, even though the defaults are now the same.
Acked and (pick one)
Tested-by: Allen Hubbe <Allen.Hubbe@emc.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] NTB: unify translation addresses
2015-09-24 20:20 ` Allen Hubbe
@ 2015-10-05 2:29 ` Jon Mason
0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2015-10-05 2:29 UTC (permalink / raw)
To: Allen Hubbe; +Cc: 'Dave Jiang', linux-ntb
On Thu, Sep 24, 2015 at 04:20:34PM -0400, Allen Hubbe wrote:
> From: Dave Jiang [dave.jiang@intel.com]
> > 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>
>
> Thanks for leaving in the separately configurable usd/dsd addrs, even though the defaults are now the same.
>
> Acked and (pick one)
> Tested-by: Allen Hubbe <Allen.Hubbe@emc.com>
Since this is changing existing behavior, I'm going to push this one
into ntb-next (for 4.4).
Thanks,
Jon
>
> --
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/00c401d0f706%24786a4800%24693ed800%24%40emc.com.
> For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-05 2:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-24 20:03 [PATCH] NTB: unify translation addresses Dave Jiang
2015-09-24 20:20 ` Allen Hubbe
2015-10-05 2:29 ` Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.