add support e312s、e316、e310_rdma、e312_rdma device id.<br /> <br />Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn> <br />---<br /> drivers/net/zxdh/zxdh_ethdev.c | 23 ++++++++++++++++++++---<br /> drivers/net/zxdh/zxdh_ethdev.h | 13 +++++++++++--<br /> 2 files changed, 31 insertions(+), 5 deletions(-)<br /> <br />diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c<br />index a0cea32b87..80053678cb 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.c<br />+++ b/drivers/net/zxdh/zxdh_ethdev.c<br />@@ -1982,6 +1982,17 @@ zxdh_priv_res_free(struct zxdh_hw *priv)<br />     }<br /> }<br />  <br />+static uint8_t<br />+is_pf(uint16_t device_id)<br />+{<br />+    return (device_id == ZXDH_E310_PF_DEVICEID ||<br />+            device_id == ZXDH_E312_PF_DEVICEID ||<br />+            device_id == ZXDH_E312S_PF_DEVICEID ||<br />+            device_id == ZXDH_E316_PF_DEVICEID ||<br />+            device_id == ZXDH_E310_RDMA_PF_DEVICEID ||<br />+            device_id == ZXDH_E312_RDMA_PF_DEVICEID);<br />+}<br />+<br /> static int<br /> zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)<br /> {<br />@@ -2015,10 +2026,8 @@ zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)<br />     hw->slot_id = ZXDH_INVALID_SLOT_IDX;<br />     hw->is_pf = 0;<br />  <br />-    if (pci_dev->id.device_id == ZXDH_E310_PF_DEVICEID ||<br />-        pci_dev->id.device_id == ZXDH_E312_PF_DEVICEID) {<br />+    if (is_pf(pci_dev->id.device_id))<br />         hw->is_pf = 1;<br />-    }<br />  <br />     ret = zxdh_init_once(eth_dev);<br />     if (ret != 0)<br />@@ -2114,6 +2123,14 @@ static const struct rte_pci_id pci_id_zxdh_map[] = {<br />     {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_VF_DEVICEID)},<br />     {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_PF_DEVICEID)},<br />     {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_VF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_PF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_VF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_PF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_VF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_PF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_VF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_PF_DEVICEID)},<br />+    {RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_VF_DEVICEID)},<br />     {.vendor_id = 0, /* sentinel */ },<br /> };<br /> static struct rte_pci_driver zxdh_pmd = {<br />diff --git a/drivers/net/zxdh/zxdh_ethdev.h b/drivers/net/zxdh/zxdh_ethdev.h<br />index 261acd17c3..169af209a2 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.h<br />+++ b/drivers/net/zxdh/zxdh_ethdev.h<br />@@ -17,8 +17,17 @@<br />  <br /> #define ZXDH_E310_PF_DEVICEID     0x8061<br /> #define ZXDH_E310_VF_DEVICEID     0x8062<br />-#define ZXDH_E312_PF_DEVICEID     0x8049<br />-#define ZXDH_E312_VF_DEVICEID     0x8060<br />+#define ZXDH_E312_PF_DEVICEID     0x80a0<br />+#define ZXDH_E312_VF_DEVICEID     0x80a1<br />+#define ZXDH_E312S_PF_DEVICEID    0x807d<br />+#define ZXDH_E312S_VF_DEVICEID    0x8088<br />+#define ZXDH_E316_PF_DEVICEID     0x807e<br />+#define ZXDH_E316_VF_DEVICEID     0x807f<br />+<br />+#define ZXDH_E310_RDMA_PF_DEVICEID     0x8084<br />+#define ZXDH_E310_RDMA_VF_DEVICEID     0x8085<br />+#define ZXDH_E312_RDMA_PF_DEVICEID     0x8049<br />+#define ZXDH_E312_RDMA_VF_DEVICEID     0x8060<br />  <br /> #define ZXDH_MAX_UC_MAC_ADDRS     32<br /> #define ZXDH_MAX_MC_MAC_ADDRS     32<br />--  <br />2.27.0<br />