GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-08 23:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NTB: Add parameters for Intel SNB B2B addresses

Browse source 
Add module parameters for the addresses to be used in B2B topology.

Signed-off-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Allen Hubbe 2015-05-11 05:45:30 -04:00 • committed by Jon Mason
parent 2849b5d706
commit 42fefc86a6
2 changed files with 68 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/ntb.txt
View file

@ -56,3 +56,13 @@ Module Parameters:
* b2b\_mw\_share - If the peer ntb is to be accessed via a memory window, and if * b2b\_mw\_share - If the peer ntb is to be accessed via a memory window, and if
the memory window is large enough, still allow the client to use the the memory window is large enough, still allow the client to use the
second half of the memory window for address translation to the peer. second half of the memory window for address translation to the peer.
* snb\_b2b\_usd\_bar2\_addr64 - If using B2B topology on Xeon hardware, use this
64 bit address on the bus between the NTB devices for the window at
BAR2, on the upstream side of the link.
* snb\_b2b\_usd\_bar4\_addr64 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_usd\_bar4\_addr32 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_usd\_bar5\_addr32 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_dsd\_bar2\_addr64 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_dsd\_bar4\_addr64 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_dsd\_bar4\_addr32 - See *snb\_b2b\_bar2\_addr64*.
* snb\_b2b\_dsd\_bar5\_addr32 - See *snb\_b2b\_bar2\_addr64*.

77
drivers/ntb/hw/intel/ntb_hw_intel.c
View file

