Skip to content

Commit 5fcff8f

Browse files
Junlong Wangshemminger
Junlong Wang
authored andcommitted
net/zxdh: add support E31X series device ID
add support e312s、e316、e310_rdma、e312_rdma device id. Signed-off-by: Junlong Wang <[email protected]>
1 parent e1f6b3b commit 5fcff8f

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

drivers/net/zxdh/zxdh_ethdev.c

+20-3
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,17 @@ zxdh_priv_res_free(struct zxdh_hw *priv)
19821982
}
19831983
}
19841984

1985+
static uint8_t
1986+
is_pf(uint16_t device_id)
1987+
{
1988+
return (device_id == ZXDH_E310_PF_DEVICEID ||
1989+
device_id == ZXDH_E312_PF_DEVICEID ||
1990+
device_id == ZXDH_E312S_PF_DEVICEID ||
1991+
device_id == ZXDH_E316_PF_DEVICEID ||
1992+
device_id == ZXDH_E310_RDMA_PF_DEVICEID ||
1993+
device_id == ZXDH_E312_RDMA_PF_DEVICEID);
1994+
}
1995+
19851996
static int
19861997
zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)
19871998
{
@@ -2015,10 +2026,8 @@ zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)
20152026
hw->slot_id = ZXDH_INVALID_SLOT_IDX;
20162027
hw->is_pf = 0;
20172028

2018-
if (pci_dev->id.device_id == ZXDH_E310_PF_DEVICEID ||
2019-
pci_dev->id.device_id == ZXDH_E312_PF_DEVICEID) {
2029+
if (is_pf(pci_dev->id.device_id))
20202030
hw->is_pf = 1;
2021-
}
20222031

20232032
ret = zxdh_init_once(eth_dev);
20242033
if (ret != 0)
@@ -2114,6 +2123,14 @@ static const struct rte_pci_id pci_id_zxdh_map[] = {
21142123
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_VF_DEVICEID)},
21152124
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_PF_DEVICEID)},
21162125
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_VF_DEVICEID)},
2126+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_PF_DEVICEID)},
2127+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_VF_DEVICEID)},
2128+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_PF_DEVICEID)},
2129+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_VF_DEVICEID)},
2130+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_PF_DEVICEID)},
2131+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_VF_DEVICEID)},
2132+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_PF_DEVICEID)},
2133+
{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_VF_DEVICEID)},
21172134
{.vendor_id = 0, /* sentinel */ },
21182135
};
21192136
static struct rte_pci_driver zxdh_pmd = {

drivers/net/zxdh/zxdh_ethdev.h

+11-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717

1818
#define ZXDH_E310_PF_DEVICEID 0x8061
1919
#define ZXDH_E310_VF_DEVICEID 0x8062
20-
#define ZXDH_E312_PF_DEVICEID 0x8049
21-
#define ZXDH_E312_VF_DEVICEID 0x8060
20+
#define ZXDH_E312_PF_DEVICEID 0x80a0
21+
#define ZXDH_E312_VF_DEVICEID 0x80a1
22+
#define ZXDH_E312S_PF_DEVICEID 0x807d
23+
#define ZXDH_E312S_VF_DEVICEID 0x8088
24+
#define ZXDH_E316_PF_DEVICEID 0x807e
25+
#define ZXDH_E316_VF_DEVICEID 0x807f
26+
27+
#define ZXDH_E310_RDMA_PF_DEVICEID 0x8084
28+
#define ZXDH_E310_RDMA_VF_DEVICEID 0x8085
29+
#define ZXDH_E312_RDMA_PF_DEVICEID 0x8049
30+
#define ZXDH_E312_RDMA_VF_DEVICEID 0x8060
2231

2332
#define ZXDH_MAX_UC_MAC_ADDRS 32
2433
#define ZXDH_MAX_MC_MAC_ADDRS 32

0 commit comments

Comments
 (0)