tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Octeontx2-af: RPM: Register driver with PCI subsys IDs

Although the PCI device ID and Vendor ID for the RPM (MAC) block
have remained the same across Octeon CN10K and the next-generation
CN20K silicon, Hardware architecture has changed (NIX mapped RPMs
and RFOE Mapped RPMs).

Add PCI Subsystem IDs to the device table to ensure that this driver
can be probed from NIX mapped RPM devices only.

Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Link: https://patch.msgid.link/20250224035603.1220913-1-hkelam@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Hariprasad Kelam and committed by
Jakub Kicinski fc916719 287044ab

+14 -2
+12 -2
drivers/net/ethernet/marvell/octeontx2/af/cgx.c
··· 66 66 /* Supported devices */ 67 67 static const struct pci_device_id cgx_id_table[] = { 68 68 { PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_CGX) }, 69 - { PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10K_RPM) }, 70 - { PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10KB_RPM) }, 69 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10K_RPM, 70 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CN10K_A) }, 71 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10K_RPM, 72 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CNF10K_A) }, 73 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10K_RPM, 74 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CNF10K_B) }, 75 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10KB_RPM, 76 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CN10K_B) }, 77 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10KB_RPM, 78 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CN20KA) }, 79 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN10KB_RPM, 80 + PCI_ANY_ID, PCI_SUBSYS_DEVID_CNF20KA) }, 71 81 { 0, } /* end of table */ 72 82 }; 73 83
+2
drivers/net/ethernet/marvell/octeontx2/af/rvu.h
··· 30 30 #define PCI_SUBSYS_DEVID_CNF10K_A 0xBA00 31 31 #define PCI_SUBSYS_DEVID_CNF10K_B 0xBC00 32 32 #define PCI_SUBSYS_DEVID_CN10K_B 0xBD00 33 + #define PCI_SUBSYS_DEVID_CN20KA 0xC220 34 + #define PCI_SUBSYS_DEVID_CNF20KA 0xC320 33 35 34 36 /* PCI BAR nos */ 35 37 #define PCI_AF_REG_BAR_NUM 0