@ -72,6 +72,25 @@ MODULE_AUTHOR("Intel Corporation");
#define bar0_off(base, bar) ((base) + ((bar) << 2)) #define bar0_off(base, bar) ((base) + ((bar) << 2))
#define bar2_off(base, bar) bar0_off(base, (bar) - 2) #define bar2_off(base, bar) bar0_off(base, (bar) - 2)
static const struct intel_ntb_reg bwd_reg;
static const struct intel_ntb_alt_reg bwd_pri_reg;
static const struct intel_ntb_alt_reg bwd_sec_reg;
static const struct intel_ntb_alt_reg bwd_b2b_reg;
static const struct intel_ntb_xlat_reg bwd_pri_xlat;
static const struct intel_ntb_xlat_reg bwd_sec_xlat;
static const struct intel_ntb_reg snb_reg;
static const struct intel_ntb_alt_reg snb_pri_reg;
static const struct intel_ntb_alt_reg snb_sec_reg;
static const struct intel_ntb_alt_reg snb_b2b_reg;
static const struct intel_ntb_xlat_reg snb_pri_xlat;
static const struct intel_ntb_xlat_reg snb_sec_xlat;
static struct intel_b2b_addr snb_b2b_usd_addr;
static struct intel_b2b_addr snb_b2b_dsd_addr;
static const struct ntb_dev_ops intel_ntb_ops;
static const struct file_operations intel_ntb_debugfs_info;
static struct dentry *debugfs_dir;
static int b2b_mw_idx = -1; static int b2b_mw_idx = -1;
module_param(b2b_mw_idx, int, 0644); module_param(b2b_mw_idx, int, 0644);
MODULE_PARM_DESC(b2b_mw_idx, "Use this mw idx to access the peer ntb. A " MODULE_PARM_DESC(b2b_mw_idx, "Use this mw idx to access the peer ntb. A "
@ -86,25 +105,45 @@ MODULE_PARM_DESC(b2b_mw_share, "If the b2b mw is large enough, configure the "
"the mw, so the second half can still be used as a mw. Both " "the mw, so the second half can still be used as a mw. Both "
"sides MUST set the same value here!"); "sides MUST set the same value here!");
static const struct intel_ntb_reg bwd_reg; module_param_named(snb_b2b_usd_bar2_addr64,
static const struct intel_ntb_alt_reg bwd_pri_reg; snb_b2b_usd_addr.bar2_addr64, ullong, 0644);
static const struct intel_ntb_alt_reg bwd_sec_reg; MODULE_PARM_DESC(snb_b2b_usd_bar2_addr64,
static const struct intel_ntb_alt_reg bwd_b2b_reg; "SNB B2B USD BAR 2 64-bit address");
static const struct intel_ntb_xlat_reg bwd_pri_xlat;
static const struct intel_ntb_xlat_reg bwd_sec_xlat;
static const struct intel_ntb_reg snb_reg;
static const struct intel_ntb_alt_reg snb_pri_reg;
static const struct intel_ntb_alt_reg snb_sec_reg;
static const struct intel_ntb_alt_reg snb_b2b_reg;
static const struct intel_ntb_xlat_reg snb_pri_xlat;
static const struct intel_ntb_xlat_reg snb_sec_xlat;
static const struct intel_b2b_addr snb_b2b_usd_addr;
static const struct intel_b2b_addr snb_b2b_dsd_addr;
static const struct ntb_dev_ops intel_ntb_ops; module_param_named(snb_b2b_usd_bar4_addr64,
snb_b2b_usd_addr.bar4_addr64, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_usd_bar2_addr64,
"SNB B2B USD BAR 4 64-bit address");
static const struct file_operations intel_ntb_debugfs_info; module_param_named(snb_b2b_usd_bar4_addr32,
static struct dentry *debugfs_dir; snb_b2b_usd_addr.bar4_addr32, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_usd_bar2_addr64,
"SNB B2B USD split-BAR 4 32-bit address");
module_param_named(snb_b2b_usd_bar5_addr32,
snb_b2b_usd_addr.bar5_addr32, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_usd_bar2_addr64,
"SNB B2B USD split-BAR 5 32-bit address");
module_param_named(snb_b2b_dsd_bar2_addr64,
snb_b2b_dsd_addr.bar2_addr64, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_dsd_bar2_addr64,
"SNB B2B DSD BAR 2 64-bit address");
module_param_named(snb_b2b_dsd_bar4_addr64,
snb_b2b_dsd_addr.bar4_addr64, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_dsd_bar2_addr64,
"SNB B2B DSD BAR 4 64-bit address");
module_param_named(snb_b2b_dsd_bar4_addr32,
snb_b2b_dsd_addr.bar4_addr32, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_dsd_bar2_addr64,
"SNB B2B DSD split-BAR 4 32-bit address");
module_param_named(snb_b2b_dsd_bar5_addr32,
snb_b2b_dsd_addr.bar5_addr32, ullong, 0644);
MODULE_PARM_DESC(snb_b2b_dsd_bar2_addr64,
"SNB B2B DSD split-BAR 5 32-bit address");
#ifndef ioread64 #ifndef ioread64
#ifdef readq #ifdef readq
@ -2073,14 +2112,14 @@ static const struct intel_ntb_xlat_reg snb_sec_xlat = {
.bar2_xlat = SNB_SBAR23XLAT_OFFSET, .bar2_xlat = SNB_SBAR23XLAT_OFFSET,
}; };
static const struct intel_b2b_addr snb_b2b_usd_addr = { static struct intel_b2b_addr snb_b2b_usd_addr = {
.bar2_addr64 = SNB_B2B_BAR2_USD_ADDR64, .bar2_addr64 = SNB_B2B_BAR2_USD_ADDR64,
.bar4_addr64 = SNB_B2B_BAR4_USD_ADDR64, .bar4_addr64 = SNB_B2B_BAR4_USD_ADDR64,
.bar4_addr32 = SNB_B2B_BAR4_USD_ADDR32, .bar4_addr32 = SNB_B2B_BAR4_USD_ADDR32,
.bar5_addr32 = SNB_B2B_BAR5_USD_ADDR32, .bar5_addr32 = SNB_B2B_BAR5_USD_ADDR32,
}; };
static const struct intel_b2b_addr snb_b2b_dsd_addr = { static struct intel_b2b_addr snb_b2b_dsd_addr = {
.bar2_addr64 = SNB_B2B_BAR2_DSD_ADDR64, .bar2_addr64 = SNB_B2B_BAR2_DSD_ADDR64,
.bar4_addr64 = SNB_B2B_BAR4_DSD_ADDR64, .bar4_addr64 = SNB_B2B_BAR4_DSD_ADDR64,
.bar4_addr32 = SNB_B2B_BAR4_DSD_ADDR32, .bar4_addr32 = SNB_B2B_BAR4_DSD_ADDR32,