Skip to content

Commit c4c1725

Browse files
committed
Merge tag 'ntb-3.12' of git://github.com/jonmason/ntb
Pull NTB (non-transparent bridge) updates from Jon Mason: "NTB driver bug fixes to address issues in NTB-RP enablement, spad, debugfs, and USD/DSD identification. Add a workaround on Xeon NTB devices for b2bdoorbell errata. Also, add new NTB driver features to support 32bit x86, DMA engine support, and NTB-RP support. Finally, a few clean-ups and update to MAINTAINERS for the NTB git tree and wiki location" * tag 'ntb-3.12' of git://github.com/jonmason/ntb: ntb: clean up unnecessary MSI/MSI-X capability find MAINTAINERS: Add Website and Git Tree for NTB NTB: Update Version NTB: Comment Fix NTB: Remove unused variable NTB: Remove References of non-B2B BWD HW NTB: NTB-RP support NTB: Rename Variables for NTB-RP NTB: Use DMA Engine to Transmit and Receive NTB: Enable 32bit Support NTB: Update Device IDs NTB: BWD Link Recovery NTB: Xeon Errata Workaround NTB: Correct debugfs to work with more than 1 NTB Device NTB: Correct USD/DSD Identification NTB: Correct Number of Scratch Pad Registers NTB: Add Error Handling in ntb_device_setup
2 parents 8de4651 + 73f47ca commit c4c1725

File tree

6 files changed

+855
-227
lines changed

6 files changed

+855
-227
lines changed

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5889,6 +5889,8 @@ F: drivers/scsi/nsp32*
58895889
NTB DRIVER
58905890
M: Jon Mason <[email protected]>
58915891
S: Supported
5892+
W: https://github.com/jonmason/ntb/wiki
5893+
T: git git://github.com/jonmason/ntb.git
58925894
F: drivers/ntb/
58935895
F: drivers/net/ntb_netdev.c
58945896
F: include/linux/ntb.h

drivers/ntb/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
config NTB
22
tristate "Intel Non-Transparent Bridge support"
33
depends on PCI
4-
depends on X86_64
4+
depends on X86
55
help
66
The PCI-E Non-transparent bridge hardware is a point-to-point PCI-E bus
77
connecting 2 systems. When configured, writes to the device's PCI

0 commit comments

Comments
 (0)