switchtec: add new device IDs
Subsystems (4)
Logan Gunthorpe
maintainercover switchtec: add new device IDs
This little patch set adds some new device IDs for switchtec hardware to the PCI driver, the DMA driver and the PCI quirk needed for NTB.
I originally included this in a patchset I'm working on for switchtec-dma but the Sashiko bot reminded me I need to add it to the PCI management device and the quirk used for NTB. So I've respun three patches here.
I'm open to options, but I might suggest if everyone is okay with it these three patches could just go through the PCI tree together.
These three patches are based on v7.2-rc3.
Thanks,
Logan
Logan Gunthorpe (3):
dmaengine: switchtec-dma: Add PCI1008 device ID PCI/switch: switchtec: Add PCI1008 device ID
PCI: Add PCI1008 to switchtec NTB DMA alias quirk
drivers/dma/switchtec_dma.c | 1 + drivers/pci/quirks.c | 1 + drivers/pci/switch/switchtec.c | 1 + 3 files changed, 3 insertions(+)
base-commit: a13c140cc289c0b7b3770bce5b3ad42ab35074aa
Signature · 1 line
2.47.3
Logan Gunthorpe
maintainerPATCH 1/3 dmaengine: switchtec-dma: Add PCI1008 device ID
Add the PCI1008 device ID for switchtec-dma.
--- drivers/dma/switchtec_dma.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/switchtec_dma.c +1 -0
@@ -1424,6 +1424,7 @@ static const struct pci_device_id switchtec_dma_pci_tbl[] = {SW_ID (PCI_VENDOR_ID_EFAR ,0x1004 ),/* PCI1004 16XG4 */ SW_ID (PCI_VENDOR_ID_EFAR ,0x1005 ),/* PCI1005 16XG4 */ SW_ID (PCI_VENDOR_ID_EFAR ,0x1006 ),/* PCI1006 16XG4 */ +SW_ID (PCI_VENDOR_ID_EFAR ,0x1008 ),/* PCI1008 16XG4 */ {0} };MODULE_DEVICE_TABLE (pci, switchtec_dma_pci_tbl);
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v1 1/3] dmaengine: switchtec-dma: Add PCI1008 device ID
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] The patch adds the PCI1008 device ID to the switchtec-dma driver but omits it from the core…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The patch adds the PCI1008 device ID to the switchtec-dma driver but omits it from the core switchtec management driver, resulting in partial and incomplete device support. --
--- Patch [1]: [PATCH v1 1/3] dmaengine: switchtec-dma: Add PCI1008 device ID --- commit d1b7f8eab84fc5cd5b1fe8dcb694ed9d25f8d8e7
Author: Logan Gunthorpe <[email protected]>
dmaengine: switchtec-dma: Add PCI1008 device ID
This commit adds the PCI1008 device ID to the switchtec-dma driver's supported device table.
drivers/dma/switchtec_dma.c static const struct pci_device_id switchtec_dma_pci_tbl[] = { · line 1427
Quoted 9 lines
drivers/dma/switchtec_dma.c +1
-0@@ -1424,6 +1424,7 @@ static const struct pci_device_id switchtec_dma_pci_tbl[] = {SW_ID (PCI_VENDOR_ID_EFAR ,0x1004 ),/* PCI1004 16XG4 */ SW_ID (PCI_VENDOR_ID_EFAR ,0x1005 ),/* PCI1005 16XG4 */ SW_ID (PCI_VENDOR_ID_EFAR ,0x1006 ),/* PCI1006 16XG4 */ + SW_ID(PCI_VENDOR_ID_EFAR, 0x1008), /* PCI1008 16XG4 */
[Severity: Medium]
Does this new device ID also need to be added to switchtec_pci_tbl in drivers/pci/switch/switchtec.c?
If the companion ID is omitted from the core management driver, the DMA engine will bind, but the core management function will not. Would this leave the character device, NTB features, and hardware telemetry inaccessible for the PCI1008 device?
Quoted 3 lines
drivers/dma/switchtec_dma.c +0
-0{0} };MODULE_DEVICE_TABLE (pci, switchtec_dma_pci_tbl);
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Logan Gunthorpe
maintainerRe: [PATCH v1 1/3] dmaengine: switchtec-dma: Add PCI1008 device ID
Quoted 8 lines · On 2026-07-14 15:28, [email protected] wrote:
[Severity: Medium]
Does this new device ID also need to be added toswitchtec_pci_tblindrivers/pci/switch/switchtec.c?If the companion ID is omitted from the core management driver, the DMA engine will bind, but the core management function will not. Would this leave the character device, NTB features, and hardware telemetry inaccessible for the PCI1008 device?
Unless I'm totally missing something, this is taken care of by the next two patches in this series.
Logan
Re: [PATCH v1 1/3] dmaengine: switchtec-dma: Add PCI1008 device ID
In reply to Logan GunthorpeQuoted 1 line · Logan Gunthorpe
Add the PCI1008 device ID for switchtec-dma.
Signature · 1 line
~Vinod
Logan Gunthorpe
maintainerPATCH 2/3 PCI/switch: switchtec: Add PCI1008 device ID
In reply to Logan GunthorpeAdd the PCI1008 device ID to the core switchtec management driver's PCI ID table. Without it, the management endpoint on a PCI1008 switch is not bound by this driver, preventing userspace tools from configuring or monitoring the switch and leaving NTB functionality unavailable.
--- drivers/pci/switch/switchtec.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/switch/switchtec.c +1 -0
@@ -1874,6 +1874,7 @@ static const struct pci_device_id switchtec_pci_tbl[] = {SWITCHTEC_PCI100X_DEVICE (0x1004 ,SWITCHTEC_GEN4 ),/* PCI1004 16XG4 */ SWITCHTEC_PCI100X_DEVICE (0x1005 ,SWITCHTEC_GEN4 ),/* PCI1005 16XG4 */ SWITCHTEC_PCI100X_DEVICE (0x1006 ,SWITCHTEC_GEN4 ),/* PCI1006 16XG4 */ +SWITCHTEC_PCI100X_DEVICE (0x1008 ,SWITCHTEC_GEN4 ),/* PCI1008 16XG4 */ {0} };MODULE_DEVICE_TABLE (pci, switchtec_pci_tbl);
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v1 2/3] PCI/switch: switchtec: Add PCI1008 device ID
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 7 lines
Add the PCI1008 device ID to the core switchtec management driver's PCI ID table. Without it, the management endpoint on a PCI1008 switch is not bound by this driver, preventing userspace tools from configuring or monitoring the switch and leaving NTB functionality unavailable.
Signed-off-by Logan Gunthorpe <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Logan Gunthorpe
maintainerPATCH 3/3 PCI: Add PCI1008 to switchtec NTB DMA alias quirk
In reply to Logan GunthorpeAdd the PCI1008 device ID to the quirk_switchtec_ntb_dma_alias PCI fixup table. Without it, DMA transactions from a PCI1008 switch's NTB function are not given the correct requester ID alias, which can misdirect them under an IOMMU.
--- drivers/pci/quirks.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/quirks.c +1 -0
@@ -6090,6 +6090,7 @@ SWITCHTEC_PCI100X_QUIRK(0x1003); /* PCI1003XG4 */SWITCHTEC_PCI100X_QUIRK (0x1004 );/* PCI1004XG4 */ SWITCHTEC_PCI100X_QUIRK (0x1005 );/* PCI1005XG4 */ SWITCHTEC_PCI100X_QUIRK (0x1006 );/* PCI1006XG4 */ +SWITCHTEC_PCI100X_QUIRK (0x1008 );/* PCI1008XG4 */ /*
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v1 3/3] PCI: Add PCI1008 to switchtec NTB DMA alias quirk
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Incorrect pointer arithmetic when reading the upper 32 bits of ep_map results in reading from the wrong MMIO offset. --
--- Patch [3]: [PATCH v1 3/3] PCI: Add PCI1008 to switchtec NTB DMA alias quirk --- commit 7f63ba41929ba7abb0f74f406090b22d57b6bc5e
Author: Logan Gunthorpe <[email protected]>
PCI: Add PCI1008 to switchtec NTB DMA alias quirk
Add the PCI1008 device ID to the quirk_switchtec_ntb_dma_alias PCI fixup table. Without it, DMA transactions from a PCI1008 switch's NTB function are not given the correct requester ID alias, which can misdirect them under an IOMMU.
drivers/pci/quirks.c SWITCHTEC_PCI100X_QUIRK(0x1003); /* PCI1003XG4 */ · line 6093
Quoted 9 lines
drivers/pci/quirks.c +1
-0@@ -6090,6 +6090,7 @@ SWITCHTEC_PCI100X_QUIRK(0x1003); /* PCI1003XG4 */SWITCHTEC_PCI100X_QUIRK (0x1004 );/* PCI1004XG4 */ SWITCHTEC_PCI100X_QUIRK (0x1005 );/* PCI1005XG4 */ SWITCHTEC_PCI100X_QUIRK (0x1006 );/* PCI1006XG4 */ +SWITCHTEC_PCI100X_QUIRK (0x1008 );/* PCI1008XG4 */
[Severity: High]
This isn't a bug introduced by this patch, but while looking at the function triggered by this quirk (quirk_switchtec_ntb_dma_alias()), I noticed an incorrect pointer arithmetic issue.
In drivers/pci/quirks.c:quirk_switchtec_ntb_dma_alias():
partition_map = ioread32(&mmio_ntb->ep_map); partition_map |= ((u64) ioread32(&mmio_ntb->ep_map + 4)) << 32;
Since mmio_ntb->ep_map is a u64, does the + 4 advance the pointer by 32 bytes (4 * sizeof(u64)) instead of the intended 4 bytes?
Looking at struct ntb_info_regs, this would read from offset 36 (target_part_low) instead of the upper 32 bits of ep_map at offset 8. This populates the upper 32 bits of partition_map with unintended data, causing the device initialization loop to process invalid partition IDs, which could potentially access out-of-bounds MMIO registers or create incorrect DMA aliases.
Could this read be corrected to avoid scaling by the type size?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Logan Gunthorpe
maintainerRe: [PATCH v1 3/3] PCI: Add PCI1008 to switchtec NTB DMA alias quirk
Quoted 13 lines · On 2026-07-14 15:38, [email protected] wrote:
[Severity: High]
This isn't a bug introduced by this patch, but while looking at the function triggered by this quirk (quirk_switchtec_ntb_dma_alias()), I noticed an incorrect pointer arithmetic issue.In drivers/pci/quirks.c:quirk_switchtec_ntb_dma_alias():
partition_map = ioread32(&mmio_ntb->ep_map); partition_map |= ((u64) ioread32(&mmio_ntb->ep_map + 4)) << 32;Since
mmio_ntb->ep_mapis a u64, does the + 4 advance the pointer by 32 bytes (4 * sizeof(u64)) instead of the intended 4 bytes?
Quoted 9 lines
Looking at struct
ntb_info_regs, this would read from offset 36 (target_part_low) instead of the upper 32 bits ofep_mapat offset 8. This populates the upper 32 bits ofpartition_mapwith unintended data, causing the device initialization loop to process invalid partition IDs, which could potentially access out-of-bounds MMIO registers or create incorrect DMA aliases.Could this read be corrected to avoid scaling by the type size?
As noted by the Sashiko bot, this issue is unrelated to this series. But I'll dig into it and try to remember if that was intended or a mistake and send a patch if needed. In the mean time, this shouldn't gate this series.
Logan
Bjorn Helgaas
AppliedQuoted 22 lines · Logan Gunthorpe
This little patch set adds some new device IDs for switchtec hardware to the PCI driver, the DMA driver and the PCI quirk needed for NTB.
I originally included this in a patchset I'm working on for switchtec-dma but the Sashiko bot reminded me I need to add it to the PCI management device and the quirk used for NTB. So I've respun three patches here.
I'm open to options, but I might suggest if everyone is okay with it these three patches could just go through the PCI tree together.
These three patches are based on v7.2-rc3.
Thanks,
Logan
Logan Gunthorpe (3):
dmaengine: switchtec-dma: Add PCI1008 device ID PCI/switch: switchtec: Add PCI1008 device ID
PCI: Add PCI1008 to switchtec NTB DMA alias quirk
Quoted 4 lines
drivers/dma/switchtec_dma.c | 1 + drivers/pci/quirks.c | 1 + drivers/pci/switch/switchtec.c | 1 + 3 files changed, 3 insertions(+)
Applied to pci/switchtec for v7.3, thanks!