Date: Tue, 20 Oct 2015 01:54:25 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289614 - head/sys/dev/ntb/ntb_hw Message-ID: <201510200154.t9K1sPH2031002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Tue Oct 20 01:54:25 2015 New Revision: 289614 URL: https://svnweb.freebsd.org/changeset/base/289614 Log: NTB: MFV 42fefc86: Add parameters for Intel SNB B2B addresses Add module parameters for the addresses to be used in B2B topology. Authored by: Allen Hubbe Obtained from: Linux (Dual BSD/GPL driver) Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:54:16 2015 (r289613) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:54:25 2015 (r289614) @@ -397,7 +397,7 @@ static const struct ntb_xlat_reg xeon_se .bar5_xlat = XEON_SBAR5XLAT_OFFSET, }; -static const struct ntb_b2b_addr xeon_b2b_usd_addr = { +static struct ntb_b2b_addr xeon_b2b_usd_addr = { .bar0_addr = XEON_B2B_BAR0_USD_ADDR, .bar2_addr64 = XEON_B2B_BAR2_USD_ADDR64, .bar4_addr64 = XEON_B2B_BAR4_USD_ADDR64, @@ -405,7 +405,7 @@ static const struct ntb_b2b_addr xeon_b2 .bar5_addr32 = XEON_B2B_BAR5_USD_ADDR32, }; -static const struct ntb_b2b_addr xeon_b2b_dsd_addr = { +static struct ntb_b2b_addr xeon_b2b_dsd_addr = { .bar0_addr = XEON_B2B_BAR0_DSD_ADDR, .bar2_addr64 = XEON_B2B_BAR2_DSD_ADDR64, .bar4_addr64 = XEON_B2B_BAR4_DSD_ADDR64, @@ -413,6 +413,37 @@ static const struct ntb_b2b_addr xeon_b2 .bar5_addr32 = XEON_B2B_BAR5_DSD_ADDR32, }; +SYSCTL_NODE(_hw_ntb, OID_AUTO, xeon_b2b, CTLFLAG_RW, 0, + "B2B MW segment overrides -- MUST be the same on both sides"); + +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar2_addr64, CTLFLAG_RDTUN, + &xeon_b2b_usd_addr.bar2_addr64, 0, "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. MUST be the same " + "address on both sides."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar4_addr64, CTLFLAG_RDTUN, + &xeon_b2b_usd_addr.bar4_addr64, 0, "See usd_bar2_addr64, but BAR4."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar4_addr32, CTLFLAG_RDTUN, + &xeon_b2b_usd_addr.bar4_addr32, 0, "See usd_bar2_addr64, but BAR4 " + "(split-BAR mode)."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar5_addr32, CTLFLAG_RDTUN, + &xeon_b2b_usd_addr.bar4_addr32, 0, "See usd_bar2_addr64, but BAR5 " + "(split-BAR mode)."); + +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar2_addr64, CTLFLAG_RDTUN, + &xeon_b2b_dsd_addr.bar2_addr64, 0, "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 downstream side of the link. MUST be the same" + " address on both sides."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar4_addr64, CTLFLAG_RDTUN, + &xeon_b2b_dsd_addr.bar4_addr64, 0, "See dsd_bar2_addr64, but BAR4."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar4_addr32, CTLFLAG_RDTUN, + &xeon_b2b_dsd_addr.bar4_addr32, 0, "See dsd_bar2_addr64, but BAR4 " + "(split-BAR mode)."); +SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar5_addr32, CTLFLAG_RDTUN, + &xeon_b2b_dsd_addr.bar4_addr32, 0, "See dsd_bar2_addr64, but BAR5 " + "(split-BAR mode)."); + /* * OS <-> Driver interface structures */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510200154.t9K1sPH2031002>