[PATCH v1] net/zxdh: fix using static assert in macro definition

[PATCH v1] net/zxdh: fix using static assert in macro definition

[Junlong Wang]

[-- Attachment #1.1.1: Type: text/plain, Size: 1424 bytes --]

using static_assert(RTE_BUILD_BUG_ON) replaced BUILD_BUG_ON.

Fixes: 9c3a123f9e08 ("net/zxdh: optimize msg processing ops and modify some issues")

Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn>
---
 drivers/net/zxdh/zxdh_common.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/zxdh/zxdh_common.h b/drivers/net/zxdh/zxdh_common.h
index aaf4e0bedb..c151101bbc 100644
--- a/drivers/net/zxdh/zxdh_common.h
+++ b/drivers/net/zxdh/zxdh_common.h
@@ -87,20 +87,15 @@ zxdh_set_value(uint32_t fld_sz, uint8_t *addr, size_t value) {
 #define ZXDH_BYTE_OFF(typ, fld) (__zxdh_bit_off(typ, fld) / 8)
 #define ZXDH_ADDR_OF(typ, p, fld) ((uint8_t *)(p) + ZXDH_BYTE_OFF(typ, fld))
 
-#define BUILD_BUG_ON(condition) do { \
-	if (condition) \
-		__builtin_unreachable(); \
-	} while (0)
-
 #define ZXDH_SET(typ, p, fld, v) do { \
-	BUILD_BUG_ON(__zxdh_bit_sz(typ, fld) % 8); \
+	RTE_BUILD_BUG_ON(__zxdh_bit_sz(typ, fld) % 8); \
 	uint32_t fld_sz = __zxdh_bit_sz(typ, fld) / 8; \
 	uint8_t *addr = ZXDH_ADDR_OF(typ, p, fld); \
 	zxdh_set_value(fld_sz, addr, v); \
 } while (0)
 
 #define ZXDH_GET(typ, p, fld) ({ \
-	BUILD_BUG_ON(__zxdh_bit_sz(typ, fld) % 8); \
+	RTE_BUILD_BUG_ON(__zxdh_bit_sz(typ, fld) % 8); \
 	uint32_t fld_sz = __zxdh_bit_sz(typ, fld) / 8; \
 	uint8_t *addr = ZXDH_ADDR_OF(typ, p, fld); \
 	zxdh_get_value(fld_sz, addr); \
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 2633 bytes --]

[PATCH v1] net/zxdh: add support E31X series device ID

[Junlong Wang]

[-- Attachment #1.1.1: Type: text/plain, Size: 3135 bytes --]

add support e312s、e316、e310_rdma、e312_rdma device id.

Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn>
---
 drivers/net/zxdh/zxdh_ethdev.c | 23 ++++++++++++++++++++---
 drivers/net/zxdh/zxdh_ethdev.h | 13 +++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
index a0cea32b87..80053678cb 100644
--- a/drivers/net/zxdh/zxdh_ethdev.c
+++ b/drivers/net/zxdh/zxdh_ethdev.c
@@ -1982,6 +1982,17 @@ zxdh_priv_res_free(struct zxdh_hw *priv)
 	}
 }
 
+static uint8_t
+is_pf(uint16_t device_id)
+{
+	return (device_id == ZXDH_E310_PF_DEVICEID ||
+			device_id == ZXDH_E312_PF_DEVICEID ||
+			device_id == ZXDH_E312S_PF_DEVICEID ||
+			device_id == ZXDH_E316_PF_DEVICEID ||
+			device_id == ZXDH_E310_RDMA_PF_DEVICEID ||
+			device_id == ZXDH_E312_RDMA_PF_DEVICEID);
+}
+
 static int
 zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)
 {
@@ -2015,10 +2026,8 @@ zxdh_eth_dev_init(struct rte_eth_dev *eth_dev)
 	hw->slot_id = ZXDH_INVALID_SLOT_IDX;
 	hw->is_pf = 0;
 
-	if (pci_dev->id.device_id == ZXDH_E310_PF_DEVICEID ||
-		pci_dev->id.device_id == ZXDH_E312_PF_DEVICEID) {
+	if (is_pf(pci_dev->id.device_id))
 		hw->is_pf = 1;
-	}
 
 	ret = zxdh_init_once(eth_dev);
 	if (ret != 0)
@@ -2114,6 +2123,14 @@ static const struct rte_pci_id pci_id_zxdh_map[] = {
 	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_VF_DEVICEID)},
 	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_PF_DEVICEID)},
 	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_VF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_PF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312S_VF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_PF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E316_VF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_PF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E310_RDMA_VF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_PF_DEVICEID)},
+	{RTE_PCI_DEVICE(ZXDH_PCI_VENDOR_ID, ZXDH_E312_RDMA_VF_DEVICEID)},
 	{.vendor_id = 0, /* sentinel */ },
 };
 static struct rte_pci_driver zxdh_pmd = {
diff --git a/drivers/net/zxdh/zxdh_ethdev.h b/drivers/net/zxdh/zxdh_ethdev.h
index 261acd17c3..169af209a2 100644
--- a/drivers/net/zxdh/zxdh_ethdev.h
+++ b/drivers/net/zxdh/zxdh_ethdev.h
@@ -17,8 +17,17 @@
 
 #define ZXDH_E310_PF_DEVICEID     0x8061
 #define ZXDH_E310_VF_DEVICEID     0x8062
-#define ZXDH_E312_PF_DEVICEID     0x8049
-#define ZXDH_E312_VF_DEVICEID     0x8060
+#define ZXDH_E312_PF_DEVICEID     0x80a0
+#define ZXDH_E312_VF_DEVICEID     0x80a1
+#define ZXDH_E312S_PF_DEVICEID    0x807d
+#define ZXDH_E312S_VF_DEVICEID    0x8088
+#define ZXDH_E316_PF_DEVICEID     0x807e
+#define ZXDH_E316_VF_DEVICEID     0x807f
+
+#define ZXDH_E310_RDMA_PF_DEVICEID     0x8084
+#define ZXDH_E310_RDMA_VF_DEVICEID     0x8085
+#define ZXDH_E312_RDMA_PF_DEVICEID     0x8049
+#define ZXDH_E312_RDMA_VF_DEVICEID     0x8060
 
 #define ZXDH_MAX_UC_MAC_ADDRS     32
 #define ZXDH_MAX_MC_MAC_ADDRS     32
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 5647 bytes --]