Skip to contentSkip to conversation

common/cnxk: add new IDs to the supported devices lists

PATCH Applied Tomasz Duszynski 2 participants 2 messages Oct 1, 2021 – Oct 20, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/cnxk: add new IDs to the supported devices lists

CNF10KA does not differ it terms of RVU resources from CN10KA platform hence add it to list of devices respective drivers support.

Otherwise devices on CNF10KA are not probed even though compatible drivers exist.

---
 drivers/common/cnxk/roc_api.h       |  1 +
 drivers/event/cnxk/cn10k_eventdev.c |  2 ++
 drivers/mempool/cnxk/cnxk_mempool.c | 14 ++++++++++++++
 drivers/net/cnxk/cn10k_ethdev.c     |  3 +++
 4 files changed, 20 insertions(+)
drivers/common/cnxk/roc_api.h +1 -0
index 7dec8453b4..5a4edbc94e 100644
@@ -64,6 +64,7 @@
 
 #define PCI_SUBSYSTEM_DEVID_CN10KA  0xB900
 #define PCI_SUBSYSTEM_DEVID_CN10KAS 0xB900
+#define PCI_SUBSYSTEM_DEVID_CNF10KA 0xBA00
 
 #define PCI_SUBSYSTEM_DEVID_CN9KA 0x0000
 #define PCI_SUBSYSTEM_DEVID_CN9KB 0xb400
drivers/event/cnxk/cn10k_eventdev.c +2 -0
index 8af273a01b..dbf19505a4 100644
@@ -952,8 +952,10 @@ cn10k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 static const struct rte_pci_id cn10k_pci_sso_map[] = {
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
 	{
 		.vendor_id = 0,
 	},
drivers/mempool/cnxk/cnxk_mempool.c +14 -0
index dd4d74ca05..33d1ac7889 100644
@@ -169,6 +169,13 @@ static const struct rte_pci_id npa_pci_map[] = {
 		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
 		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
 	},
+	{
+		.class_id = RTE_CLASS_ANY_ID,
+		.vendor_id = PCI_VENDOR_ID_CAVIUM,
+		.device_id = PCI_DEVID_CNXK_RVU_NPA_PF,
+		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
+		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
+	},
 	{
 		.class_id = RTE_CLASS_ANY_ID,
 		.vendor_id = PCI_VENDOR_ID_CAVIUM,
@@ -183,6 +190,13 @@ static const struct rte_pci_id npa_pci_map[] = {
 		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
 		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
 	},
+	{
+		.class_id = RTE_CLASS_ANY_ID,
+		.vendor_id = PCI_VENDOR_ID_CAVIUM,
+		.device_id = PCI_DEVID_CNXK_RVU_NPA_VF,
+		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
+		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
+	},
 	{
 		.vendor_id = 0,
 	},
drivers/net/cnxk/cn10k_ethdev.c +3 -0
index 7caec6cf14..08df24d8e2 100644
@@ -528,10 +528,13 @@ cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 static const struct rte_pci_id cn10k_pci_nix_map[] = {
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_PF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_PF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_VF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_VF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_AF_VF),
 	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_AF_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_AF_VF),
 	{
 		.vendor_id = 0,
 	},
Signature · 1 line
2.25.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 9 lines · Tomasz Duszynski

CNF10KA does not differ it terms of RVU resources from CN10KA platform hence add it to list of devices respective drivers support.

Otherwise devices on CNF10KA are not probed even though compatible drivers exist.

Rebased to next-net-mrvl

Applied to dpdk-next-net-mrvl/for-next-net. Thanks

Quoted 87 lines
---
 drivers/common/cnxk/roc_api.h       |  1 +
 drivers/event/cnxk/cn10k_eventdev.c |  2 ++
 drivers/mempool/cnxk/cnxk_mempool.c | 14 ++++++++++++++
 drivers/net/cnxk/cn10k_ethdev.c     |  3 +++
 4 files changed, 20 insertions(+)
drivers/common/cnxk/roc_api.h +1 -0
index 7dec8453b4..5a4edbc94e 100644
@@ -64,6 +64,7 @@
 
 #define PCI_SUBSYSTEM_DEVID_CN10KA  0xB900
 #define PCI_SUBSYSTEM_DEVID_CN10KAS 0xB900
+#define PCI_SUBSYSTEM_DEVID_CNF10KA 0xBA00
 
 #define PCI_SUBSYSTEM_DEVID_CN9KA 0x0000
 #define PCI_SUBSYSTEM_DEVID_CN9KB 0xb400
drivers/event/cnxk/cn10k_eventdev.c +2 -0
index 8af273a01b..dbf19505a4 100644
@@ -952,8 +952,10 @@ cn10k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 static const struct rte_pci_id cn10k_pci_sso_map[] = {
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
        {
                .vendor_id = 0,
        },
drivers/mempool/cnxk/cnxk_mempool.c +14 -0
index dd4d74ca05..33d1ac7889 100644
@@ -169,6 +169,13 @@ static const struct rte_pci_id npa_pci_map[] = {
                .subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
                .subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
        },
+       {
+               .class_id = RTE_CLASS_ANY_ID,
+               .vendor_id = PCI_VENDOR_ID_CAVIUM,
+               .device_id = PCI_DEVID_CNXK_RVU_NPA_PF,
+               .subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
+               .subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
+       },
        {
                .class_id = RTE_CLASS_ANY_ID,
                .vendor_id = PCI_VENDOR_ID_CAVIUM,
@@ -183,6 +190,13 @@ static const struct rte_pci_id npa_pci_map[] = {
                .subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
                .subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
        },
+       {
+               .class_id = RTE_CLASS_ANY_ID,
+               .vendor_id = PCI_VENDOR_ID_CAVIUM,
+               .device_id = PCI_DEVID_CNXK_RVU_NPA_VF,
+               .subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
+               .subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
+       },
        {
                .vendor_id = 0,
        },
drivers/net/cnxk/cn10k_ethdev.c +3 -1
index 7caec6cf14..08df24d8e2 100644
@@ -528,10 +528,13 @@ cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 static const struct rte_pci_id cn10k_pci_nix_map[] = {
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_VF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_VF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_AF_VF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_AF_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_AF_VF),
        {
                .vendor_id = 0,
        },
--

2.25.1