Skip to contentSkip to conversation

net/sxe: add base driver directory and doc

PATCH New Jie Liu 4 participants 338 messages Apr 25, 2025 – Mar 22 Page 2 of 6

Subsystems (2)
lore
Share & tools
lore
author
#52 lore raw

PATCH v4 6/14 net/sxe: add filter function

In reply to Jie Liu

Add filter function.

---
 drivers/net/sxe/pf/sxe.h        |   4 +
 drivers/net/sxe/pf/sxe_filter.c | 191 ++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h |  29 +++++
 drivers/net/sxe/pf/sxe_main.c   |   1 +
 4 files changed, 225 insertions(+)
drivers/net/sxe/pf/sxe.h +4 -0
index 4b7e853923..6458372ce4 100644
@@ -46,6 +46,10 @@ struct sxe_adapter {
 	struct sxe_irq_context irq_ctxt;
 
 	struct sxe_vlan_context vlan_ctxt;
+	struct sxe_mac_filter_context mac_filter_ctxt;
+#ifdef RTE_ADAPTER_HAVE_FNAV_CONF
+	struct rte_eth_fdir_conf fnav_conf;
+#endif
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +191 -0

203 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +29 -0
index aab6838e2d..b8c67f8d42 100644
@@ -21,6 +21,27 @@ struct sxe_adapter;
 		RTE_ALIGN((SXE_HW_TXRX_RING_NUM_MAX / (sizeof(u32) * BYTE_BIT_NUM)), \
 		sizeof(u32))
 
+struct sxe_vlan_context {
+	u32 vlan_hash_table[SXE_VFT_TBL_SIZE];
+	u32 strip_bitmap[SXE_VLAN_STRIP_BITMAP_SIZE];
+	u32  vlan_table_size;
+};
+
+enum sxe_uc_addr_src_type {
+	SXE_PF = 0,
+	SXE_VF,
+	SXE_VF_MACVLAN
+};
+
+struct sxe_uc_addr_table {
+	u8 rar_idx;
+	u8 pool_idx;
+	u8 type;
+	u8 original_index;
+	bool used;
+	u8 addr[SXE_MAC_ADDR_LEN];
+};
+
 struct sxe_mac_filter_context {
 	struct rte_ether_addr def_mac_addr;
 	struct rte_ether_addr cur_mac_addr;
@@ -37,6 +58,14 @@ struct sxe_mac_filter_context {
 
 s32 sxe_mac_addr_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_promiscuous_enable(struct rte_eth_dev *dev);
+
+s32 sxe_promiscuous_disable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_enable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_disable(struct rte_eth_dev *dev);
+
 s32 sxe_mac_addr_add(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr,
 				 u32 rar_idx, u32 pool);
drivers/net/sxe/pf/sxe_main.c +1 -0
index cc3145c09b..700934b378 100644
@@ -195,6 +195,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 		goto l_end;
 	}
 
+	sxe_hw_uc_addr_clear(hw);
 l_end:
 	return ret;
 }
Signature · 1 line
2.18.4
author
#53 lore raw

PATCH v4 7/14 net/sxe: support rss offload

In reply to Jie Liu

Support rss offload.

---
 drivers/net/sxe/base/sxe_offload_common.c |  11 +-
 drivers/net/sxe/pf/sxe.h                  |   2 +
 drivers/net/sxe/pf/sxe_offload.c          | 300 +++++++++++++++++++++-
 drivers/net/sxe/pf/sxe_offload.h          |  33 +++
 4 files changed, 340 insertions(+), 6 deletions(-)
drivers/net/sxe/base/sxe_offload_common.c +6 -5
index cc35c16ddf..f87cce67a5 100644
@@ -24,15 +24,16 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 	u64 rx_offload_capa;
 
 	rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
-		   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
+			RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
 #ifdef DEV_RX_JUMBO_FRAME
-		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+			DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
 			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
 			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
-		   RTE_ETH_RX_OFFLOAD_SCATTER;
+			RTE_ETH_RX_OFFLOAD_SCATTER |
+			RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
 		rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
drivers/net/sxe/pf/sxe.h +2 -0
index 6458372ce4..c183674fcd 100644
@@ -57,6 +57,8 @@ struct sxe_adapter {
 
 	u32 mtu;
 
+	bool rss_reta_updated;
+
 	RTE_ATOMIC(bool)link_thread_running;
 	RTE_ATOMIC(bool)is_stopping;
 	rte_thread_t link_thread_tid;
drivers/net/sxe/pf/sxe_offload.c +299 -1

320 lines not on this page · raw message

drivers/net/sxe/pf/sxe_offload.h +33 -0
index a70d6bf94b..458b6464c5 100644
@@ -7,6 +7,21 @@
 
 #include "sxe_hw.h"
 
+#define SXE_RSS_OFFLOAD_ALL ( \
+		RTE_ETH_RSS_IPV4 | \
+		RTE_ETH_RSS_NONFRAG_IPV4_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
+		RTE_ETH_RSS_IPV6 | \
+		RTE_ETH_RSS_NONFRAG_IPV6_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV6_UDP)
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_FILTER_CTRL
+u8 *sxe_rss_hash_key_get(void);
+#endif
+
+void sxe_rss_hash_set(struct sxe_hw *hw,
+				struct rte_eth_rss_conf *rss_conf);
+
 u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
@@ -15,4 +30,22 @@ u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
 
+void sxe_rss_disable(struct rte_eth_dev *dev);
+
+void sxe_rss_configure(struct rte_eth_dev *dev);
+
+s32 sxe_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			u16 reta_size);
+
+s32 sxe_rss_reta_query(struct rte_eth_dev *dev,
+			 struct rte_eth_rss_reta_entry64 *reta_conf,
+			 u16 reta_size);
+
+s32 sxe_rss_hash_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_conf *rss_conf);
+
+s32 sxe_rss_hash_conf_get(struct rte_eth_dev *dev,
+				struct rte_eth_rss_conf *rss_conf);
+
 #endif
Signature · 1 line
2.18.4
author
#54 lore raw

PATCH v4 8/14 net/sxe: add dcb function

In reply to Jie Liu

Add dcb function.

---
 drivers/net/sxe/meson.build             |   1 +
 drivers/net/sxe/pf/rte_pmd_sxe.h        |   2 +
 drivers/net/sxe/pf/sxe.h                |   2 +
 drivers/net/sxe/pf/sxe_dcb.c            | 944 ++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_dcb.h            |  99 +++
 drivers/net/sxe/pf/sxe_main.c           |   1 +
 drivers/net/sxe/pf/sxe_phy.c            |  34 +
 drivers/net/sxe/pf/sxe_phy.h            |   2 +
 drivers/net/sxe/pf/sxe_rx.c             |   1 -
 drivers/net/sxe/rte_pmd_sxe_version.map |   1 +
 drivers/net/sxe/version.map             |   3 +-
 11 files changed, 1088 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.c
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.h
drivers/net/sxe/meson.build +1 -0
index 5ec2c3b843..2f528efe19 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/rte_pmd_sxe.h +2 -0
index 64c1140490..16406c6c26 100644
@@ -11,4 +11,6 @@ typedef uint32_t	u32;
 typedef int32_t		s32;
 
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+
+s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
 #endif
drivers/net/sxe/pf/sxe.h +2 -0
index c183674fcd..30efe4ee66 100644
@@ -11,6 +11,7 @@
 #include "sxe_types.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
+#include "sxe_dcb.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -51,6 +52,7 @@ struct sxe_adapter {
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
drivers/net/sxe/pf/sxe_dcb.c new file +944 -0

944 lines not on this page · raw message

drivers/net/sxe/pf/sxe_dcb.h new file +99 -0

99 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +1 -0
index 700934b378..6fc4a41703 100644
@@ -203,6 +203,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
 
drivers/net/sxe/pf/sxe_phy.c +34 -0
index 7d3c22f85a..787b16fb47 100644
@@ -737,6 +737,40 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter)
 	return ret;
 }
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx)
+{
+	s32 ret;
+	struct sxe_hw *hw = &adapter->hw;
+
+	if (!hw->fc.pause_time) {
+		LOG_ERROR_BDF("link fc disabled since pause time is 0");
+		ret = -SXE_ERR_INVALID_LINK_SETTINGS;
+		goto l_ret;
+	}
+
+	if (hw->fc.current_mode & SXE_FC_TX_PAUSE) {
+		if (!hw->fc.high_water[tc_idx] || !hw->fc.low_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+
+		if (hw->fc.low_water[tc_idx] >= hw->fc.high_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+	}
+
+	sxe_fc_autoneg(adapter);
+
+	ret = sxe_hw_pfc_enable(hw, tc_idx);
+	if (ret)
+		PMD_LOG_ERR(INIT, "link fc enable failed, ret=%d", ret);
+
+l_ret:
+	return ret;
+}
 s32 sxe_sfp_identify(struct sxe_adapter *adapter)
 {
 	s32 ret;
drivers/net/sxe/pf/sxe_phy.h +2 -0
index a3d7dbf85b..9fd2746ec8 100644
@@ -105,6 +105,8 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter);
 
 void sxe_link_info_get(struct sxe_adapter *adapter, u32 *link_speed, bool *link_up);
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx);
+
 void sxe_sfp_link_capabilities_get(struct sxe_adapter *adapter, u32 *speed,
 							bool *autoneg);
 
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 48e7393840..65cfcca4c9 100644
@@ -10,7 +10,6 @@
 #include <rte_atomic.h>
 #include <ethdev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "sxe.h"
 #include "sxe_rx.h"
 #include "sxe_logs.h"
drivers/net/sxe/rte_pmd_sxe_version.map +1 -0
index 1a25862ca2..4b871872d6 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
     global:
     rte_pmd_sxe_tx_loopback_set;
+    rte_pmd_sxe_tc_bw_set;
     local: *;
 };
drivers/net/sxe/version.map +2 -1
index d010a9b738..5d1a7d37f1 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
         global:
         rte_pmd_sxe_tx_loopback_set;
+        rte_pmd_sxe_tc_bw_set;
         local: *;
-};
+};
\ No newline at end of file
Signature · 1 line
2.18.4
author
#55 lore raw

PATCH v4 9/14 net/sxe: support ptp

In reply to Jie Liu

Add ptp module.

---
 drivers/net/sxe/meson.build  |   1 +
 drivers/net/sxe/pf/sxe.h     |   9 ++
 drivers/net/sxe/pf/sxe_ptp.c | 209 +++++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_ptp.h |  26 +++++
 4 files changed, 245 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.c
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.h
drivers/net/sxe/meson.build +1 -0
index 2f528efe19..5bd44f3f65 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_ptp.c',
         'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
drivers/net/sxe/pf/sxe.h +9 -0
index 30efe4ee66..8699e1a82f 100644
@@ -41,6 +41,14 @@ struct sxe_vlan_context;
 #define rte_sxe_prefetch(p)   do {} while (0)
 #endif
 
+struct sxe_ptp_context {
+	struct rte_timecounter	  systime_tc;
+	struct rte_timecounter	  rx_tstamp_tc;
+	struct rte_timecounter	  tx_tstamp_tc;
+	u32 tx_hwtstamp_sec;
+	u32 tx_hwtstamp_nsec;
+};
+
 struct sxe_adapter {
 	struct sxe_hw hw;
 
@@ -51,6 +59,7 @@ struct sxe_adapter {
 #ifdef RTE_ADAPTER_HAVE_FNAV_CONF
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
+	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_ptp.c new file +209 -0

209 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ptp.h new file +26 -0
new file mode 100644
index 0000000000..14971b2d50
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_PTP_H__
+#define __SXE_PTP_H__
+
+s32 sxe_timesync_enable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_disable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp,
+				 u32 flags __rte_unused);
+
+s32 sxe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp);
+
+s32 sxe_timesync_adjust_time(struct rte_eth_dev *dev, s64 delta);
+
+s32 sxe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts);
+
+s32 sxe_timesync_write_time(struct rte_eth_dev *dev,
+					const struct timespec *ts);
+
+#endif
Signature · 1 line
2.18.4
author
#56 lore raw

PATCH v4 10/14 net/sxe: add xstats function

In reply to Jie Liu

Add xstats function.

---
 drivers/net/sxe/meson.build    |   1 +
 drivers/net/sxe/pf/sxe.h       |   2 +
 drivers/net/sxe/pf/sxe_main.c  |   2 +
 drivers/net/sxe/pf/sxe_stats.c | 577 +++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_stats.h |  71 ++++
 5 files changed, 653 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_stats.c
 create mode 100644 drivers/net/sxe/pf/sxe_stats.h
drivers/net/sxe/meson.build +1 -0
index 5bd44f3f65..b06cc4c1fe 100644
@@ -17,6 +17,7 @@ sources = files(
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
+	'pf/sxe_stats.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
         'pf/sxe_ptp.c',
drivers/net/sxe/pf/sxe.h +2 -0
index 8699e1a82f..2da5c4df96 100644
@@ -9,6 +9,7 @@
 #include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
+#include "sxe_stats.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
 #include "sxe_dcb.h"
@@ -61,6 +62,7 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_main.c +2 -0
index 6fc4a41703..bbee8035d6 100644
@@ -203,6 +203,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+
+	sxe_hw_stats_regs_clean(hw);
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/pf/sxe_stats.c new file +577 -0

577 lines not on this page · raw message

drivers/net/sxe/pf/sxe_stats.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#57 lore raw

PATCH v4 11/14 net/sxe: add custom cmd led ctrl

In reply to Jie Liu

Add custom cmd led ctrl.

---
 drivers/net/sxe/include/sxe/sxe_cli.h   | 218 ++++++++++++++++++++++++
 drivers/net/sxe/include/sxe/sxe_ioctl.h |  21 +++
 drivers/net/sxe/meson.build             |   2 +
 drivers/net/sxe/pf/sxe_main.c           |   3 +
 drivers/net/sxe/sxe_testpmd.c           |  65 +++++++
 5 files changed, 309 insertions(+)
 create mode 100644 drivers/net/sxe/include/sxe/sxe_cli.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_ioctl.h
 create mode 100644 drivers/net/sxe/sxe_testpmd.c
drivers/net/sxe/include/sxe/sxe_cli.h new file +218 -0
new file mode 100644
index 0000000000..623347dab2
@@ -0,0 +1,218 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_CLI_H__
+#define __SXE_CLI_H__
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+#define SXE_VERSION_LEN				  (32)
+#define SXE_MAC_NUM					 (128)
+#define SXE_PORT_TRANSCEIVER_LEN		(32)
+#define SXE_PORT_VENDOR_LEN			 (32)
+#define SXE_CHIP_TYPE_LEN			   (32)
+#define SXE_VPD_SN_LEN				  (16)
+#define SXE_SOC_RST_TIME				(0x93A80)
+#define SXE_SFP_TEMP_THRESHOLD_INTERVAL (3)
+#define MGC_TERMLOG_INFO_MAX_LEN		(12 * 1024)
+#define SXE_REGS_DUMP_MAX_LEN		   (12 * 1024)
+#define SXE_PRODUCT_NAME_LEN		(32)
+
+typedef enum sxe_led_mode {
+	SXE_IDENTIFY_LED_BLINK_ON   = 0,
+	SXE_IDENTIFY_LED_BLINK_OFF,
+	SXE_IDENTIFY_LED_ON,
+	SXE_IDENTIFY_LED_OFF,
+	SXE_IDENTIFY_LED_RESET,
+} sxe_led_mode_s;
+
+typedef struct sxe_led_ctrl {
+	U32	mode;
+	U32	duration;
+
+} sxe_led_ctrl_s;
+
+typedef struct sxe_led_ctrl_resp {
+	U32	ack;
+} sxe_led_ctrl_resp_s;
+
+typedef enum port_link_speed {
+	PORT_LINK_NO			= 0,
+	PORT_LINK_100M		  = 1,
+	PORT_LINK_1G			= 2,
+	PORT_LINK_10G		   = 3,
+} port_link_speed_e;
+
+typedef struct sys_soc_info {
+	S8	 fw_ver[SXE_VERSION_LEN];
+	S8	 opt_ver[SXE_VERSION_LEN];
+	U8	 soc_status;
+	U8	 pad[3];
+	S32	soc_temp;
+	U64	chipid;
+	S8	 chip_type[SXE_CHIP_TYPE_LEN];
+	S8	 pba[SXE_VPD_SN_LEN];
+	S8	 product_name[SXE_PRODUCT_NAME_LEN];
+} sys_soc_info_s;
+
+typedef struct sys_port_info {
+	U64	mac[SXE_MAC_NUM];
+	U8	 is_port_abs;
+	U8	 link_stat;
+	U8	 link_speed;
+
+
+	U8	 is_sfp:1;
+	U8	 is_get_info:1;
+	U8	 rvd:6;
+	S8	 optical_mod_temp;
+	U8	 pad[3];
+	S8	 transceiver_type[SXE_PORT_TRANSCEIVER_LEN];
+	S8	 vendor_name[SXE_PORT_VENDOR_LEN];
+	S8	 vendor_pn[SXE_PORT_VENDOR_LEN];
+} sys_port_info_s;
+
+typedef struct sys_info_resp {
+	sys_soc_info_s	 soc_info;
+	sys_port_info_s	port_info;
+} sys_info_resp_s;
+
+typedef enum sfp_temp_td_mode {
+	SFP_TEMP_THRESHOLD_MODE_ALARM   = 0,
+	SFP_TEMP_THRESHOLD_MODE_WARN,
+} sfp_temp_td_mode_e;
+
+typedef struct sfp_temp_td_set {
+	U8	 mode;
+	U8	 pad[3];
+	S8	 hthreshold;
+	S8	 lthreshold;
+} sfp_temp_td_set_s;
+
+typedef struct sxe_log_export_resp {
+	U16	cur_log_len;
+	U8	 is_end;
+	U8	 pad;
+	S32	session_id;
+	S8	 data[0];
+} sxe_log_export_resp_s;
+
+typedef enum sxe_log_export_type  {
+	SXE_LOG_EXPORT_REQ	= 0,
+	SXE_LOG_EXPORT_FIN,
+	SXE_LOG_EXPORT_ABORT,
+} sxe_log_export_type_e;
+
+typedef struct sxe_log_export_req {
+	U8	 is_all_log;
+	U8	 cmdtype;
+	U8	 is_begin;
+	U8	 pad;
+	S32	session_id;
+	U32	log_len;
+} sxe_log_export_req_s;
+
+typedef struct soc_rst_req {
+	U32	time;
+} soc_rst_req_s;
+
+typedef struct regs_dump_resp {
+	U32	curdw_len;
+	U8	 data[0];
+} regs_dump_resp_s;
+
+enum {
+	SXE_MFG_PART_NUMBER_LEN   = 8,
+	SXE_MFG_SERIAL_NUMBER_LEN = 16,
+	SXE_MFG_REVISION_LEN	  = 4,
+	SXE_MFG_OEM_STR_LEN	   = 64,
+	SXE_MFG_SXE_BOARD_ASSEMBLY_LEN  = 32,
+	SXE_MFG_SXE_BOARD_TRACE_NUM_LEN = 16,
+	SXE_MFG_SXE_MAC_ADDR_CNT		= 2,
+};
+
+typedef struct sxe_mfg_info {
+	U8 part_number[SXE_MFG_PART_NUMBER_LEN];
+	U8 serial_number[SXE_MFG_SERIAL_NUMBER_LEN];
+	U32 mfg_date;
+	U8 revision[SXE_MFG_REVISION_LEN];
+	U32 rework_date;
+	U8 pad[4];
+	U64 mac_addr[SXE_MFG_SXE_MAC_ADDR_CNT];
+	U8 board_trace_num[SXE_MFG_SXE_BOARD_TRACE_NUM_LEN];
+	U8 board_assembly[SXE_MFG_SXE_BOARD_ASSEMBLY_LEN];
+	U8 extra1[SXE_MFG_OEM_STR_LEN];
+	U8 extra2[SXE_MFG_OEM_STR_LEN];
+} sxe_mfg_info_t;
+
+typedef struct sxe_lldp_info {
+	U8	  lldp_state;
+	U8	  pad[3];
+} sxe_lldp_info_t;
+
+typedef struct regs_dump_req {
+	U32	base_addr;
+	U32	dw_len;
+} regs_dump_req_s;
+
+typedef enum sxe_pcs_mode {
+	SXE_PCS_MODE_1000BASE_KX_WO = 0,
+	SXE_PCS_MODE_1000BASE_KX_W,
+	SXE_PCS_MODE_SGMII,
+	SXE_PCS_MODE_10GBASE_KR_WO,
+	SXE_PCS_MODE_AUTO_NEGT_73,
+	SXE_PCS_MODE_LPBK_PHY_TX2RX,
+	SXE_PCS_MODE_LPBK_PHY_RX2TX,
+	SXE_PCS_MODE_LPBK_PCS_RX2TX,
+	SXE_PCS_MODE_BUTT,
+} sxe_pcs_mode_e;
+
+typedef enum sxe_remote_fault_mode {
+	SXE_REMOTE_FALUT_NO_ERROR		= 0,
+	SXE_REMOTE_FALUT_OFFLINE,
+	SXE_REMOTE_FALUT_LINK_FAILURE,
+	SXE_REMOTE_FALUT_AUTO_NEGOTIATION,
+	SXE_REMOTE_UNKNOWN,
+} sxe_remote_fault_e;
+
+typedef struct sxe_phy_cfg {
+	sxe_pcs_mode_e mode;
+	U32 mtu;
+} sxe_pcs_cfg_s;
+
+typedef enum sxe_an_speed {
+	SXE_AN_SPEED_NO_LINK = 0,
+	SXE_AN_SPEED_100M,
+	SXE_AN_SPEED_1G,
+	SXE_AN_SPEED_10G,
+	SXE_AN_SPEED_UNKNOWN,
+} sxe_an_speed_e;
+
+typedef enum sxe_phy_pause_cap {
+	SXE_PAUSE_CAP_NO_PAUSE	= 0,
+	SXE_PAUSE_CAP_ASYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_SYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_BOTH_PAUSE,
+	SXE_PAUSE_CAP_UNKNOWN,
+} sxe_phy_pause_cap_e;
+
+typedef enum sxe_phy_duplex_type {
+	SXE_FULL_DUPLEX	= 0,
+	SXE_HALF_DUPLEX	= 1,
+	SXE_UNKNOWN_DUPLEX,
+} sxe_phy_duplex_type_e;
+
+typedef struct sxe_phy_an_cap {
+	sxe_remote_fault_e   remote_fault;
+	sxe_phy_pause_cap_e  pause_cap;
+	sxe_phy_duplex_type_e duplex_cap;
+} sxe_phy_an_cap_s;
+
+typedef struct sxe_an_cap {
+	sxe_phy_an_cap_s local;
+	sxe_phy_an_cap_s peer;
+} sxe_an_cap_s;
+#endif
drivers/net/sxe/include/sxe/sxe_ioctl.h new file +21 -0
new file mode 100644
index 0000000000..4a4b0bc304
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef _SXE_IOCTL_H_
+#define _SXE_IOCTL_H_
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+struct sxe_ioctl_sync_cmd {
+	U64   traceid;
+	void *in_data;
+	U32   in_len;
+	void *out_data;
+	U32   out_len;
+};
+
+#define SXE_CMD_IOCTL_SYNC_CMD _IOWR('M', 1, struct sxe_ioctl_sync_cmd)
+
+#endif
drivers/net/sxe/meson.build +2 -0
index b06cc4c1fe..4ecf29ba6b 100644
@@ -30,6 +30,8 @@ sources = files(
         'base/sxe_hw.c',
 )
 
+testpmd_sources = files('sxe_testpmd.c')
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe_main.c +3 -0
index bbee8035d6..85bd87d495 100644
@@ -205,6 +205,9 @@ void sxe_hw_start(struct sxe_hw *hw)
 	sxe_hw_vlan_filter_array_clear(hw);
 
 	sxe_hw_stats_regs_clean(hw);
+
+	sxe_hw_no_snoop_disable(hw);
+
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/sxe_testpmd.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#58 lore raw

PATCH v4 12/14 net/sxe: add simd function

In reply to Jie Liu

Add simd function.

---
 drivers/net/sxe/base/sxe_queue_common.c |  52 +-
 drivers/net/sxe/base/sxe_rx_common.c    | 125 ++++-
 drivers/net/sxe/meson.build             |   9 +
 drivers/net/sxe/pf/sxe.h                |   3 +
 drivers/net/sxe/pf/sxe_vec_common.h     | 315 ++++++++++++
 drivers/net/sxe/pf/sxe_vec_neon.c       | 603 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vec_sse.c        | 625 ++++++++++++++++++++++++
 7 files changed, 1725 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_vec_common.h
 create mode 100644 drivers/net/sxe/pf/sxe_vec_neon.c
 create mode 100644 drivers/net/sxe/pf/sxe_vec_sse.c
drivers/net/sxe/base/sxe_queue_common.c +51 -1
index 2c08e24b43..978e56e98b 100644
@@ -14,6 +14,10 @@
 #include "sxe_logs.h"
 #include "sxe_regs.h"
 #include "sxe.h"
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+#include "sxe_vec_common.h"
+#include <rte_vect.h>
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
@@ -58,6 +62,10 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 	u16 len;
 	u64 offloads;
 	s32 ret = 0;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *pf_adapter = dev->data->dev_private;
+	struct sxevf_adapter *vf_adapter = dev->data->dev_private;
+#endif
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -162,6 +170,23 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 				"dma_addr=0x%" SXE_PRIX64,
 			 rxq->buffer_ring, rxq->sc_buffer_ring, rxq->desc_ring,
 			 rxq->base_addr);
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (!rte_is_power_of_2(desc_num)) {
+		PMD_LOG_DEBUG(INIT, "queue[%d] doesn't meet Vector Rx "
+					"preconditions - canceling the feature for "
+					"the whole port[%d]",
+				 rxq->queue_id, rxq->port_id);
+		if (is_vf)
+			vf_adapter->rx_vec_allowed = false;
+		else
+			pf_adapter->rx_vec_allowed = false;
+
+	} else {
+		sxe_rxq_vec_setup(rxq);
+	}
+#endif
+
 	dev->data->rx_queues[queue_idx] = rxq;
 
 	sxe_rx_queue_init(*rx_setup->rx_batch_alloc_allowed, rxq);
@@ -255,6 +280,9 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 		struct rte_eth_recycle_rxq_info *q_info)
 {
 	struct sxe_rx_queue *rxq;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *adapter = dev->data->dev_private;
+#endif
 
 	rxq = dev->data->rx_queues[queue_id];
 
@@ -262,9 +290,21 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
-
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (adapter->rx_vec_allowed) {
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
+		q_info->refill_requirement = rxq->realloc_num;
+		q_info->refill_head = &rxq->realloc_start;
+#endif
+	} else {
+		q_info->refill_requirement = rxq->batch_alloc_size;
+		q_info->refill_head = &rxq->batch_alloc_trigger;
+	}
+#else
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
+#endif
+	return;
 }
 
 void __sxe_tx_queue_info_get(struct rte_eth_dev *dev, u16 queue_id,
@@ -290,7 +330,17 @@ s32 __sxe_tx_done_cleanup(void *tx_queue, u32 free_cnt)
 	struct sxe_tx_queue *txq = (struct sxe_tx_queue *)tx_queue;
 	if (txq->offloads == 0 &&
 		txq->rs_thresh >= RTE_PMD_SXE_MAX_TX_BURST) {
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
+			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
+			txq->buffer_ring_vec != NULL)) {
+			ret = sxe_tx_done_cleanup_vec(txq, free_cnt);
+		} else {
+			ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+		}
+#else
 		ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+#endif
 
 	} else {
 		ret = sxe_tx_done_cleanup_full(txq, free_cnt);
drivers/net/sxe/base/sxe_rx_common.c +119 -6

181 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -0
index 4ecf29ba6b..f53ca7ecaf 100644
@@ -2,6 +2,9 @@
 # Copyright (C), 2022, Linkdata Technology Co., Ltd.
 cflags += ['-DSXE_DPDK']
 cflags += ['-DSXE_HOST_DRIVER']
+cflags += ['-DSXE_DPDK_L4_FEATURES']
+cflags += ['-DSXE_DPDK_SRIOV']
+cflags += ['-DSXE_DPDK_SIMD']
 
 #subdir('base')
 #objs = [base_objs]
@@ -32,6 +35,12 @@ sources = files(
 
 testpmd_sources = files('sxe_testpmd.c')
 
+if arch_subdir == 'x86'
+	sources += files('pf/sxe_vec_sse.c')
+elif arch_subdir == 'arm'
+	sources += files('pf/sxe_vec_neon.c')
+endif
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe.h +3 -0
index 2da5c4df96..fb259635dc 100644
@@ -66,6 +66,9 @@ struct sxe_adapter {
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	bool rx_vec_allowed;
+#endif
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
drivers/net/sxe/pf/sxe_vec_common.h new file +315 -0

315 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_neon.c new file +603 -0

603 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_sse.c new file +625 -0

625 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#59 lore raw

PATCH v4 13/14 net/sxe: add virtual function

In reply to Jie Liu

Add virtual function.

---
 drivers/net/sxe/base/sxe_queue_common.c |    4 +
 drivers/net/sxe/base/sxevf_hw.c         |  951 +++++++++++++++
 drivers/net/sxe/base/sxevf_hw.h         |  349 ++++++
 drivers/net/sxe/base/sxevf_regs.h       |  119 ++
 drivers/net/sxe/meson.build             |   37 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h        |    4 +-
 drivers/net/sxe/pf/sxe.h                |    5 +-
 drivers/net/sxe/pf/sxe_filter.c         |  177 +++
 drivers/net/sxe/pf/sxe_filter.h         |   15 +
 drivers/net/sxe/pf/sxe_main.c           |    2 +
 drivers/net/sxe/pf/sxe_phy.h            |    1 +
 drivers/net/sxe/pf/sxe_stats.c          |    9 +-
 drivers/net/sxe/pf/sxe_vf.c             | 1427 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vf.h             |  219 ++++
 drivers/net/sxe/sxe_testpmd.c           |  130 +++
 drivers/net/sxe/vf/sxevf.h              |   43 +
 drivers/net/sxe/vf/sxevf_ethdev.c       |  768 ++++++++++++
 drivers/net/sxe/vf/sxevf_ethdev.h       |   16 +
 drivers/net/sxe/vf/sxevf_filter.c       |  493 ++++++++
 drivers/net/sxe/vf/sxevf_filter.h       |   72 ++
 drivers/net/sxe/vf/sxevf_irq.c          |  434 +++++++
 drivers/net/sxe/vf/sxevf_irq.h          |   35 +
 drivers/net/sxe/vf/sxevf_main.c         |   83 ++
 drivers/net/sxe/vf/sxevf_msg.c          |  624 ++++++++++
 drivers/net/sxe/vf/sxevf_msg.h          |  201 ++++
 drivers/net/sxe/vf/sxevf_offload.c      |   31 +
 drivers/net/sxe/vf/sxevf_offload.h      |   16 +
 drivers/net/sxe/vf/sxevf_queue.c        |  210 ++++
 drivers/net/sxe/vf/sxevf_queue.h        |   70 ++
 drivers/net/sxe/vf/sxevf_rx.c           |  163 +++
 drivers/net/sxe/vf/sxevf_rx.h           |   18 +
 drivers/net/sxe/vf/sxevf_stats.c        |  162 +++
 drivers/net/sxe/vf/sxevf_stats.h        |   31 +
 drivers/net/sxe/vf/sxevf_tx.c           |   46 +
 drivers/net/sxe/vf/sxevf_tx.h           |   14 +
 35 files changed, 6960 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxevf_hw.c
 create mode 100644 drivers/net/sxe/base/sxevf_hw.h
 create mode 100644 drivers/net/sxe/base/sxevf_regs.h
 create mode 100644 drivers/net/sxe/pf/sxe_vf.c
 create mode 100644 drivers/net/sxe/pf/sxe_vf.h
 create mode 100644 drivers/net/sxe/vf/sxevf.h
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.c
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.h
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.c
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.h
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.c
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.h
 create mode 100644 drivers/net/sxe/vf/sxevf_main.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.h
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.c
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.h
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.c
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.h
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.h
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.c
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.h
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.h
drivers/net/sxe/base/sxe_queue_common.c +4 -0
index 978e56e98b..914718769f 100644
@@ -13,11 +13,15 @@
 #include "sxe_tx.h"
 #include "sxe_logs.h"
 #include "sxe_regs.h"
+#include "sxevf_regs.h"
 #include "sxe.h"
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include "sxe_vec_common.h"
 #include <rte_vect.h>
 #endif
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
+#include "sxevf.h"
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
drivers/net/sxe/base/sxevf_hw.c new file +951 -0

951 lines not on this page · raw message

drivers/net/sxe/base/sxevf_hw.h new file +349 -0

349 lines not on this page · raw message

drivers/net/sxe/base/sxevf_regs.h new file +119 -0

119 lines not on this page · raw message

drivers/net/sxe/meson.build +25 -12
index f53ca7ecaf..a3b874b7e2 100644
@@ -11,26 +11,38 @@ cflags += ['-DSXE_DPDK_SIMD']
 
 deps += ['hash']
 sources = files(
-        'pf/sxe_main.c',
+    'pf/sxe_main.c',
 	'pf/sxe_filter.c',
-        'pf/sxe_flow_ctrl.c',
-        'pf/sxe_irq.c',
-        'pf/sxe_ethdev.c',
+    'pf/sxe_flow_ctrl.c',
+    'pf/sxe_irq.c',
+    'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
 	'pf/sxe_stats.c',
-        'pf/sxe_pmd_hdc.c',
-        'pf/sxe_phy.c',
-        'pf/sxe_ptp.c',
-        'pf/sxe_dcb.c',
-        'base/sxe_queue_common.c',
+	'pf/sxe_pmd_hdc.c',
+    'pf/sxe_phy.c',
+    'pf/sxe_ptp.c',
+    'pf/sxe_vf.c',
+    'pf/sxe_dcb.c',
+    'vf/sxevf_main.c',
+	'vf/sxevf_filter.c',
+	'vf/sxevf_irq.c',
+	'vf/sxevf_msg.c',
+	'vf/sxevf_ethdev.c',
+	'vf/sxevf_stats.c',
+	'vf/sxevf_rx.c',
+	'vf/sxevf_tx.c',
+	'vf/sxevf_queue.c',
+	'vf/sxevf_offload.c',
+    'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
 	'base/sxe_offload_common.c',
-        'base/sxe_common.c',
-        'base/sxe_hw.c',
+    'base/sxe_common.c',
+    'base/sxe_hw.c',
+    'base/sxevf_hw.c',
 )
 
 testpmd_sources = files('sxe_testpmd.c')
@@ -43,5 +55,6 @@ endif
 
 includes += include_directories('base')
 includes += include_directories('pf')
+includes += include_directories('vf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
+includes += include_directories('include/')
\ No newline at end of file
drivers/net/sxe/pf/rte_pmd_sxe.h +3 -1
index 16406c6c26..69b0df2bd1 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #ifndef __PMD_SXE_H__
 #define __PMD_SXE_H__
 
@@ -13,4 +12,7 @@ typedef int32_t		s32;
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
 
 s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
+
+int rte_pmd_sxe_set_vf_rxmode(u16 port, u16 vf,
+u16 rx_mask, u8 on);
 #endif
drivers/net/sxe/pf/sxe.h +4 -1
index fb259635dc..abba0bd6fa 100644
@@ -11,8 +11,9 @@
 #include "sxe_types.h"
 #include "sxe_stats.h"
 #include "sxe_irq.h"
-#include "sxe_phy.h"
+#include "sxe_vf.h"
 #include "sxe_dcb.h"
+#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -62,6 +63,8 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_virtual_context vt_ctxt;
+
 	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_filter.c +177 -0

202 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +15 -0
index b8c67f8d42..e56baaf962 100644
@@ -75,6 +75,15 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_uc_hash_table_set(struct rte_eth_dev *dev,
+			struct rte_ether_addr *mac_addr, u8 on);
+
+s32 sxe_uc_all_hash_table_set(struct rte_eth_dev *dev, u8 on);
+
+s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
+			  struct rte_ether_addr *mc_addr_list,
+			  u32 nb_mc_addr);
+
 s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
 
 s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
@@ -94,4 +103,10 @@ void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
 
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
+u8 sxe_sw_uc_entry_vf_add(struct sxe_adapter *adapter,
+				u8 vf_idx, u8 *mac_addr, bool macvlan);
+
+void sxe_sw_uc_entry_vf_del(struct sxe_adapter *adapter, u8 vf_idx,
+					bool macvlan);
+
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 85bd87d495..49f9dd2f27 100644
@@ -20,10 +20,12 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_vf.h"
 #include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
drivers/net/sxe/pf/sxe_phy.h +1 -0
index 9fd2746ec8..d907b3c8f8 100644
@@ -6,6 +6,7 @@
 
 #include <rte_ethdev.h>
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_msg.h"
 
 #define SXE_SFF_BASE_ADDR			0x0
drivers/net/sxe/pf/sxe_stats.c +4 -5
index 6b9e1beb3e..af3c0bf84c 100644
@@ -219,10 +219,9 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	u8 prio;
 
 	cnt = SXE_XSTAT_CNT;
-	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt:%u "
-			"fc xstat field cnt:%u ", cnt,
-			SXE_XSTAT_MAC_CNT,
-			SXE_XSTAT_FC_CNT);
+	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
+			"fc xstat field cnt: %" SXE_PRIU64, cnt,
+			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -333,7 +332,7 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 
 	if (usr_cnt < SXE_XSTAT_CNT) {
 		ret = -SXE_ERR_PARAM;
-		PMD_LOG_ERR(DRV, "max:%u usr_cnt:%u invalid.(err:%d)",
+		PMD_LOG_ERR(DRV, "max: %" SXE_PRIU64 " usr_cnt:%u invalid.(err:%d)",
 				SXE_XSTAT_CNT, usr_cnt, ret);
 		goto l_out;
 	}
drivers/net/sxe/pf/sxe_vf.c new file +1427 -0

1,210 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vf.h new file +219 -0

219 lines not on this page · raw message

drivers/net/sxe/sxe_testpmd.c +130 -0

130 lines not on this page · raw message

drivers/net/sxe/vf/sxevf.h new file +43 -0

43 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.c new file +768 -0

768 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.h new file +16 -0
new file mode 100644
index 0000000000..57dfeea2e6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_filter.c new file +493 -0

493 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_filter.h new file +72 -0

72 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.c new file +434 -0

434 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.h new file +35 -0
new file mode 100644
index 0000000000..def1167af7

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_main.c new file +83 -0

83 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.c new file +624 -0

624 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.h new file +201 -0

201 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_offload.c new file +31 -0
new file mode 100644
index 0000000000..4b0eacf7f0

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_offload.h new file +16 -0
new file mode 100644
index 0000000000..ae4bf87f30

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_queue.c new file +210 -0

210 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_queue.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.c new file +163 -0

163 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.h new file +18 -0
new file mode 100644
index 0000000000..55ca2705c1

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_stats.c new file +162 -0

162 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_stats.h new file +31 -0
new file mode 100644
index 0000000000..ddf56c39df

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_tx.c new file +46 -0

46 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_tx.h new file +14 -0
new file mode 100644
index 0000000000..c8ad400bca

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#60 lore raw

PATCH v4 14/14 net/sxe: add Solve compilation problems.

In reply to Jie Liu

Add Fix compiling issues.

---
 drivers/net/sxe/base/sxe_compat_version.h |  1 -
 drivers/net/sxe/base/sxe_hw.c             | 21 ++++++++----
 drivers/net/sxe/base/sxe_offload_common.c |  1 -
 drivers/net/sxe/base/sxe_queue_common.c   |  3 +-
 drivers/net/sxe/base/sxe_rx_common.c      | 10 +++---
 drivers/net/sxe/base/sxe_rx_common.h      |  2 --
 drivers/net/sxe/base/sxe_tx_common.c      |  1 -
 drivers/net/sxe/base/sxevf_hw.c           |  1 -
 drivers/net/sxe/include/sxe/sxe_cli.h     |  6 ++--
 drivers/net/sxe/meson.build               | 42 +++++++++++------------
 drivers/net/sxe/pf/sxe.h                  | 11 +++---
 drivers/net/sxe/pf/sxe_dcb.c              |  2 +-
 drivers/net/sxe/pf/sxe_filter.c           |  1 -
 drivers/net/sxe/pf/sxe_filter.h           |  1 -
 drivers/net/sxe/pf/sxe_irq.h              |  2 --
 drivers/net/sxe/pf/sxe_main.c             | 15 --------
 drivers/net/sxe/pf/sxe_offload.c          |  1 -
 drivers/net/sxe/pf/sxe_phy.c              |  4 +--
 drivers/net/sxe/pf/sxe_pmd_hdc.c          |  1 -
 drivers/net/sxe/pf/sxe_queue.c            |  2 --
 drivers/net/sxe/pf/sxe_queue.h            |  2 --
 drivers/net/sxe/pf/sxe_rx.c               |  1 -
 drivers/net/sxe/pf/sxe_stats.c            | 23 ++++++++++---
 drivers/net/sxe/pf/sxe_stats.h            |  8 ++---
 drivers/net/sxe/pf/sxe_tx.c               | 23 +------------
 drivers/net/sxe/pf/sxe_vec_common.h       |  8 ++++-
 drivers/net/sxe/pf/sxe_vec_neon.c         |  2 --
 drivers/net/sxe/pf/sxe_vec_sse.c          |  1 -
 drivers/net/sxe/pf/sxe_vf.c               |  1 -
 drivers/net/sxe/pf/sxe_vf.h               |  1 -
 drivers/net/sxe/sxe_drv_type.h            |  4 ---
 drivers/net/sxe/sxe_testpmd.c             |  5 +--
 drivers/net/sxe/vf/sxevf_ethdev.c         |  6 ++--
 drivers/net/sxe/vf/sxevf_filter.h         |  4 +--
 drivers/net/sxe/vf/sxevf_irq.c            |  2 --
 drivers/net/sxe/vf/sxevf_irq.h            |  1 -
 drivers/net/sxe/vf/sxevf_main.c           |  1 -
 drivers/net/sxe/vf/sxevf_msg.c            |  2 +-
 drivers/net/sxe/vf/sxevf_offload.c        |  1 -
 drivers/net/sxe/vf/sxevf_queue.c          |  2 --
 drivers/net/sxe/vf/sxevf_queue.h          |  1 -
 drivers/net/sxe/vf/sxevf_rx.c             |  1 -
 42 files changed, 91 insertions(+), 137 deletions(-)
drivers/net/sxe/base/sxe_compat_version.h +0 -1
index 5b8577067d..f3c6893ad9 100644
@@ -6,7 +6,6 @@
 #define __SXE_COMPAT_VERSION_H__
 
 #include <stdbool.h>
-#include "sxe_dpdk_version.h"
 
 struct rte_eth_dev;
 enum rte_eth_event_type;
drivers/net/sxe/base/sxe_hw.c +14 -7
index 4ccab2ad54..392fc8ac23 100644
@@ -3,6 +3,7 @@
  */
 #ifdef SXE_PHY_CONFIGURE
 #include <linux/mdio.h>
+#include <rte_compat.h>
 #endif
 #if defined(__KERNEL__) || defined(SXE_KERNEL_TEST)
 #include "sxe_pci.h"
@@ -1893,7 +1894,7 @@ static void sxe_hw_rx_pkt_buf_size_configure(struct sxe_hw *hw,
 		for (i = 0; i < (num_pb / 2); i++)
 			SXE_REG_WRITE(hw, SXE_RXPBSIZE(i), rx_buf_size);
 
-		fallthrough;
+		/* fallthrough */
 	case (PBA_STRATEGY_EQUAL):
 		rx_buf_size = (total_buf_size / (num_pb - i))
 				<< SXE_RX_PKT_BUF_SIZE_SHIFT;
@@ -2231,7 +2232,7 @@ static s32 sxe_hw_fnav_vm_pool_mask_get(struct sxe_hw *hw,
 	switch (vm_pool & SXE_SAMPLE_VM_POOL_MASK) {
 	case 0x0:
 		*fnavm |= SXE_FNAVM_POOL;
-		fallthrough;
+		/* fallthrough */
 	case 0x7F:
 		break;
 	default:
@@ -2279,13 +2280,13 @@ static s32 sxe_hw_fnav_vlan_mask_get(struct sxe_hw *hw,
 	switch (ntohs(vlan_id) & SXE_SAMPLE_VLAN_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0x0FFF:
 		*fnavm |= SXE_FNAVM_VLANP;
 		break;
 	case 0xE000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0xEFFF:
 		break;
 	default:
@@ -2305,7 +2306,7 @@ static s32 sxe_hw_fnav_flex_bytes_mask_get(struct sxe_hw *hw,
 	switch ((__force u16)flex_bytes & SXE_SAMPLE_FLEX_BYTES_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_FLEX;
-		fallthrough;
+		/* fallthrough */
 	case 0xFFFF:
 		break;
 	default:
@@ -4963,7 +4964,14 @@ bool sxe_hw_is_rss_enabled(struct sxe_hw *hw)
 {
 	bool rss_enable = false;
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
-	if (mrqc & SXE_MRQC_RSSEN)
+
+
+	u32 mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
+	if (mrqe_val == SXE_MRQC_RSSEN ||
+		mrqe_val == SXE_MRQC_RTRSS8TCEN ||
+		mrqe_val == SXE_MRQC_RTRSS4TCEN ||
+		mrqe_val == SXE_MRQC_VMDQRSS32EN ||
+		mrqe_val == SXE_MRQC_VMDQRSS64EN)
 		rss_enable = true;
 
 	return rss_enable;
@@ -5497,7 +5505,6 @@ void sxe_hw_rss_cap_switch(struct sxe_hw *hw, bool is_on)
 {
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
 	u32 mrqe_val;
-
 	mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
 	if (is_on) {
 		mrqe_val = SXE_MRQC_RSSEN;
drivers/net/sxe/base/sxe_offload_common.c +0 -1
index f87cce67a5..7ecb31f466 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/base/sxe_queue_common.c +2 -1
index 914718769f..e31ebd005a 100644
@@ -4,7 +4,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
@@ -294,6 +293,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	if (adapter->rx_vec_allowed) {
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
@@ -308,6 +308,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
 #endif
+
 	return;
 }
 
drivers/net/sxe/base/sxe_rx_common.c +6 -4
index e3fee580df..5e46ff76f3 100644
@@ -5,7 +5,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_mbuf.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_malloc.h>
@@ -80,8 +79,6 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	u16  i, is_using_sse;
 
 	if (sxe_rx_vec_condition_check(dev) ||
-		!rx_batch_alloc_allowed ||
-		rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128
 		!rx_batch_alloc_allowed
 		) {
 		PMD_LOG_DEBUG(INIT, "Port[%d] doesn't meet Vector Rx "
@@ -111,6 +108,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
+
 #endif
 			dev->rx_pkt_burst = sxe_scattered_pkts_vec_recv;
 
@@ -138,12 +136,13 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 			dev->rx_pkt_burst = sxe_single_alloc_lro_pkts_recv;
 		}
 	}
-#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	else if (*rx_vec_allowed) {
 		PMD_LOG_DEBUG(INIT, "Vector rx enabled, please make sure RX "
 					"burst size no less than %d (port=%d).",
 				 SXE_DESCS_PER_LOOP,
 				 dev->data->port_id);
+
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 		dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
 
@@ -166,6 +165,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 		dev->rx_pkt_burst = sxe_pkts_recv;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	is_using_sse =
 		(dev->rx_pkt_burst == sxe_scattered_pkts_vec_recv ||
@@ -177,6 +177,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 		rxq->is_using_sse = is_using_sse;
 	}
 #endif
+
 }
 
 s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset)
@@ -340,6 +341,7 @@ const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of
 		ptypes = ptypes_arr;
 		goto l_end;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #if defined(RTE_ARCH_X86)
 	if (dev->rx_pkt_burst == sxe_pkts_vec_recv ||
drivers/net/sxe/base/sxe_rx_common.h +0 -2
index f9afb517d9..d1bf172c89 100644
@@ -5,8 +5,6 @@
 #ifndef __SXE_RX_COMMON_H__
 #define __SXE_RX_COMMON_H__
 
-#include "sxe_dpdk_version.h"
-
 void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
 
drivers/net/sxe/base/sxe_tx_common.c +0 -1
index e4cf514547..5f8a951bbd 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <rte_net.h>
drivers/net/sxe/base/sxevf_hw.c +0 -1
index 7425bafedb..914860e912 100644
@@ -15,7 +15,6 @@
 #else
 #include "sxe_errno.h"
 #include "sxe_logs.h"
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include "sxevf.h"
 #include "sxevf_hw.h"
drivers/net/sxe/include/sxe/sxe_cli.h +3 -3
index 623347dab2..8ffb14f68b 100644
@@ -9,7 +9,7 @@
 #include "sxe_drv_type.h"
 #endif
 
-#define SXE_VERSION_LEN				  (32)
+#define SXE_VERION_LEN				  (32)
 #define SXE_MAC_NUM					 (128)
 #define SXE_PORT_TRANSCEIVER_LEN		(32)
 #define SXE_PORT_VENDOR_LEN			 (32)
@@ -47,8 +47,8 @@ typedef enum port_link_speed {
 } port_link_speed_e;
 
 typedef struct sys_soc_info {
-	S8	 fw_ver[SXE_VERSION_LEN];
-	S8	 opt_ver[SXE_VERSION_LEN];
+	S8	 fw_ver[SXE_VERION_LEN];
+	S8	 opt_ver[SXE_VERION_LEN];
 	U8	 soc_status;
 	U8	 pad[3];
 	S32	soc_temp;
drivers/net/sxe/meson.build +21 -21

64 lines not on this page · raw message

drivers/net/sxe/pf/sxe.h +5 -6
index abba0bd6fa..eaf66a3acb 100644
@@ -6,14 +6,16 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-#include "sxe_filter.h"
+
 #include <stdbool.h>
+
 #include "sxe_types.h"
-#include "sxe_stats.h"
+#include "sxe_filter.h"
 #include "sxe_irq.h"
+#include "sxe_stats.h"
+#include "sxe_phy.h"
 #include "sxe_vf.h"
 #include "sxe_dcb.h"
-#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -81,9 +83,6 @@ struct sxe_adapter {
 	RTE_ATOMIC(bool)link_thread_running;
 	RTE_ATOMIC(bool)is_stopping;
 	rte_thread_t link_thread_tid;
-	rte_atomic32_t link_thread_running;
-	rte_atomic32_t is_stopping;
-	pthread_t link_thread_tid;
 	bool is_stopped;
 };
 
drivers/net/sxe/pf/sxe_dcb.c +1 -1
index 0f59886010..ef32fdd611 100644
@@ -584,7 +584,7 @@ static void sxe_dcb_cee_pfc_parse(struct sxe_dcb_config *cfg,
 static s32 sxe_dcb_tc_stats_configure(struct sxe_hw *hw,
 					struct sxe_dcb_config *dcb_config)
 {
-	s32 ret;
+	s32 ret = 0;
 	u8 tc_count = 8;
 	bool vmdq_active = false;
 
drivers/net/sxe/pf/sxe_filter.c +0 -1
index bf3eb40177..6b0d02c042 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
 #include <rte_malloc.h>
drivers/net/sxe/pf/sxe_filter.h +0 -1
index e56baaf962..b0c6986a7e 100644
@@ -6,7 +6,6 @@
 #define __SXE_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_types.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_irq.h +0 -2
index b2c5692932..eba70f5361 100644
@@ -4,8 +4,6 @@
 
 #ifndef __SXE_IRQ_H__
 #define __SXE_IRQ_H__
-
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_compat_platform.h"
drivers/net/sxe/pf/sxe_main.c +0 -15
index 49f9dd2f27..6c0891dbde 100644
@@ -8,7 +8,6 @@
 #include <rte_pci.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
@@ -245,24 +244,10 @@ RTE_LOG_REGISTER_SUFFIX(sxe_log_rx, pmd.net.sxe.rx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_tx, pmd.net.sxe.tx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_hw, pmd.net.sxe.tx_hw, DEBUG);
 #else
-#ifdef DPDK_19_11_6
-s32 sxe_log_init;
-s32 sxe_log_drv;
-RTE_INIT(sxe_init_log)
-{
-	sxe_log_init = rte_log_register("pmd.net.sxe.init");
-	if (sxe_log_init >= 0)
-		rte_log_set_level(sxe_log_init, RTE_LOG_NOTICE);
 
-	sxe_log_drv = rte_log_register("pmd.net.sxe.drv");
-	if (sxe_log_drv >= 0)
-		rte_log_set_level(sxe_log_drv, RTE_LOG_NOTICE);
-}
-#else
 RTE_LOG_REGISTER_SUFFIX(sxe_log_init, pmd.net.sxe.init, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_drv, pmd.net.sxe.drv, NOTICE);
 #endif
-#endif
 
 int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
 	enum rte_eth_event_type event, void *ret_param)
drivers/net/sxe/pf/sxe_offload.c +0 -1
index 4b49cba707..d34cf7ecc8 100644
@@ -2,7 +2,6 @@
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
 #include <ethdev_driver.h>
-
 #include "sxe.h"
 #include "sxe_offload.h"
 #include "sxe_logs.h"
drivers/net/sxe/pf/sxe_phy.c +2 -2
index 787b16fb47..afc885545e 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include <rte_cycles.h>
@@ -69,7 +68,8 @@ void sxe_wait_setup_link_complete(struct rte_eth_dev *dev,
 	struct sxe_adapter *adapter = dev->data->dev_private;
 	uint32_t timeout = timeout_ms ? timeout_ms : SXE_WARNING_TIMEOUT;
 
-	while (rte_atomic_load_explicit(&adapter->link_thread_running, rte_memory_order_seq_cst)) {
+	while (rte_atomic_load_explicit(&adapter->link_thread_running,
+		rte_memory_order_seq_cst)) {
 		rte_delay_us_sleep(1000);
 		timeout--;
 
drivers/net/sxe/pf/sxe_pmd_hdc.c +0 -1
index 21f751ed26..61dcb6a6c1 100644
@@ -3,7 +3,6 @@
  */
 
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_version.h"
 #include <semaphore.h>
drivers/net/sxe/pf/sxe_queue.c +0 -2
index 9411da8ff8..75287defda 100644
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "rte_malloc.h"
 #include "sxe.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_queue.h +0 -2
index e67baf6135..027aea0755 100644
@@ -3,8 +3,6 @@
  */
 #ifndef __SXE_QUEUE_H__
 #define __SXE_QUEUE_H__
-
-#include "sxe_dpdk_version.h"
 #include "sxe_queue_common.h"
 
 #define SXE_TXRX_RING_NUM_MAX	 64
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 65cfcca4c9..b1c53a533a 100644
@@ -113,7 +113,6 @@
 
 
 const alignas(RTE_CACHE_LINE_SIZE) u32 sxe_ptype_table[SXE_PACKET_TYPE_MAX] = {
-
 	[SXE_PACKET_TYPE_ETHER] = RTE_PTYPE_L2_ETHER,
 	[SXE_PACKET_TYPE_IPV4] = RTE_PTYPE_L2_ETHER |
 		RTE_PTYPE_L3_IPV4,
drivers/net/sxe/pf/sxe_stats.c +18 -5
index af3c0bf84c..48b6b9da2c 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include "sxe_stats.h"
 #include "sxe.h"
 #include "sxe_logs.h"
@@ -221,7 +220,7 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	cnt = SXE_XSTAT_CNT;
 	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
 			"fc xstat field cnt: %" SXE_PRIU64, cnt,
-			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
+			(u64)SXE_XSTAT_MAC_CNT, (u64)SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -432,7 +431,11 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 size = SXE_XSTAT_CNT;
 	u32 i;
-	u64 value_all[size];
+	u64 *value_all = (u64 *)malloc(size * sizeof(u64));
+	if (value_all == NULL) {
+		perror("value_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_all_xstats_value_get(eth_dev, values, usr_cnt);
@@ -459,6 +462,9 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (value_all != NULL)
+		free(value_all);
+
 	return ret;
 }
 
@@ -470,7 +476,12 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 i;
 	u32 size = SXE_XSTAT_CNT;
-	struct rte_eth_xstat_name xstat_names_all[size];
+	struct rte_eth_xstat_name *xstat_names_all =
+	(struct rte_eth_xstat_name *)malloc(size * sizeof(struct rte_eth_xstat_name));
+	if (xstat_names_all == NULL) {
+		perror("xstat_names_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_xstats_names_get(eth_dev, xstats_names, usr_cnt);
@@ -490,6 +501,9 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (xstat_names_all != NULL)
+		free(xstat_names_all);
+
 	return ret;
 }
 
@@ -573,4 +587,3 @@ void sxe_queue_stats_map_reset(struct rte_eth_dev *eth_dev)
 		sxe_hw_rxq_stat_map_set(hw, reg_idx, 0);
 	}
 }
-
drivers/net/sxe/pf/sxe_stats.h +3 -5
index 78a13e7a0b..320a82a130 100644
@@ -7,8 +7,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxe_hw.h"
 
 #define SXE_STATS_FIELD_NAME_SIZE  50
@@ -49,11 +47,11 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 	struct rte_eth_xstat_name *xstats_names, __rte_unused unsigned int size);
 
 s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
-					const ulong *ids,
-					ulong *values, u32 usr_cnt);
+					const u64 *ids,
+					u64 *values, u32 usr_cnt);
 
 s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
-	const ulong *ids,
+	const u64 *ids,
 	struct rte_eth_xstat_name *xstats_names,
 	u32 usr_cnt);
 
drivers/net/sxe/pf/sxe_tx.c +1 -22
index b50052e0db..46e65ebcf7 100644
@@ -1,18 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
-#if defined DPDK_20_11_5 || defined DPDK_19_11_6
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
-#elif defined DPDK_21_11_5
-#include <ethdev_driver.h>
-#include <rte_dev.h>
-#else
 #include <ethdev_driver.h>
 #include <dev_driver.h>
-#endif
-
 #include <rte_net.h>
 
 #include "sxe.h"
@@ -43,17 +33,10 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 		dev->tx_pkt_prepare = NULL;
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
-#ifndef DPDK_19_11_6
-			rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128 &&
-#endif
 			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
 			sxe_txq_vec_setup(txq) == 0)) {
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_tx_mbufs_reuse = sxe_recycle_tx_mbufs_reuse_vec;
-#endif
-#endif
 #endif
 			dev->tx_pkt_burst   = sxe_pkts_vector_xmit;
 			PMD_LOG_INFO(INIT, "using vector tx code path");
@@ -72,7 +55,7 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 
 		PMD_LOG_INFO(INIT, "using full-featured tx code path");
 		PMD_LOG_INFO(INIT, " - offloads = 0x%" SXE_PRIX64,
-					(unsigned long)txq->offloads);
+							txq->offloads);
 		PMD_LOG_INFO(INIT, " - tx_rs_thresh = %d "
 				   "[RTE_PMD_SXE_MAX_TX_BURST=%d]",
 				txq->rs_thresh,
@@ -370,8 +353,6 @@ u16 sxe_pkts_simple_xmit(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num
 }
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	struct rte_eth_recycle_rxq_info *recycle_rxq_info)
@@ -438,8 +419,6 @@ u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	return nb_recycle_mbufs;
 }
 #endif
-#endif
-#endif
 
 u16 sxe_pkts_vector_xmit(void *tx_queue, struct rte_mbuf **tx_pkts,
 			   u16 pkts_num)
drivers/net/sxe/pf/sxe_vec_common.h +7 -1
index 85605507f5..90ace4c324 100644
@@ -11,6 +11,7 @@
 #include <dev_driver.h>
 #include <rte_malloc.h>
 #include "sxe.h"
+#include "sxe_queue.h"
 #include "sxe_rx.h"
 
 #define RTE_SXE_MAX_TX_FREE_BUF_SZ	64
@@ -77,7 +78,11 @@ static inline u16
 sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 			u16 bufs_num, u8 *split_flags)
 {
-	struct rte_mbuf *pkts[bufs_num];
+	struct rte_mbuf **pkts = (struct rte_mbuf **)malloc(bufs_num * sizeof(struct rte_mbuf *));
+	if (pkts == NULL) {
+		perror("pkts malloc failed");
+		exit(EXIT_FAILURE);
+	}
 	struct rte_mbuf *start = rxq->pkt_first_seg;
 	struct rte_mbuf *end = rxq->pkt_last_seg;
 	u32 pkt_idx, buf_idx;
@@ -129,6 +134,7 @@ sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 	rxq->pkt_last_seg = end;
 	memcpy(rx_bufs, pkts, pkt_idx * (sizeof(*pkts)));
 
+	free(pkts);
 	return pkt_idx;
 }
 
drivers/net/sxe/pf/sxe_vec_neon.c +0 -2
index 9012750c98..30d878ea39 100644
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 
drivers/net/sxe/pf/sxe_vec_sse.c +0 -1
index 8786af75f8..d54542f4a8 100644
@@ -4,7 +4,6 @@
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
drivers/net/sxe/pf/sxe_vf.c +0 -1
index f47a65279e..2e53087816 100644
@@ -6,7 +6,6 @@
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_memcpy.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/pf/sxe_vf.h +0 -1
index 05b91540cc..112d98df39 100644
@@ -5,7 +5,6 @@
 #ifndef __SXE_VF_H__
 #define __SXE_VF_H__
 
-#include "sxe_dpdk_version.h"
 #include <rte_ethdev.h>
 #include <bus_pci_driver.h>
 
drivers/net/sxe/sxe_drv_type.h +0 -4
index 6261f2d320..1ccf0b3f87 100644
@@ -5,14 +5,10 @@
 #ifndef __SXE_DRV_TYPEDEF_H__
 #define __SXE_DRV_TYPEDEF_H__
 
-#ifdef SXE_DPDK
 #include "sxe_types.h"
 #ifndef bool
 #define bool _Bool
 #endif
-#else
-#include <linux/types.h>
-#endif
 
 typedef u8 U8;
 typedef u16 U16;
drivers/net/sxe/sxe_testpmd.c +3 -2
index b533ae939b..6e4dfb31ee 100644
@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
+
 #include <ethdev_driver.h>
-#include "sxe_ethdev.h"
+#include "sxe_drv_type.h"
 #include "rte_pmd_sxe.h"
-
+#include "sxe_ethdev.h"
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_parse_num.h>
 #include <cmdline_parse_string.h>
drivers/net/sxe/vf/sxevf_ethdev.c +2 -4
index 69740bfa6c..b1655e8642 100644
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <inttypes.h>
-#include "sxe_dpdk_version.h"
+
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
@@ -252,6 +252,7 @@ static void sxevf_txrx_start(struct rte_eth_dev *eth_dev)
 		txq = eth_dev->data->tx_queues[i];
 		sxevf_tx_ring_switch(hw, txq->reg_idx, true);
 		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	}
 
 	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
@@ -332,7 +333,6 @@ static s32 sxevf_dev_stop(struct rte_eth_dev *dev)
 	sxevf_irq_free(dev);
 
 l_out:
-
 	return 0;
 }
 
@@ -362,7 +362,6 @@ static s32 sxevf_dev_close(struct rte_eth_dev *dev)
 	sxevf_irq_unregister(dev);
 
 l_out:
-
 	return ret;
 }
 
@@ -470,7 +469,6 @@ static s32 sxevf_mtu_set(struct rte_eth_dev *dev, u16 mtu)
 		goto l_out;
 	}
 
-	dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame;
 	LOG_INFO_BDF("change max frame size to %u success.", max_frame);
 
 l_out:
drivers/net/sxe/vf/sxevf_filter.h +2 -2
index f6af527cbe..defdf5ecc9 100644
@@ -6,9 +6,7 @@
 #define __SXEVF_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
-#endif
 
 #define SXEVF_MTA_ENTRY_NUM_MAX		128
 #define SXEVF_UTA_HASH_BIT_MAX		 4096
@@ -70,3 +68,5 @@ s32 sxevf_mac_addr_add(struct rte_eth_dev *dev,
 s32 sxevf_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
+
+#endif
drivers/net/sxe/vf/sxevf_irq.c +0 -2
index bf768a67f6..3263f56313 100644
@@ -9,10 +9,8 @@
 #include <rte_alarm.h>
 #include <rte_interrupts.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <eal_interrupts.h>
-
 #include "sxevf.h"
 #include "sxe_logs.h"
 #include "sxe_errno.h"
drivers/net/sxe/vf/sxevf_irq.h +0 -1
index def1167af7..2f9860ba15 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_IRQ_H__
 #define __SXEVF_IRQ_H__
 
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_platform.h"
 
drivers/net/sxe/vf/sxevf_main.c +0 -1
index d418705cf8..b1924c1475 100644
@@ -12,7 +12,6 @@
 #include <rte_dev.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/vf/sxevf_msg.c +1 -1
index faf6787e74..37d3f2c5dc 100644
@@ -101,7 +101,7 @@ static s32 sxevf_mailbox_lock(struct sxevf_hw *hw)
 		mailbox |= SXE_VFMAILBOX_VFU;
 		sxevf_mailbox_write(hw, mailbox);
 
-		if (sxevf_mbx_reg_read(hw) && SXE_VFMAILBOX_VFU) {
+		if (sxevf_mbx_reg_read(hw) & SXE_VFMAILBOX_VFU) {
 			ret = 0;
 			break;
 		}
drivers/net/sxe/vf/sxevf_offload.c +0 -1
index 4b0eacf7f0..b39245aa11 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/vf/sxevf_queue.c +0 -2
index 4461d13369..69ef1f6676 100644
@@ -7,8 +7,6 @@
 #include <rte_byteorder.h>
 #include <rte_mbuf_core.h>
 #include <rte_ethdev.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxevf_rx.h"
 #include "sxevf_tx.h"
 #include "sxe_logs.h"
drivers/net/sxe/vf/sxevf_queue.h +0 -1
index 9407e941fb..01e2ec216c 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_QUEUEU_H__
 #define __SXEVF_QUEUEU_H__
 
-#include "sxe_dpdk_version.h"
 #include "sxe_types.h"
 #include "sxe_queue_common.h"
 
drivers/net/sxe/vf/sxevf_rx.c +0 -1
index aee63d025d..81aab3f315 100644
@@ -5,7 +5,6 @@
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
 
 #include <rte_common.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_logs.h"
Signature · 1 line
2.18.4
#61 lore raw

Re: [PATCH v4 14/14] net/sxe: add Solve compilation problems.

Quoted 4 lines · On Wed, 9 Jul 2025 04:43:14 -0400 Jie Liu <[email protected]>…

Add Fix compiling issues.

---

Please integrate these into earlier patches.

Overall will not go further in review and build tests until driver passes CI build tests.

author
#62 lore raw

PATCH v5 1/14 net/sxe: add base driver directory and doc

In reply to Jie Liu

Adding a minimum maintainable directory structure for the network driver and request maintenance of the sxe driver.

---
 MAINTAINERS                         |  6 +++
 doc/guides/nics/features/sxe.ini    | 78 +++++++++++++++++++++++++++++
 doc/guides/nics/features/sxe_vf.ini | 37 ++++++++++++++
 doc/guides/nics/index.rst           |  1 +
 doc/guides/nics/sxe.rst             | 71 ++++++++++++++++++++++++++
 drivers/net/sxe/meson.build         |  9 ++++
 drivers/net/sxe/pf/sxe_ethdev.c     |  3 ++
 drivers/net/sxe/pf/sxe_ethdev.h     |  3 ++
 8 files changed, 208 insertions(+)
 create mode 100644 doc/guides/nics/features/sxe.ini
 create mode 100644 doc/guides/nics/features/sxe_vf.ini
 create mode 100644 doc/guides/nics/sxe.rst
 create mode 100644 drivers/net/sxe/meson.build
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.c
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.h
MAINTAINERS +6 -0
index 82f6e2f917..f92f4fea81 100644
@@ -2055,3 +2055,9 @@ F: examples/vmdq/
 F: doc/guides/sample_app_ug/vmdq_forwarding.rst
 F: examples/vmdq_dcb/
 F: doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst
+
+Linkdata sxe
+M: Jie Li <[email protected]>
+F: drivers/net/sxe/
+F: doc/guides/nics/sxe.rst
+F: doc/guides/nics/features/sxe*.ini
doc/guides/nics/features/sxe.ini new file +78 -0

78 lines not on this page · raw message

doc/guides/nics/features/sxe_vf.ini new file +37 -0
new file mode 100644
index 0000000000..7caf5435ae
@@ -0,0 +1,37 @@
+;
+; Supported features of the 'sxe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Link status          = Y
+Rx interrupt         = Y
+Power mgmt address monitor = Y
+MTU update           = Y
+Scattered Rx         = Y
+LRO                  = Y
+TSO                  = Y
+Promiscuous mode     = Y
+Allmulticast mode    = Y
+Unicast MAC filter   = Y
+RSS hash             = Y
+RSS key update       = Y
+RSS reta update      = Y
+VLAN filter          = Y
+Inline crypto        = Y
+CRC offload          = P
+VLAN offload         = P
+QinQ offload         = P
+L3 checksum offload  = P
+L4 checksum offload  = P
+Inner L3 checksum    = P
+Inner L4 checksum    = P
+Packet type parsing  = Y
+Rx descriptor status = Y
+Tx descriptor status = Y
+Basic stats          = Y
+Extended stats       = Y
+Registers dump       = Y
+Linux                = Y
+ARMv8                = Y
+x86-64               = Y
doc/guides/nics/index.rst +1 -0
index 10a2eca3b0..18b7483078 100644
@@ -61,6 +61,7 @@ Network Interface Controller Drivers
     pfe
     qede
     r8169
+    sxe
     sfc_efx
     softnic
     tap
doc/guides/nics/sxe.rst new file +71 -0

71 lines not on this page · raw message

drivers/net/sxe/meson.build new file +9 -0
new file mode 100644
index 0000000000..dad9ee44a0
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C), 2020, Wuxi Stars Micro System Technologies Co., Ltd.
+
+deps += ['hash']
+sources = files(
+        'pf/sxe_ethdev.c',
+)
+
+includes += include_directories('pf')
drivers/net/sxe/pf/sxe_ethdev.c new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
drivers/net/sxe/pf/sxe_ethdev.h new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
Signature · 1 line
2.18.4
author
#63 lore raw

PATCH v5 2/14 net/sxe: add ethdev probe and remove

Add basic modules: logs、 hardware communication、common components and support basic PCIe ethdev probe and remove.

---
 drivers/net/sxe/base/sxe_common.c          |   64 +
 drivers/net/sxe/base/sxe_common.h          |   15 +
 drivers/net/sxe/base/sxe_compat_platform.h |  137 +
 drivers/net/sxe/base/sxe_compat_version.h  |   38 +
 drivers/net/sxe/base/sxe_errno.h           |   61 +
 drivers/net/sxe/base/sxe_hw.c              | 6260 ++++++++++++++++++++
 drivers/net/sxe/base/sxe_hw.h              | 1541 +++++
 drivers/net/sxe/base/sxe_logs.h            |  273 +
 drivers/net/sxe/base/sxe_types.h           |   40 +
 drivers/net/sxe/include/drv_msg.h          |   18 +
 drivers/net/sxe/include/sxe/sxe_hdc.h      |   42 +
 drivers/net/sxe/include/sxe/sxe_msg.h      |  135 +
 drivers/net/sxe/include/sxe/sxe_regs.h     | 1280 ++++
 drivers/net/sxe/include/sxe_version.h      |   29 +
 drivers/net/sxe/meson.build                |   15 +-
 drivers/net/sxe/pf/sxe.h                   |   56 +
 drivers/net/sxe/pf/sxe_ethdev.c            |  324 +-
 drivers/net/sxe/pf/sxe_ethdev.h            |   27 +-
 drivers/net/sxe/pf/sxe_irq.c               |  126 +
 drivers/net/sxe/pf/sxe_irq.h               |   41 +
 drivers/net/sxe/pf/sxe_main.c              |  251 +
 drivers/net/sxe/pf/sxe_phy.h               |   38 +
 drivers/net/sxe/pf/sxe_pmd_hdc.c           |  683 +++
 drivers/net/sxe/pf/sxe_pmd_hdc.h           |   44 +
 drivers/net/sxe/sxe_drv_type.h             |   23 +
 25 files changed, 11558 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxe_common.c
 create mode 100644 drivers/net/sxe/base/sxe_common.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_platform.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_version.h
 create mode 100644 drivers/net/sxe/base/sxe_errno.h
 create mode 100644 drivers/net/sxe/base/sxe_hw.c
 create mode 100644 drivers/net/sxe/base/sxe_hw.h
 create mode 100644 drivers/net/sxe/base/sxe_logs.h
 create mode 100644 drivers/net/sxe/base/sxe_types.h
 create mode 100644 drivers/net/sxe/include/drv_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_hdc.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_regs.h
 create mode 100644 drivers/net/sxe/include/sxe_version.h
 create mode 100644 drivers/net/sxe/pf/sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_irq.c
 create mode 100644 drivers/net/sxe/pf/sxe_irq.h
 create mode 100644 drivers/net/sxe/pf/sxe_main.c
 create mode 100644 drivers/net/sxe/pf/sxe_phy.h
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.c
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.h
 create mode 100644 drivers/net/sxe/sxe_drv_type.h
drivers/net/sxe/base/sxe_common.c new file +64 -0
new file mode 100644
index 0000000000..e4d7ae1a12
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#include <pthread.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "sxe_types.h"
+#include "sxe_common.h"
+
+#define SXE_TRACE_ID_COUNT_MASK  0x00000000000000FFLLU
+#define SXE_TRACE_ID_TID_MASK	0x0000000000FFFF00LLU
+#define SXE_TRACE_ID_TIME_MASK   0x00FFFFFFFF000000LLU
+#define SXE_TRACE_ID_FLAG		0xFF00000000000000LLU
+
+#define SXE_TRACE_ID_COUNT_SHIFT 0
+#define SXE_TRACE_ID_TID_SHIFT   8
+#define SXE_TRACE_ID_TIME_SHIFT  24
+
+#define SXE_SEC_TO_MS(sec) ((sec) * 1000ULL)
+#define SXE_SEC_TO_NS(sec) ((sec) * 1000000000ULL)
+
+#define SXE_USEC_PER_MS		  1000
+
+u64 sxe_trace_id;
+
+u64 sxe_time_get_real_ms(void)
+{
+	u64 ms = 0;
+	struct timeval	  tv = { 0 };
+	s32 ret = gettimeofday(&tv, NULL);
+	if (ret < 0)
+		goto l_end;
+
+	ms = SXE_SEC_TO_MS(tv.tv_sec) + tv.tv_usec / SXE_USEC_PER_MS;
+
+l_end:
+	return ms;
+}
+
+u64 sxe_trace_id_gen(void)
+{
+	u64 tid	   = getpid() + (pthread_self() << 20);
+	u64 index	 = 0;
+	u64 timestamp = sxe_time_get_real_ms();
+
+	sxe_trace_id = (SXE_TRACE_ID_FLAG)
+		| ((timestamp << SXE_TRACE_ID_TIME_SHIFT) & SXE_TRACE_ID_TIME_MASK)
+		| ((tid << SXE_TRACE_ID_TID_SHIFT) & SXE_TRACE_ID_TID_MASK)
+		| ((index << SXE_TRACE_ID_COUNT_SHIFT) & SXE_TRACE_ID_COUNT_MASK);
+	return sxe_trace_id;
+}
+
+void sxe_trace_id_clean(void)
+{
+	sxe_trace_id = 0;
+}
+
+u64 sxe_trace_id_get(void)
+{
+	return sxe_trace_id++;
+}
drivers/net/sxe/base/sxe_common.h new file +15 -0
new file mode 100644
index 0000000000..43c062b937
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef __SXE_DPDK_COMMON_H__
+#define __SXE_DPDK_COMMON_H__
+
+u64 sxe_trace_id_gen(void);
+
+void sxe_trace_id_clean(void);
+
+u64 sxe_trace_id_get(void);
+
+u64 sxe_time_get_real_ms(void);
+
+#endif
drivers/net/sxe/base/sxe_compat_platform.h new file +137 -0

137 lines not on this page · raw message

drivers/net/sxe/base/sxe_compat_version.h new file +38 -0
new file mode 100644
index 0000000000..5b8577067d
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_COMPAT_VERSION_H__
+#define __SXE_COMPAT_VERSION_H__
+
+#include <stdbool.h>
+#include "sxe_dpdk_version.h"
+
+struct rte_eth_dev;
+enum rte_eth_event_type;
+
+int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
+	enum rte_eth_event_type event, void *ret_param);
+
+#define SET_AUTOFILL_QUEUE_XSTATS
+#define PCI_REG_WC_WRITE
+
+#ifndef PCI_REG_WC_WRITE
+#define rte_write32_wc rte_write32
+#define rte_write32_wc_relaxed rte_write32_relaxed
+#endif
+
+#define SXE_PCI_INTR_HANDLE(pci_dev) \
+	((pci_dev)->intr_handle)
+#define SXE_DEV_FNAV_CONF(dev) \
+	(&((struct sxe_adapter *)(dev)->data->dev_private)->fnav_conf)
+#define RTE_ADAPTER_HAVE_FNAV_CONF
+#define SXE_GET_FRAME_SIZE(dev) \
+	((dev)->data->mtu + SXE_ETH_OVERHEAD)
+
+#define ETH_DEV_OPS_MONITOR
+
+#define DEV_RX_OFFLOAD_CHECKSUM RTE_ETH_RX_OFFLOAD_CHECKSUM
+#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES
+
+#endif
drivers/net/sxe/base/sxe_errno.h new file +61 -0

61 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.c new file +6260 -0

2,685 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.h new file +1541 -0

1,541 lines not on this page · raw message

drivers/net/sxe/base/sxe_logs.h new file +273 -0

273 lines not on this page · raw message

drivers/net/sxe/base/sxe_types.h new file +40 -0
new file mode 100644
index 0000000000..a36a3cfbf6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/drv_msg.h new file +18 -0
new file mode 100644
index 0000000000..87c505569d

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/sxe/sxe_hdc.h new file +42 -0

42 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_msg.h new file +135 -0

135 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_regs.h new file +1280 -0

1,280 lines not on this page · raw message

drivers/net/sxe/include/sxe_version.h new file +29 -0
new file mode 100644
index 0000000000..fb58e73399

Lines of this file are not shown. View the raw message.

drivers/net/sxe/meson.build +14 -1
index dad9ee44a0..f75feb0cc9 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe.h new file +56 -0

56 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.c +323 -1

324 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.h +26 -1
index e31a23deeb..66034343ea 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_irq.c new file +126 -0

126 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c new file +251 -0

251 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h new file +38 -0
new file mode 100644
index 0000000000..2947d88812

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_pmd_hdc.c new file +683 -0

683 lines not on this page · raw message

drivers/net/sxe/pf/sxe_pmd_hdc.h new file +44 -0

44 lines not on this page · raw message

drivers/net/sxe/sxe_drv_type.h new file +23 -0
new file mode 100644
index 0000000000..6261f2d320

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#64 lore raw

PATCH v5 3/14 net/sxe: add tx rx setup and data path

In reply to Jie Liu

Add setup, initialization, and logic for tx and rx queues.

---
 drivers/net/meson.build                   |    1 +
 drivers/net/sxe/base/sxe_offload_common.c |   54 +
 drivers/net/sxe/base/sxe_offload_common.h |   14 +
 drivers/net/sxe/base/sxe_queue_common.c   |  397 ++++++
 drivers/net/sxe/base/sxe_queue_common.h   |  240 ++++
 drivers/net/sxe/base/sxe_rx_common.c      |  243 ++++
 drivers/net/sxe/base/sxe_rx_common.h      |   19 +
 drivers/net/sxe/base/sxe_tx_common.c      |   41 +
 drivers/net/sxe/base/sxe_tx_common.h      |   12 +
 drivers/net/sxe/include/sxe_type.h        |  795 +++++++++++
 drivers/net/sxe/meson.build               |   10 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h          |   14 +
 drivers/net/sxe/pf/sxe.h                  |    1 +
 drivers/net/sxe/pf/sxe_ethdev.c           |  200 +++
 drivers/net/sxe/pf/sxe_irq.c              |  258 ++++
 drivers/net/sxe/pf/sxe_irq.h              |   11 +
 drivers/net/sxe/pf/sxe_main.c             |    7 +
 drivers/net/sxe/pf/sxe_offload.c          |   39 +
 drivers/net/sxe/pf/sxe_offload.h          |   18 +
 drivers/net/sxe/pf/sxe_queue.c            |  776 +++++++++++
 drivers/net/sxe/pf/sxe_queue.h            |  133 ++
 drivers/net/sxe/pf/sxe_rx.c               | 1491 +++++++++++++++++++++
 drivers/net/sxe/pf/sxe_rx.h               |  194 +++
 drivers/net/sxe/pf/sxe_tx.c               | 1072 +++++++++++++++
 drivers/net/sxe/pf/sxe_tx.h               |   50 +
 drivers/net/sxe/rte_pmd_sxe_version.map   |    5 +
 drivers/net/sxe/version.map               |    5 +
 27 files changed, 6099 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.c
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.h
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.c
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.h
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.h
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.h
 create mode 100644 drivers/net/sxe/include/sxe_type.h
 create mode 100644 drivers/net/sxe/pf/rte_pmd_sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_offload.c
 create mode 100644 drivers/net/sxe/pf/sxe_offload.h
 create mode 100644 drivers/net/sxe/pf/sxe_queue.c
 create mode 100644 drivers/net/sxe/pf/sxe_queue.h
 create mode 100644 drivers/net/sxe/pf/sxe_rx.c
 create mode 100644 drivers/net/sxe/pf/sxe_rx.h
 create mode 100644 drivers/net/sxe/pf/sxe_tx.c
 create mode 100644 drivers/net/sxe/pf/sxe_tx.h
 create mode 100644 drivers/net/sxe/rte_pmd_sxe_version.map
 create mode 100644 drivers/net/sxe/version.map
drivers/net/meson.build +1 -0
index 460eb69e5b..429e6b17eb 100644
@@ -64,6 +64,7 @@ drivers = [
         'vmxnet3',
         'xsc',
         'zxdh',
+	'sxe',
 ]
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
drivers/net/sxe/base/sxe_offload_common.c new file +54 -0

54 lines not on this page · raw message

drivers/net/sxe/base/sxe_offload_common.h new file +14 -0
new file mode 100644
index 0000000000..cbfb7fd93f
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_COMMON_H__
+#define __SXE_OFFLOAD_COMMON_H__
+
+u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/base/sxe_queue_common.c new file +397 -0

397 lines not on this page · raw message

drivers/net/sxe/base/sxe_queue_common.h new file +240 -0

240 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.c new file +243 -0

243 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.h new file +19 -0
new file mode 100644
index 0000000000..f9afb517d9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_RX_COMMON_H__
+#define __SXE_RX_COMMON_H__
+
+#include "sxe_dpdk_version.h"
+
+void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
+	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
+
+s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset);
+
+u16 __sxe_pkts_recv(void *rx_queue, struct rte_mbuf **rx_pkts,
+		u16 pkts_num);
+
+const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements);
+#endif
drivers/net/sxe/base/sxe_tx_common.c new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/base/sxe_tx_common.h new file +12 -0
new file mode 100644
index 0000000000..2759ef5a7a
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_TX_COMMON_H__
+#define __SXE_TX_COMMON_H__
+
+int __sxe_tx_descriptor_status(void *tx_queue, u16 offset);
+
+u16 __sxe_pkts_xmit_with_offload(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num);
+
+#endif
drivers/net/sxe/include/sxe_type.h new file +795 -0

795 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -1
index f75feb0cc9..2af37bce4c 100644
@@ -11,7 +11,15 @@ sources = files(
         'pf/sxe_main.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
+	'pf/sxe_offload.c',
+	'pf/sxe_queue.c',
+	'pf/sxe_rx.c',
+	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'base/sxe_queue_common.c',
+	'base/sxe_rx_common.c',
+	'base/sxe_tx_common.c',
+	'base/sxe_offload_common.c',
         'base/sxe_common.c',
         'base/sxe_hw.c',
 )
@@ -19,4 +27,4 @@ sources = files(
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
\ No newline at end of file
+includes += include_directories('include/')
drivers/net/sxe/pf/rte_pmd_sxe.h new file +14 -0
new file mode 100644
index 0000000000..64c1140490
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __PMD_SXE_H__
+#define __PMD_SXE_H__
+
+typedef uint8_t		u8;
+typedef uint16_t	u16;
+typedef uint32_t	u32;
+typedef int32_t		s32;
+
+s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+#endif
drivers/net/sxe/pf/sxe.h +1 -0
index c839e297a6..8e76a1f931 100644
@@ -44,6 +44,7 @@ struct sxe_adapter {
 
 	struct sxe_irq_context irq_ctxt;
 
+	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
 };
 
drivers/net/sxe/pf/sxe_ethdev.c +200 -0

274 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.c +258 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h +11 -0
index e0834aff2d..b2c5692932 100644
@@ -35,7 +35,18 @@ void sxe_event_irq_delayed_handler(void *param);
 
 void sxe_irq_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_irq_configure(struct rte_eth_dev *dev);
+
+void sxe_irq_enable(struct rte_eth_dev *eth_dev);
+
+void sxe_irq_disable(struct rte_eth_dev *eth_dev);
+
 void sxe_irq_uninit(struct rte_eth_dev *eth_dev);
 
+s32 sxe_rx_queue_intr_enable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+s32 sxe_rx_queue_intr_disable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+void sxe_irq_vec_free(struct rte_intr_handle *handle);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +7 -0
index 1701d75571..4761e721ca 100644
@@ -20,9 +20,11 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_STARS, SXE_DEV_ID_ASIC) },
@@ -164,10 +166,15 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 {
 	s32 ret;
 
+	/* Rx DBU off */
+	sxe_hw_rx_cap_switch_off(hw);
+
 	sxe_hw_all_irq_disable(hw);
 
 	sxe_hw_pending_irq_read_clear(hw);
 
+	sxe_hw_all_ring_disable(hw, SXE_HW_TXRX_RING_NUM_MAX);
+
 	ret = sxe_mng_reset(hw, false);
 	if (ret) {
 		PMD_LOG_ERR(INIT, "mng reset disable failed, ret=%d", ret);
drivers/net/sxe/pf/sxe_offload.c new file +39 -0
new file mode 100644
index 0000000000..7049efe606
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#include "sxe_dpdk_version.h"
+#include <ethdev_driver.h>
+
+#include "sxe.h"
+#include "sxe_offload.h"
+#include "sxe_logs.h"
+#include "sxe_compat_version.h"
+#include "sxe_queue_common.h"
+#include "sxe_offload_common.h"
+
+#define SXE_4_BIT_WIDTH  (CHAR_BIT / 2)
+#define SXE_4_BIT_MASK   RTE_LEN2MASK(SXE_4_BIT_WIDTH, u8)
+#define SXE_8_BIT_WIDTH  CHAR_BIT
+#define SXE_8_BIT_MASK   UINT8_MAX
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_queue_offload_capa_get(dev);
+}
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_port_offload_capa_get(dev);
+}
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	RTE_SET_USED(dev);
+
+	return 0;
+}
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_tx_port_offload_capa_get(dev);
+}
drivers/net/sxe/pf/sxe_offload.h new file +18 -0
new file mode 100644
index 0000000000..a70d6bf94b
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_H__
+#define __SXE_OFFLOAD_H__
+
+#include "sxe_hw.h"
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/pf/sxe_queue.c new file +776 -0

481 lines not on this page · raw message

drivers/net/sxe/pf/sxe_queue.h new file +133 -0

133 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.c new file +1491 -0

1,491 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.h new file +194 -0

194 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.c new file +1072 -0

1,072 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.h new file +50 -0

50 lines not on this page · raw message

drivers/net/sxe/rte_pmd_sxe_version.map new file +5 -0
new file mode 100644
index 0000000000..1a25862ca2

Lines of this file are not shown. View the raw message.

drivers/net/sxe/version.map new file +5 -0
new file mode 100644
index 0000000000..d010a9b738

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

#65 lore raw

Re: [PATCH v5 03/14] net/sxe: add tx rx setup and data path

drivers/net/sxe/base/sxe_queue_common.c line 49

Quoted 2 lines · On Wed, 9 Jul 2025 21:20:10 -0400 Jie Liu <[email protected]>…
drivers/net/sxe/base/sxe_queue_common.c new file +2 -0
+s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
+{

Please don't use __rte_cold in driver.
It really is only needed in the core code (for example rte_log) as a way to tell compiler: "If the code path calls this function it can not possibly be critical performance".

Putting it in driver is just clutter.

#66 lore raw

Re: [PATCH v5 03/14] net/sxe: add tx rx setup and data path

In reply to Jie Liu
Quoted 8 lines · On Wed, 9 Jul 2025 21:20:10 -0400 Jie Liu <[email protected]>…

s32 __rte_cold __sxe_rx_queue_mbufs_alloc(struct sxe_rx_queue *rxq)

drivers/net/sxe/base/sxe_queue_common.c new file +7 -0
+{
+	struct sxe_rx_buffer *buf_ring = rxq->buffer_ring;
+	s32 ret = 0;
+	u64 dma_addr;
+	u16 i;
+
+	for (i = 0; i < rxq->ring_depth; i++) {

drivers/net/sxe/base/sxe_queue_common.c line 319

Quoted 10 lines
drivers/net/sxe/base/sxe_queue_common.c new file +10 -0
+		volatile union sxe_rx_data_desc *desc;
+		struct rte_mbuf *mbuf = rte_mbuf_raw_alloc(rxq->mb_pool);
+
+		if (mbuf == NULL) {
+			PMD_LOG_ERR(DRV, "rx mbuf alloc failed queue_id=%u",
+					(u16)rxq->queue_id);
+			ret = -ENOMEM;
+			goto l_end;
+		}
+

Logging at error level could cause a lot of messages if pool gets exhausted under load. Better to just have a rx_nombuf statistic.

#67 lore raw

Re: [PATCH v5 03/14] net/sxe: add tx rx setup and data path

In reply to Jie Liu

drivers/net/sxe/pf/sxe_rx.c line 844

Quoted 9 lines · On Wed, 9 Jul 2025 21:20:10 -0400 Jie Liu <[email protected]>…
drivers/net/sxe/pf/sxe_rx.c new file +9 -0
+next_desc:
+		cur_desc = &desc_ring[cur_idx];
+		staterr = rte_le_to_cpu_32(cur_desc->wb.upper.status_error);
+
+		if (!(staterr & SXE_RXDADV_STAT_DD))
+			break;
+
+		rte_atomic_thread_fence(rte_memory_order_acquire);
+

Maybe the heavy weight thread_fence here could be replaced by using atomic access on status_error which is really the only part the driver is looking at?

#68 lore raw

Re: [PATCH v5 03/14] net/sxe: add tx rx setup and data path

In reply to Jie Liu

drivers/net/sxe/base/sxe_offload_common.c line 30

Quoted 11 lines · On Wed, 9 Jul 2025 21:20:10 -0400 Jie Liu <[email protected]>…
drivers/net/sxe/base/sxe_offload_common.c new file +11 -0
+u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	u64 rx_offload_capa;
+
+	rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
+		   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+		   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+		   RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
+#ifdef DEV_RX_JUMBO_FRAME
+		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+#endif

That was true in old DPDK version. No longer needed. Please remove #ifdef

#69 lore raw

Re: [PATCH v5 03/14] net/sxe: add tx rx setup and data path

In reply to Jie Liu

drivers/net/sxe/base/sxe_rx_common.c line 72

Quoted 3 lines · On Wed, 9 Jul 2025 21:20:10 -0400 Jie Liu <[email protected]>…
drivers/net/sxe/base/sxe_rx_common.c new file +3 -0
+	} else if (rx_batch_alloc_allowed) {
+		PMD_LOG_DEBUG(INIT, "Rx Burst Bulk Alloc Preconditions are "
+					"satisfied. Rx Burst Bulk Alloc function "

Log messages should not cross source lines, it makes it harder to find them in the source. Also, the messages in this code should be written more succinctly. Especially for normal cases.

author
#70 lore raw

PATCH v5 4/14 net/sxe: add link, flow ctrl, mac ops, mtu ops function

In reply to Jie Liu

Add link, flow ctrl, mac ops, mtu ops function.

---
 drivers/net/sxe/meson.build        |   3 +
 drivers/net/sxe/pf/sxe.h           |  11 +
 drivers/net/sxe/pf/sxe_ethdev.c    | 443 +++++++++++++-
 drivers/net/sxe/pf/sxe_filter.c    | 279 +++++++++
 drivers/net/sxe/pf/sxe_filter.h    |  55 ++
 drivers/net/sxe/pf/sxe_flow_ctrl.c |  98 +++
 drivers/net/sxe/pf/sxe_flow_ctrl.h |  16 +
 drivers/net/sxe/pf/sxe_irq.c       | 146 ++++-
 drivers/net/sxe/pf/sxe_main.c      |   2 +
 drivers/net/sxe/pf/sxe_phy.c       | 932 +++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_phy.h       |  77 +++
 11 files changed, 2052 insertions(+), 10 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_filter.c
 create mode 100644 drivers/net/sxe/pf/sxe_filter.h
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.c
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.h
 create mode 100644 drivers/net/sxe/pf/sxe_phy.c
drivers/net/sxe/meson.build +3 -0
index 2af37bce4c..5ec2c3b843 100644
@@ -9,6 +9,8 @@ cflags += ['-DSXE_HOST_DRIVER']
 deps += ['hash']
 sources = files(
         'pf/sxe_main.c',
+	'pf/sxe_filter.c',
+        'pf/sxe_flow_ctrl.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
@@ -16,6 +18,7 @@ sources = files(
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'pf/sxe_phy.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/sxe.h +11 -0
index 8e76a1f931..b05814308e 100644
@@ -43,9 +43,20 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
+
+	u32 mtu;
+
+	RTE_ATOMIC(bool)link_thread_running;
+	RTE_ATOMIC(bool)is_stopping;
+	rte_thread_t link_thread_tid;
+	rte_atomic32_t link_thread_running;
+	rte_atomic32_t is_stopping;
+	pthread_t link_thread_tid;
+	bool is_stopped;
 };
 
 s32 sxe_hw_reset(struct sxe_hw *hw);
drivers/net/sxe/pf/sxe_ethdev.c +437 -6

606 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.c new file +279 -0

279 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h new file +55 -0

55 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.c new file +98 -0

98 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.h new file +16 -0
new file mode 100644
index 0000000000..fb124b11bd
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_FLOW_CTRL_H__
+#define __SXE_FLOW_CTRL_H__
+
+s32 sxe_flow_ctrl_enable(struct rte_eth_dev *dev);
+
+s32 sxe_flow_ctrl_get(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+s32 sxe_flow_ctrl_set(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+#endif
drivers/net/sxe/pf/sxe_irq.c +142 -4

181 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +2 -0
index 4761e721ca..22418bf1ec 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_fc_autoneg_localcap_set(hw);
+
 	hw->mac.auto_restart = true;
 	PMD_LOG_INFO(INIT, "auto_restart:%u.", hw->mac.auto_restart);
 }
drivers/net/sxe/pf/sxe_phy.c new file +932 -0

932 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h +77 -0

82 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#71 lore raw

PATCH v5 5/14 net/sxe: support vlan filter

In reply to Jie Liu

Support vlan filter.

---
 drivers/net/sxe/base/sxe_offload_common.c |   4 +
 drivers/net/sxe/pf/sxe.h                  |   5 +-
 drivers/net/sxe/pf/sxe_filter.c           | 277 ++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h           |  13 +
 drivers/net/sxe/pf/sxe_main.c             |   2 +
 5 files changed, 300 insertions(+), 1 deletion(-)
drivers/net/sxe/base/sxe_offload_common.c +4 -0
index 48677863d7..cc35c16ddf 100644
@@ -14,6 +14,8 @@ u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
 
 	u64 offloads = 0;
 
+	offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
 	return offloads;
 }
 
@@ -28,6 +30,8 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 #ifdef DEV_RX_JUMBO_FRAME
 		   DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
+			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
 		   RTE_ETH_RX_OFFLOAD_SCATTER;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
drivers/net/sxe/pf/sxe.h +4 -1
index b05814308e..4b7e853923 100644
@@ -6,7 +6,7 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-
+#include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
 #include "sxe_irq.h"
@@ -14,6 +14,7 @@
 #include "sxe_hw.h"
 
 struct sxe_hw;
+struct sxe_vlan_context;
 
 #define SXE_LPBK_DISABLED   0x0
 #define SXE_LPBK_ENABLED	0x1
@@ -43,6 +44,8 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+
+	struct sxe_vlan_context vlan_ctxt;
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +277 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +13 -0
index b9316949ea..aab6838e2d 100644
@@ -46,10 +46,23 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
+
+s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
+			enum rte_vlan_type vlan_type, u16 tpid);
+
+s32 sxe_vlan_offload_set(struct rte_eth_dev *dev, s32 vlan_mask);
+
+void sxe_vlan_strip_queue_set(struct rte_eth_dev *dev, u16 queue, s32 on);
+
+void sxe_vlan_filter_configure(struct rte_eth_dev *dev);
+
 s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
 
+void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
+
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 22418bf1ec..cc3145c09b 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_hw_vlan_filter_array_clear(hw);
+
 	sxe_fc_autoneg_localcap_set(hw);
 
 	hw->mac.auto_restart = true;
Signature · 1 line
2.18.4
author
#72 lore raw

PATCH v5 6/14 net/sxe: add filter function

In reply to Jie Liu

Add filter function.

---
 drivers/net/sxe/pf/sxe.h        |   4 +
 drivers/net/sxe/pf/sxe_filter.c | 191 ++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h |  29 +++++
 drivers/net/sxe/pf/sxe_main.c   |   1 +
 4 files changed, 225 insertions(+)
drivers/net/sxe/pf/sxe.h +4 -0
index 4b7e853923..6458372ce4 100644
@@ -46,6 +46,10 @@ struct sxe_adapter {
 	struct sxe_irq_context irq_ctxt;
 
 	struct sxe_vlan_context vlan_ctxt;
+	struct sxe_mac_filter_context mac_filter_ctxt;
+#ifdef RTE_ADAPTER_HAVE_FNAV_CONF
+	struct rte_eth_fdir_conf fnav_conf;
+#endif
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +191 -0

203 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +29 -0
index aab6838e2d..b8c67f8d42 100644
@@ -21,6 +21,27 @@ struct sxe_adapter;
 		RTE_ALIGN((SXE_HW_TXRX_RING_NUM_MAX / (sizeof(u32) * BYTE_BIT_NUM)), \
 		sizeof(u32))
 
+struct sxe_vlan_context {
+	u32 vlan_hash_table[SXE_VFT_TBL_SIZE];
+	u32 strip_bitmap[SXE_VLAN_STRIP_BITMAP_SIZE];
+	u32  vlan_table_size;
+};
+
+enum sxe_uc_addr_src_type {
+	SXE_PF = 0,
+	SXE_VF,
+	SXE_VF_MACVLAN
+};
+
+struct sxe_uc_addr_table {
+	u8 rar_idx;
+	u8 pool_idx;
+	u8 type;
+	u8 original_index;
+	bool used;
+	u8 addr[SXE_MAC_ADDR_LEN];
+};
+
 struct sxe_mac_filter_context {
 	struct rte_ether_addr def_mac_addr;
 	struct rte_ether_addr cur_mac_addr;
@@ -37,6 +58,14 @@ struct sxe_mac_filter_context {
 
 s32 sxe_mac_addr_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_promiscuous_enable(struct rte_eth_dev *dev);
+
+s32 sxe_promiscuous_disable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_enable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_disable(struct rte_eth_dev *dev);
+
 s32 sxe_mac_addr_add(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr,
 				 u32 rar_idx, u32 pool);
drivers/net/sxe/pf/sxe_main.c +1 -0
index cc3145c09b..700934b378 100644
@@ -195,6 +195,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 		goto l_end;
 	}
 
+	sxe_hw_uc_addr_clear(hw);
 l_end:
 	return ret;
 }
Signature · 1 line
2.18.4
author
#73 lore raw

PATCH v5 7/14 net/sxe: support rss offload

In reply to Jie Liu

Support rss offload.

---
 drivers/net/sxe/base/sxe_offload_common.c |  11 +-
 drivers/net/sxe/pf/sxe.h                  |   2 +
 drivers/net/sxe/pf/sxe_offload.c          | 300 +++++++++++++++++++++-
 drivers/net/sxe/pf/sxe_offload.h          |  33 +++
 4 files changed, 340 insertions(+), 6 deletions(-)
drivers/net/sxe/base/sxe_offload_common.c +6 -5
index cc35c16ddf..f87cce67a5 100644
@@ -24,15 +24,16 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 	u64 rx_offload_capa;
 
 	rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
-		   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
+			RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
 #ifdef DEV_RX_JUMBO_FRAME
-		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+			DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
 			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
 			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
-		   RTE_ETH_RX_OFFLOAD_SCATTER;
+			RTE_ETH_RX_OFFLOAD_SCATTER |
+			RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
 		rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
drivers/net/sxe/pf/sxe.h +2 -0
index 6458372ce4..c183674fcd 100644
@@ -57,6 +57,8 @@ struct sxe_adapter {
 
 	u32 mtu;
 
+	bool rss_reta_updated;
+
 	RTE_ATOMIC(bool)link_thread_running;
 	RTE_ATOMIC(bool)is_stopping;
 	rte_thread_t link_thread_tid;
drivers/net/sxe/pf/sxe_offload.c +299 -1

320 lines not on this page · raw message

drivers/net/sxe/pf/sxe_offload.h +33 -0
index a70d6bf94b..458b6464c5 100644
@@ -7,6 +7,21 @@
 
 #include "sxe_hw.h"
 
+#define SXE_RSS_OFFLOAD_ALL ( \
+		RTE_ETH_RSS_IPV4 | \
+		RTE_ETH_RSS_NONFRAG_IPV4_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
+		RTE_ETH_RSS_IPV6 | \
+		RTE_ETH_RSS_NONFRAG_IPV6_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV6_UDP)
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_FILTER_CTRL
+u8 *sxe_rss_hash_key_get(void);
+#endif
+
+void sxe_rss_hash_set(struct sxe_hw *hw,
+				struct rte_eth_rss_conf *rss_conf);
+
 u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
@@ -15,4 +30,22 @@ u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
 
+void sxe_rss_disable(struct rte_eth_dev *dev);
+
+void sxe_rss_configure(struct rte_eth_dev *dev);
+
+s32 sxe_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			u16 reta_size);
+
+s32 sxe_rss_reta_query(struct rte_eth_dev *dev,
+			 struct rte_eth_rss_reta_entry64 *reta_conf,
+			 u16 reta_size);
+
+s32 sxe_rss_hash_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_conf *rss_conf);
+
+s32 sxe_rss_hash_conf_get(struct rte_eth_dev *dev,
+				struct rte_eth_rss_conf *rss_conf);
+
 #endif
Signature · 1 line
2.18.4
author
#74 lore raw

PATCH v5 8/14 net/sxe: add dcb function

In reply to Jie Liu

Add dcb function.

---
 drivers/net/sxe/meson.build             |   1 +
 drivers/net/sxe/pf/rte_pmd_sxe.h        |   2 +
 drivers/net/sxe/pf/sxe.h                |   2 +
 drivers/net/sxe/pf/sxe_dcb.c            | 944 ++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_dcb.h            |  99 +++
 drivers/net/sxe/pf/sxe_main.c           |   1 +
 drivers/net/sxe/pf/sxe_phy.c            |  34 +
 drivers/net/sxe/pf/sxe_phy.h            |   2 +
 drivers/net/sxe/pf/sxe_rx.c             |   1 -
 drivers/net/sxe/rte_pmd_sxe_version.map |   1 +
 drivers/net/sxe/version.map             |   3 +-
 11 files changed, 1088 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.c
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.h
drivers/net/sxe/meson.build +1 -0
index 5ec2c3b843..2f528efe19 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/rte_pmd_sxe.h +2 -0
index 64c1140490..16406c6c26 100644
@@ -11,4 +11,6 @@ typedef uint32_t	u32;
 typedef int32_t		s32;
 
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+
+s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
 #endif
drivers/net/sxe/pf/sxe.h +2 -0
index c183674fcd..30efe4ee66 100644
@@ -11,6 +11,7 @@
 #include "sxe_types.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
+#include "sxe_dcb.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -51,6 +52,7 @@ struct sxe_adapter {
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
drivers/net/sxe/pf/sxe_dcb.c new file +944 -0

944 lines not on this page · raw message

drivers/net/sxe/pf/sxe_dcb.h new file +99 -0

99 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +1 -0
index 700934b378..6fc4a41703 100644
@@ -203,6 +203,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
 
drivers/net/sxe/pf/sxe_phy.c +34 -0
index 7d3c22f85a..787b16fb47 100644
@@ -737,6 +737,40 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter)
 	return ret;
 }
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx)
+{
+	s32 ret;
+	struct sxe_hw *hw = &adapter->hw;
+
+	if (!hw->fc.pause_time) {
+		LOG_ERROR_BDF("link fc disabled since pause time is 0");
+		ret = -SXE_ERR_INVALID_LINK_SETTINGS;
+		goto l_ret;
+	}
+
+	if (hw->fc.current_mode & SXE_FC_TX_PAUSE) {
+		if (!hw->fc.high_water[tc_idx] || !hw->fc.low_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+
+		if (hw->fc.low_water[tc_idx] >= hw->fc.high_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+	}
+
+	sxe_fc_autoneg(adapter);
+
+	ret = sxe_hw_pfc_enable(hw, tc_idx);
+	if (ret)
+		PMD_LOG_ERR(INIT, "link fc enable failed, ret=%d", ret);
+
+l_ret:
+	return ret;
+}
 s32 sxe_sfp_identify(struct sxe_adapter *adapter)
 {
 	s32 ret;
drivers/net/sxe/pf/sxe_phy.h +2 -0
index a3d7dbf85b..9fd2746ec8 100644
@@ -105,6 +105,8 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter);
 
 void sxe_link_info_get(struct sxe_adapter *adapter, u32 *link_speed, bool *link_up);
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx);
+
 void sxe_sfp_link_capabilities_get(struct sxe_adapter *adapter, u32 *speed,
 							bool *autoneg);
 
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 48e7393840..65cfcca4c9 100644
@@ -10,7 +10,6 @@
 #include <rte_atomic.h>
 #include <ethdev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "sxe.h"
 #include "sxe_rx.h"
 #include "sxe_logs.h"
drivers/net/sxe/rte_pmd_sxe_version.map +1 -0
index 1a25862ca2..4b871872d6 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
     global:
     rte_pmd_sxe_tx_loopback_set;
+    rte_pmd_sxe_tc_bw_set;
     local: *;
 };
drivers/net/sxe/version.map +2 -1
index d010a9b738..5d1a7d37f1 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
         global:
         rte_pmd_sxe_tx_loopback_set;
+        rte_pmd_sxe_tc_bw_set;
         local: *;
-};
+};
\ No newline at end of file
Signature · 1 line
2.18.4
author
#75 lore raw

PATCH v5 9/14 net/sxe: support ptp

In reply to Jie Liu

Add ptp module.

---
 drivers/net/sxe/meson.build  |   1 +
 drivers/net/sxe/pf/sxe.h     |   9 ++
 drivers/net/sxe/pf/sxe_ptp.c | 209 +++++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_ptp.h |  26 +++++
 4 files changed, 245 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.c
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.h
drivers/net/sxe/meson.build +1 -0
index 2f528efe19..5bd44f3f65 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_ptp.c',
         'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
drivers/net/sxe/pf/sxe.h +9 -0
index 30efe4ee66..8699e1a82f 100644
@@ -41,6 +41,14 @@ struct sxe_vlan_context;
 #define rte_sxe_prefetch(p)   do {} while (0)
 #endif
 
+struct sxe_ptp_context {
+	struct rte_timecounter	  systime_tc;
+	struct rte_timecounter	  rx_tstamp_tc;
+	struct rte_timecounter	  tx_tstamp_tc;
+	u32 tx_hwtstamp_sec;
+	u32 tx_hwtstamp_nsec;
+};
+
 struct sxe_adapter {
 	struct sxe_hw hw;
 
@@ -51,6 +59,7 @@ struct sxe_adapter {
 #ifdef RTE_ADAPTER_HAVE_FNAV_CONF
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
+	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_ptp.c new file +209 -0

209 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ptp.h new file +26 -0
new file mode 100644
index 0000000000..14971b2d50
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_PTP_H__
+#define __SXE_PTP_H__
+
+s32 sxe_timesync_enable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_disable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp,
+				 u32 flags __rte_unused);
+
+s32 sxe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp);
+
+s32 sxe_timesync_adjust_time(struct rte_eth_dev *dev, s64 delta);
+
+s32 sxe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts);
+
+s32 sxe_timesync_write_time(struct rte_eth_dev *dev,
+					const struct timespec *ts);
+
+#endif
Signature · 1 line
2.18.4
author
#76 lore raw

PATCH v5 10/14 net/sxe: add xstats function

In reply to Jie Liu

Add xstats function.

---
 drivers/net/sxe/meson.build    |   1 +
 drivers/net/sxe/pf/sxe.h       |   2 +
 drivers/net/sxe/pf/sxe_main.c  |   2 +
 drivers/net/sxe/pf/sxe_stats.c | 577 +++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_stats.h |  71 ++++
 5 files changed, 653 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_stats.c
 create mode 100644 drivers/net/sxe/pf/sxe_stats.h
drivers/net/sxe/meson.build +1 -0
index 5bd44f3f65..b06cc4c1fe 100644
@@ -17,6 +17,7 @@ sources = files(
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
+	'pf/sxe_stats.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
         'pf/sxe_ptp.c',
drivers/net/sxe/pf/sxe.h +2 -0
index 8699e1a82f..2da5c4df96 100644
@@ -9,6 +9,7 @@
 #include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
+#include "sxe_stats.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
 #include "sxe_dcb.h"
@@ -61,6 +62,7 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_main.c +2 -0
index 6fc4a41703..bbee8035d6 100644
@@ -203,6 +203,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+
+	sxe_hw_stats_regs_clean(hw);
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/pf/sxe_stats.c new file +577 -0

577 lines not on this page · raw message

drivers/net/sxe/pf/sxe_stats.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#77 lore raw

PATCH v5 11/14 net/sxe: add custom cmd led ctrl

In reply to Jie Liu

Add custom cmd led ctrl.

---
 drivers/net/sxe/include/sxe/sxe_cli.h   | 218 ++++++++++++++++++++++++
 drivers/net/sxe/include/sxe/sxe_ioctl.h |  21 +++
 drivers/net/sxe/meson.build             |   2 +
 drivers/net/sxe/pf/sxe_main.c           |   3 +
 drivers/net/sxe/sxe_testpmd.c           |  65 +++++++
 5 files changed, 309 insertions(+)
 create mode 100644 drivers/net/sxe/include/sxe/sxe_cli.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_ioctl.h
 create mode 100644 drivers/net/sxe/sxe_testpmd.c
drivers/net/sxe/include/sxe/sxe_cli.h new file +218 -0
new file mode 100644
index 0000000000..623347dab2
@@ -0,0 +1,218 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_CLI_H__
+#define __SXE_CLI_H__
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+#define SXE_VERSION_LEN				  (32)
+#define SXE_MAC_NUM					 (128)
+#define SXE_PORT_TRANSCEIVER_LEN		(32)
+#define SXE_PORT_VENDOR_LEN			 (32)
+#define SXE_CHIP_TYPE_LEN			   (32)
+#define SXE_VPD_SN_LEN				  (16)
+#define SXE_SOC_RST_TIME				(0x93A80)
+#define SXE_SFP_TEMP_THRESHOLD_INTERVAL (3)
+#define MGC_TERMLOG_INFO_MAX_LEN		(12 * 1024)
+#define SXE_REGS_DUMP_MAX_LEN		   (12 * 1024)
+#define SXE_PRODUCT_NAME_LEN		(32)
+
+typedef enum sxe_led_mode {
+	SXE_IDENTIFY_LED_BLINK_ON   = 0,
+	SXE_IDENTIFY_LED_BLINK_OFF,
+	SXE_IDENTIFY_LED_ON,
+	SXE_IDENTIFY_LED_OFF,
+	SXE_IDENTIFY_LED_RESET,
+} sxe_led_mode_s;
+
+typedef struct sxe_led_ctrl {
+	U32	mode;
+	U32	duration;
+
+} sxe_led_ctrl_s;
+
+typedef struct sxe_led_ctrl_resp {
+	U32	ack;
+} sxe_led_ctrl_resp_s;
+
+typedef enum port_link_speed {
+	PORT_LINK_NO			= 0,
+	PORT_LINK_100M		  = 1,
+	PORT_LINK_1G			= 2,
+	PORT_LINK_10G		   = 3,
+} port_link_speed_e;
+
+typedef struct sys_soc_info {
+	S8	 fw_ver[SXE_VERSION_LEN];
+	S8	 opt_ver[SXE_VERSION_LEN];
+	U8	 soc_status;
+	U8	 pad[3];
+	S32	soc_temp;
+	U64	chipid;
+	S8	 chip_type[SXE_CHIP_TYPE_LEN];
+	S8	 pba[SXE_VPD_SN_LEN];
+	S8	 product_name[SXE_PRODUCT_NAME_LEN];
+} sys_soc_info_s;
+
+typedef struct sys_port_info {
+	U64	mac[SXE_MAC_NUM];
+	U8	 is_port_abs;
+	U8	 link_stat;
+	U8	 link_speed;
+
+
+	U8	 is_sfp:1;
+	U8	 is_get_info:1;
+	U8	 rvd:6;
+	S8	 optical_mod_temp;
+	U8	 pad[3];
+	S8	 transceiver_type[SXE_PORT_TRANSCEIVER_LEN];
+	S8	 vendor_name[SXE_PORT_VENDOR_LEN];
+	S8	 vendor_pn[SXE_PORT_VENDOR_LEN];
+} sys_port_info_s;
+
+typedef struct sys_info_resp {
+	sys_soc_info_s	 soc_info;
+	sys_port_info_s	port_info;
+} sys_info_resp_s;
+
+typedef enum sfp_temp_td_mode {
+	SFP_TEMP_THRESHOLD_MODE_ALARM   = 0,
+	SFP_TEMP_THRESHOLD_MODE_WARN,
+} sfp_temp_td_mode_e;
+
+typedef struct sfp_temp_td_set {
+	U8	 mode;
+	U8	 pad[3];
+	S8	 hthreshold;
+	S8	 lthreshold;
+} sfp_temp_td_set_s;
+
+typedef struct sxe_log_export_resp {
+	U16	cur_log_len;
+	U8	 is_end;
+	U8	 pad;
+	S32	session_id;
+	S8	 data[0];
+} sxe_log_export_resp_s;
+
+typedef enum sxe_log_export_type  {
+	SXE_LOG_EXPORT_REQ	= 0,
+	SXE_LOG_EXPORT_FIN,
+	SXE_LOG_EXPORT_ABORT,
+} sxe_log_export_type_e;
+
+typedef struct sxe_log_export_req {
+	U8	 is_all_log;
+	U8	 cmdtype;
+	U8	 is_begin;
+	U8	 pad;
+	S32	session_id;
+	U32	log_len;
+} sxe_log_export_req_s;
+
+typedef struct soc_rst_req {
+	U32	time;
+} soc_rst_req_s;
+
+typedef struct regs_dump_resp {
+	U32	curdw_len;
+	U8	 data[0];
+} regs_dump_resp_s;
+
+enum {
+	SXE_MFG_PART_NUMBER_LEN   = 8,
+	SXE_MFG_SERIAL_NUMBER_LEN = 16,
+	SXE_MFG_REVISION_LEN	  = 4,
+	SXE_MFG_OEM_STR_LEN	   = 64,
+	SXE_MFG_SXE_BOARD_ASSEMBLY_LEN  = 32,
+	SXE_MFG_SXE_BOARD_TRACE_NUM_LEN = 16,
+	SXE_MFG_SXE_MAC_ADDR_CNT		= 2,
+};
+
+typedef struct sxe_mfg_info {
+	U8 part_number[SXE_MFG_PART_NUMBER_LEN];
+	U8 serial_number[SXE_MFG_SERIAL_NUMBER_LEN];
+	U32 mfg_date;
+	U8 revision[SXE_MFG_REVISION_LEN];
+	U32 rework_date;
+	U8 pad[4];
+	U64 mac_addr[SXE_MFG_SXE_MAC_ADDR_CNT];
+	U8 board_trace_num[SXE_MFG_SXE_BOARD_TRACE_NUM_LEN];
+	U8 board_assembly[SXE_MFG_SXE_BOARD_ASSEMBLY_LEN];
+	U8 extra1[SXE_MFG_OEM_STR_LEN];
+	U8 extra2[SXE_MFG_OEM_STR_LEN];
+} sxe_mfg_info_t;
+
+typedef struct sxe_lldp_info {
+	U8	  lldp_state;
+	U8	  pad[3];
+} sxe_lldp_info_t;
+
+typedef struct regs_dump_req {
+	U32	base_addr;
+	U32	dw_len;
+} regs_dump_req_s;
+
+typedef enum sxe_pcs_mode {
+	SXE_PCS_MODE_1000BASE_KX_WO = 0,
+	SXE_PCS_MODE_1000BASE_KX_W,
+	SXE_PCS_MODE_SGMII,
+	SXE_PCS_MODE_10GBASE_KR_WO,
+	SXE_PCS_MODE_AUTO_NEGT_73,
+	SXE_PCS_MODE_LPBK_PHY_TX2RX,
+	SXE_PCS_MODE_LPBK_PHY_RX2TX,
+	SXE_PCS_MODE_LPBK_PCS_RX2TX,
+	SXE_PCS_MODE_BUTT,
+} sxe_pcs_mode_e;
+
+typedef enum sxe_remote_fault_mode {
+	SXE_REMOTE_FALUT_NO_ERROR		= 0,
+	SXE_REMOTE_FALUT_OFFLINE,
+	SXE_REMOTE_FALUT_LINK_FAILURE,
+	SXE_REMOTE_FALUT_AUTO_NEGOTIATION,
+	SXE_REMOTE_UNKNOWN,
+} sxe_remote_fault_e;
+
+typedef struct sxe_phy_cfg {
+	sxe_pcs_mode_e mode;
+	U32 mtu;
+} sxe_pcs_cfg_s;
+
+typedef enum sxe_an_speed {
+	SXE_AN_SPEED_NO_LINK = 0,
+	SXE_AN_SPEED_100M,
+	SXE_AN_SPEED_1G,
+	SXE_AN_SPEED_10G,
+	SXE_AN_SPEED_UNKNOWN,
+} sxe_an_speed_e;
+
+typedef enum sxe_phy_pause_cap {
+	SXE_PAUSE_CAP_NO_PAUSE	= 0,
+	SXE_PAUSE_CAP_ASYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_SYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_BOTH_PAUSE,
+	SXE_PAUSE_CAP_UNKNOWN,
+} sxe_phy_pause_cap_e;
+
+typedef enum sxe_phy_duplex_type {
+	SXE_FULL_DUPLEX	= 0,
+	SXE_HALF_DUPLEX	= 1,
+	SXE_UNKNOWN_DUPLEX,
+} sxe_phy_duplex_type_e;
+
+typedef struct sxe_phy_an_cap {
+	sxe_remote_fault_e   remote_fault;
+	sxe_phy_pause_cap_e  pause_cap;
+	sxe_phy_duplex_type_e duplex_cap;
+} sxe_phy_an_cap_s;
+
+typedef struct sxe_an_cap {
+	sxe_phy_an_cap_s local;
+	sxe_phy_an_cap_s peer;
+} sxe_an_cap_s;
+#endif
drivers/net/sxe/include/sxe/sxe_ioctl.h new file +21 -0
new file mode 100644
index 0000000000..4a4b0bc304
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef _SXE_IOCTL_H_
+#define _SXE_IOCTL_H_
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+struct sxe_ioctl_sync_cmd {
+	U64   traceid;
+	void *in_data;
+	U32   in_len;
+	void *out_data;
+	U32   out_len;
+};
+
+#define SXE_CMD_IOCTL_SYNC_CMD _IOWR('M', 1, struct sxe_ioctl_sync_cmd)
+
+#endif
drivers/net/sxe/meson.build +2 -0
index b06cc4c1fe..4ecf29ba6b 100644
@@ -30,6 +30,8 @@ sources = files(
         'base/sxe_hw.c',
 )
 
+testpmd_sources = files('sxe_testpmd.c')
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe_main.c +3 -0
index bbee8035d6..85bd87d495 100644
@@ -205,6 +205,9 @@ void sxe_hw_start(struct sxe_hw *hw)
 	sxe_hw_vlan_filter_array_clear(hw);
 
 	sxe_hw_stats_regs_clean(hw);
+
+	sxe_hw_no_snoop_disable(hw);
+
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/sxe_testpmd.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#78 lore raw

PATCH v5 12/14 net/sxe: add simd function

In reply to Jie Liu

Add simd function.

---
 drivers/net/sxe/base/sxe_queue_common.c |  52 +-
 drivers/net/sxe/base/sxe_rx_common.c    | 125 ++++-
 drivers/net/sxe/meson.build             |   9 +
 drivers/net/sxe/pf/sxe.h                |   3 +
 drivers/net/sxe/pf/sxe_vec_common.h     | 315 ++++++++++++
 drivers/net/sxe/pf/sxe_vec_neon.c       | 603 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vec_sse.c        | 625 ++++++++++++++++++++++++
 7 files changed, 1725 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_vec_common.h
 create mode 100644 drivers/net/sxe/pf/sxe_vec_neon.c
 create mode 100644 drivers/net/sxe/pf/sxe_vec_sse.c
drivers/net/sxe/base/sxe_queue_common.c +51 -1
index 2c08e24b43..978e56e98b 100644
@@ -14,6 +14,10 @@
 #include "sxe_logs.h"
 #include "sxe_regs.h"
 #include "sxe.h"
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+#include "sxe_vec_common.h"
+#include <rte_vect.h>
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
@@ -58,6 +62,10 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 	u16 len;
 	u64 offloads;
 	s32 ret = 0;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *pf_adapter = dev->data->dev_private;
+	struct sxevf_adapter *vf_adapter = dev->data->dev_private;
+#endif
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -162,6 +170,23 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 				"dma_addr=0x%" SXE_PRIX64,
 			 rxq->buffer_ring, rxq->sc_buffer_ring, rxq->desc_ring,
 			 rxq->base_addr);
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (!rte_is_power_of_2(desc_num)) {
+		PMD_LOG_DEBUG(INIT, "queue[%d] doesn't meet Vector Rx "
+					"preconditions - canceling the feature for "
+					"the whole port[%d]",
+				 rxq->queue_id, rxq->port_id);
+		if (is_vf)
+			vf_adapter->rx_vec_allowed = false;
+		else
+			pf_adapter->rx_vec_allowed = false;
+
+	} else {
+		sxe_rxq_vec_setup(rxq);
+	}
+#endif
+
 	dev->data->rx_queues[queue_idx] = rxq;
 
 	sxe_rx_queue_init(*rx_setup->rx_batch_alloc_allowed, rxq);
@@ -255,6 +280,9 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 		struct rte_eth_recycle_rxq_info *q_info)
 {
 	struct sxe_rx_queue *rxq;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *adapter = dev->data->dev_private;
+#endif
 
 	rxq = dev->data->rx_queues[queue_id];
 
@@ -262,9 +290,21 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
-
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (adapter->rx_vec_allowed) {
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
+		q_info->refill_requirement = rxq->realloc_num;
+		q_info->refill_head = &rxq->realloc_start;
+#endif
+	} else {
+		q_info->refill_requirement = rxq->batch_alloc_size;
+		q_info->refill_head = &rxq->batch_alloc_trigger;
+	}
+#else
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
+#endif
+	return;
 }
 
 void __sxe_tx_queue_info_get(struct rte_eth_dev *dev, u16 queue_id,
@@ -290,7 +330,17 @@ s32 __sxe_tx_done_cleanup(void *tx_queue, u32 free_cnt)
 	struct sxe_tx_queue *txq = (struct sxe_tx_queue *)tx_queue;
 	if (txq->offloads == 0 &&
 		txq->rs_thresh >= RTE_PMD_SXE_MAX_TX_BURST) {
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
+			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
+			txq->buffer_ring_vec != NULL)) {
+			ret = sxe_tx_done_cleanup_vec(txq, free_cnt);
+		} else {
+			ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+		}
+#else
 		ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+#endif
 
 	} else {
 		ret = sxe_tx_done_cleanup_full(txq, free_cnt);
drivers/net/sxe/base/sxe_rx_common.c +119 -6

181 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -0
index 4ecf29ba6b..f53ca7ecaf 100644
@@ -2,6 +2,9 @@
 # Copyright (C), 2022, Linkdata Technology Co., Ltd.
 cflags += ['-DSXE_DPDK']
 cflags += ['-DSXE_HOST_DRIVER']
+cflags += ['-DSXE_DPDK_L4_FEATURES']
+cflags += ['-DSXE_DPDK_SRIOV']
+cflags += ['-DSXE_DPDK_SIMD']
 
 #subdir('base')
 #objs = [base_objs]
@@ -32,6 +35,12 @@ sources = files(
 
 testpmd_sources = files('sxe_testpmd.c')
 
+if arch_subdir == 'x86'
+	sources += files('pf/sxe_vec_sse.c')
+elif arch_subdir == 'arm'
+	sources += files('pf/sxe_vec_neon.c')
+endif
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe.h +3 -0
index 2da5c4df96..fb259635dc 100644
@@ -66,6 +66,9 @@ struct sxe_adapter {
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	bool rx_vec_allowed;
+#endif
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
drivers/net/sxe/pf/sxe_vec_common.h new file +315 -0

315 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_neon.c new file +603 -0

603 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_sse.c new file +625 -0

625 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#79 lore raw

PATCH v5 13/14 net/sxe: add virtual function

In reply to Jie Liu

Add virtual function.

---
 drivers/net/sxe/base/sxe_queue_common.c |    4 +
 drivers/net/sxe/base/sxevf_hw.c         |  951 +++++++++++++++
 drivers/net/sxe/base/sxevf_hw.h         |  349 ++++++
 drivers/net/sxe/base/sxevf_regs.h       |  119 ++
 drivers/net/sxe/meson.build             |   37 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h        |    4 +-
 drivers/net/sxe/pf/sxe.h                |    5 +-
 drivers/net/sxe/pf/sxe_filter.c         |  177 +++
 drivers/net/sxe/pf/sxe_filter.h         |   15 +
 drivers/net/sxe/pf/sxe_main.c           |    2 +
 drivers/net/sxe/pf/sxe_phy.h            |    1 +
 drivers/net/sxe/pf/sxe_stats.c          |    9 +-
 drivers/net/sxe/pf/sxe_vf.c             | 1427 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vf.h             |  219 ++++
 drivers/net/sxe/sxe_testpmd.c           |  130 +++
 drivers/net/sxe/vf/sxevf.h              |   43 +
 drivers/net/sxe/vf/sxevf_ethdev.c       |  768 ++++++++++++
 drivers/net/sxe/vf/sxevf_ethdev.h       |   16 +
 drivers/net/sxe/vf/sxevf_filter.c       |  493 ++++++++
 drivers/net/sxe/vf/sxevf_filter.h       |   72 ++
 drivers/net/sxe/vf/sxevf_irq.c          |  434 +++++++
 drivers/net/sxe/vf/sxevf_irq.h          |   35 +
 drivers/net/sxe/vf/sxevf_main.c         |   83 ++
 drivers/net/sxe/vf/sxevf_msg.c          |  624 ++++++++++
 drivers/net/sxe/vf/sxevf_msg.h          |  201 ++++
 drivers/net/sxe/vf/sxevf_offload.c      |   31 +
 drivers/net/sxe/vf/sxevf_offload.h      |   16 +
 drivers/net/sxe/vf/sxevf_queue.c        |  210 ++++
 drivers/net/sxe/vf/sxevf_queue.h        |   70 ++
 drivers/net/sxe/vf/sxevf_rx.c           |  163 +++
 drivers/net/sxe/vf/sxevf_rx.h           |   18 +
 drivers/net/sxe/vf/sxevf_stats.c        |  162 +++
 drivers/net/sxe/vf/sxevf_stats.h        |   31 +
 drivers/net/sxe/vf/sxevf_tx.c           |   46 +
 drivers/net/sxe/vf/sxevf_tx.h           |   14 +
 35 files changed, 6960 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxevf_hw.c
 create mode 100644 drivers/net/sxe/base/sxevf_hw.h
 create mode 100644 drivers/net/sxe/base/sxevf_regs.h
 create mode 100644 drivers/net/sxe/pf/sxe_vf.c
 create mode 100644 drivers/net/sxe/pf/sxe_vf.h
 create mode 100644 drivers/net/sxe/vf/sxevf.h
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.c
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.h
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.c
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.h
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.c
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.h
 create mode 100644 drivers/net/sxe/vf/sxevf_main.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.h
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.c
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.h
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.c
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.h
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.h
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.c
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.h
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.h
drivers/net/sxe/base/sxe_queue_common.c +4 -0
index 978e56e98b..914718769f 100644
@@ -13,11 +13,15 @@
 #include "sxe_tx.h"
 #include "sxe_logs.h"
 #include "sxe_regs.h"
+#include "sxevf_regs.h"
 #include "sxe.h"
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include "sxe_vec_common.h"
 #include <rte_vect.h>
 #endif
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
+#include "sxevf.h"
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
drivers/net/sxe/base/sxevf_hw.c new file +951 -0

951 lines not on this page · raw message

drivers/net/sxe/base/sxevf_hw.h new file +349 -0

349 lines not on this page · raw message

drivers/net/sxe/base/sxevf_regs.h new file +119 -0

119 lines not on this page · raw message

drivers/net/sxe/meson.build +25 -12
index f53ca7ecaf..a3b874b7e2 100644
@@ -11,26 +11,38 @@ cflags += ['-DSXE_DPDK_SIMD']
 
 deps += ['hash']
 sources = files(
-        'pf/sxe_main.c',
+    'pf/sxe_main.c',
 	'pf/sxe_filter.c',
-        'pf/sxe_flow_ctrl.c',
-        'pf/sxe_irq.c',
-        'pf/sxe_ethdev.c',
+    'pf/sxe_flow_ctrl.c',
+    'pf/sxe_irq.c',
+    'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
 	'pf/sxe_stats.c',
-        'pf/sxe_pmd_hdc.c',
-        'pf/sxe_phy.c',
-        'pf/sxe_ptp.c',
-        'pf/sxe_dcb.c',
-        'base/sxe_queue_common.c',
+	'pf/sxe_pmd_hdc.c',
+    'pf/sxe_phy.c',
+    'pf/sxe_ptp.c',
+    'pf/sxe_vf.c',
+    'pf/sxe_dcb.c',
+    'vf/sxevf_main.c',
+	'vf/sxevf_filter.c',
+	'vf/sxevf_irq.c',
+	'vf/sxevf_msg.c',
+	'vf/sxevf_ethdev.c',
+	'vf/sxevf_stats.c',
+	'vf/sxevf_rx.c',
+	'vf/sxevf_tx.c',
+	'vf/sxevf_queue.c',
+	'vf/sxevf_offload.c',
+    'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
 	'base/sxe_offload_common.c',
-        'base/sxe_common.c',
-        'base/sxe_hw.c',
+    'base/sxe_common.c',
+    'base/sxe_hw.c',
+    'base/sxevf_hw.c',
 )
 
 testpmd_sources = files('sxe_testpmd.c')
@@ -43,5 +55,6 @@ endif
 
 includes += include_directories('base')
 includes += include_directories('pf')
+includes += include_directories('vf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
+includes += include_directories('include/')
\ No newline at end of file
drivers/net/sxe/pf/rte_pmd_sxe.h +3 -1
index 16406c6c26..69b0df2bd1 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #ifndef __PMD_SXE_H__
 #define __PMD_SXE_H__
 
@@ -13,4 +12,7 @@ typedef int32_t		s32;
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
 
 s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
+
+int rte_pmd_sxe_set_vf_rxmode(u16 port, u16 vf,
+u16 rx_mask, u8 on);
 #endif
drivers/net/sxe/pf/sxe.h +4 -1
index fb259635dc..abba0bd6fa 100644
@@ -11,8 +11,9 @@
 #include "sxe_types.h"
 #include "sxe_stats.h"
 #include "sxe_irq.h"
-#include "sxe_phy.h"
+#include "sxe_vf.h"
 #include "sxe_dcb.h"
+#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -62,6 +63,8 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_virtual_context vt_ctxt;
+
 	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_filter.c +177 -0

202 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +15 -0
index b8c67f8d42..e56baaf962 100644
@@ -75,6 +75,15 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_uc_hash_table_set(struct rte_eth_dev *dev,
+			struct rte_ether_addr *mac_addr, u8 on);
+
+s32 sxe_uc_all_hash_table_set(struct rte_eth_dev *dev, u8 on);
+
+s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
+			  struct rte_ether_addr *mc_addr_list,
+			  u32 nb_mc_addr);
+
 s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
 
 s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
@@ -94,4 +103,10 @@ void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
 
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
+u8 sxe_sw_uc_entry_vf_add(struct sxe_adapter *adapter,
+				u8 vf_idx, u8 *mac_addr, bool macvlan);
+
+void sxe_sw_uc_entry_vf_del(struct sxe_adapter *adapter, u8 vf_idx,
+					bool macvlan);
+
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 85bd87d495..49f9dd2f27 100644
@@ -20,10 +20,12 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_vf.h"
 #include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
drivers/net/sxe/pf/sxe_phy.h +1 -0
index 9fd2746ec8..d907b3c8f8 100644
@@ -6,6 +6,7 @@
 
 #include <rte_ethdev.h>
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_msg.h"
 
 #define SXE_SFF_BASE_ADDR			0x0
drivers/net/sxe/pf/sxe_stats.c +4 -5
index 6b9e1beb3e..af3c0bf84c 100644
@@ -219,10 +219,9 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	u8 prio;
 
 	cnt = SXE_XSTAT_CNT;
-	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt:%u "
-			"fc xstat field cnt:%u ", cnt,
-			SXE_XSTAT_MAC_CNT,
-			SXE_XSTAT_FC_CNT);
+	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
+			"fc xstat field cnt: %" SXE_PRIU64, cnt,
+			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -333,7 +332,7 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 
 	if (usr_cnt < SXE_XSTAT_CNT) {
 		ret = -SXE_ERR_PARAM;
-		PMD_LOG_ERR(DRV, "max:%u usr_cnt:%u invalid.(err:%d)",
+		PMD_LOG_ERR(DRV, "max: %" SXE_PRIU64 " usr_cnt:%u invalid.(err:%d)",
 				SXE_XSTAT_CNT, usr_cnt, ret);
 		goto l_out;
 	}
drivers/net/sxe/pf/sxe_vf.c new file +1427 -0

1,210 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vf.h new file +219 -0

219 lines not on this page · raw message

drivers/net/sxe/sxe_testpmd.c +130 -0

130 lines not on this page · raw message

drivers/net/sxe/vf/sxevf.h new file +43 -0

43 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.c new file +768 -0

768 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.h new file +16 -0
new file mode 100644
index 0000000000..57dfeea2e6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_filter.c new file +493 -0

493 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_filter.h new file +72 -0

72 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.c new file +434 -0

434 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.h new file +35 -0
new file mode 100644
index 0000000000..def1167af7

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_main.c new file +83 -0

83 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.c new file +624 -0

624 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.h new file +201 -0

201 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_offload.c new file +31 -0
new file mode 100644
index 0000000000..4b0eacf7f0

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_offload.h new file +16 -0
new file mode 100644
index 0000000000..ae4bf87f30

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_queue.c new file +210 -0

210 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_queue.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.c new file +163 -0

163 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.h new file +18 -0
new file mode 100644
index 0000000000..55ca2705c1

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_stats.c new file +162 -0

162 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_stats.h new file +31 -0
new file mode 100644
index 0000000000..ddf56c39df

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_tx.c new file +46 -0

46 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_tx.h new file +14 -0
new file mode 100644
index 0000000000..c8ad400bca

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#80 lore raw

PATCH v5 14/14 net/sxe: add Solve compilation problems.

In reply to Jie Liu

Add Fix compiling issues.

---
 drivers/net/sxe/base/sxe_compat_version.h |  1 -
 drivers/net/sxe/base/sxe_hw.c             | 21 ++++++++----
 drivers/net/sxe/base/sxe_offload_common.c |  1 -
 drivers/net/sxe/base/sxe_queue_common.c   |  3 +-
 drivers/net/sxe/base/sxe_rx_common.c      | 10 +++---
 drivers/net/sxe/base/sxe_rx_common.h      |  2 --
 drivers/net/sxe/base/sxe_tx_common.c      |  1 -
 drivers/net/sxe/base/sxevf_hw.c           |  1 -
 drivers/net/sxe/include/sxe/sxe_cli.h     |  6 ++--
 drivers/net/sxe/meson.build               | 42 +++++++++++------------
 drivers/net/sxe/pf/sxe.h                  | 11 +++---
 drivers/net/sxe/pf/sxe_dcb.c              |  2 +-
 drivers/net/sxe/pf/sxe_filter.c           |  1 -
 drivers/net/sxe/pf/sxe_filter.h           |  1 -
 drivers/net/sxe/pf/sxe_irq.h              |  2 --
 drivers/net/sxe/pf/sxe_main.c             | 15 --------
 drivers/net/sxe/pf/sxe_offload.c          |  1 -
 drivers/net/sxe/pf/sxe_phy.c              |  4 +--
 drivers/net/sxe/pf/sxe_pmd_hdc.c          |  1 -
 drivers/net/sxe/pf/sxe_queue.c            |  2 --
 drivers/net/sxe/pf/sxe_queue.h            |  2 --
 drivers/net/sxe/pf/sxe_rx.c               |  1 -
 drivers/net/sxe/pf/sxe_stats.c            | 23 ++++++++++---
 drivers/net/sxe/pf/sxe_stats.h            |  8 ++---
 drivers/net/sxe/pf/sxe_tx.c               | 23 +------------
 drivers/net/sxe/pf/sxe_vec_common.h       |  8 ++++-
 drivers/net/sxe/pf/sxe_vec_neon.c         |  2 --
 drivers/net/sxe/pf/sxe_vec_sse.c          |  1 -
 drivers/net/sxe/pf/sxe_vf.c               |  1 -
 drivers/net/sxe/pf/sxe_vf.h               |  1 -
 drivers/net/sxe/sxe_drv_type.h            |  4 ---
 drivers/net/sxe/sxe_testpmd.c             |  5 +--
 drivers/net/sxe/vf/sxevf_ethdev.c         |  6 ++--
 drivers/net/sxe/vf/sxevf_filter.h         |  4 +--
 drivers/net/sxe/vf/sxevf_irq.c            |  2 --
 drivers/net/sxe/vf/sxevf_irq.h            |  1 -
 drivers/net/sxe/vf/sxevf_main.c           |  1 -
 drivers/net/sxe/vf/sxevf_msg.c            |  2 +-
 drivers/net/sxe/vf/sxevf_offload.c        |  1 -
 drivers/net/sxe/vf/sxevf_queue.c          |  2 --
 drivers/net/sxe/vf/sxevf_queue.h          |  1 -
 drivers/net/sxe/vf/sxevf_rx.c             |  1 -
 42 files changed, 91 insertions(+), 137 deletions(-)
drivers/net/sxe/base/sxe_compat_version.h +0 -1
index 5b8577067d..f3c6893ad9 100644
@@ -6,7 +6,6 @@
 #define __SXE_COMPAT_VERSION_H__
 
 #include <stdbool.h>
-#include "sxe_dpdk_version.h"
 
 struct rte_eth_dev;
 enum rte_eth_event_type;
drivers/net/sxe/base/sxe_hw.c +14 -7
index 4ccab2ad54..392fc8ac23 100644
@@ -3,6 +3,7 @@
  */
 #ifdef SXE_PHY_CONFIGURE
 #include <linux/mdio.h>
+#include <rte_compat.h>
 #endif
 #if defined(__KERNEL__) || defined(SXE_KERNEL_TEST)
 #include "sxe_pci.h"
@@ -1893,7 +1894,7 @@ static void sxe_hw_rx_pkt_buf_size_configure(struct sxe_hw *hw,
 		for (i = 0; i < (num_pb / 2); i++)
 			SXE_REG_WRITE(hw, SXE_RXPBSIZE(i), rx_buf_size);
 
-		fallthrough;
+		/* fallthrough */
 	case (PBA_STRATEGY_EQUAL):
 		rx_buf_size = (total_buf_size / (num_pb - i))
 				<< SXE_RX_PKT_BUF_SIZE_SHIFT;
@@ -2231,7 +2232,7 @@ static s32 sxe_hw_fnav_vm_pool_mask_get(struct sxe_hw *hw,
 	switch (vm_pool & SXE_SAMPLE_VM_POOL_MASK) {
 	case 0x0:
 		*fnavm |= SXE_FNAVM_POOL;
-		fallthrough;
+		/* fallthrough */
 	case 0x7F:
 		break;
 	default:
@@ -2279,13 +2280,13 @@ static s32 sxe_hw_fnav_vlan_mask_get(struct sxe_hw *hw,
 	switch (ntohs(vlan_id) & SXE_SAMPLE_VLAN_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0x0FFF:
 		*fnavm |= SXE_FNAVM_VLANP;
 		break;
 	case 0xE000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0xEFFF:
 		break;
 	default:
@@ -2305,7 +2306,7 @@ static s32 sxe_hw_fnav_flex_bytes_mask_get(struct sxe_hw *hw,
 	switch ((__force u16)flex_bytes & SXE_SAMPLE_FLEX_BYTES_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_FLEX;
-		fallthrough;
+		/* fallthrough */
 	case 0xFFFF:
 		break;
 	default:
@@ -4963,7 +4964,14 @@ bool sxe_hw_is_rss_enabled(struct sxe_hw *hw)
 {
 	bool rss_enable = false;
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
-	if (mrqc & SXE_MRQC_RSSEN)
+
+
+	u32 mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
+	if (mrqe_val == SXE_MRQC_RSSEN ||
+		mrqe_val == SXE_MRQC_RTRSS8TCEN ||
+		mrqe_val == SXE_MRQC_RTRSS4TCEN ||
+		mrqe_val == SXE_MRQC_VMDQRSS32EN ||
+		mrqe_val == SXE_MRQC_VMDQRSS64EN)
 		rss_enable = true;
 
 	return rss_enable;
@@ -5497,7 +5505,6 @@ void sxe_hw_rss_cap_switch(struct sxe_hw *hw, bool is_on)
 {
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
 	u32 mrqe_val;
-
 	mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
 	if (is_on) {
 		mrqe_val = SXE_MRQC_RSSEN;
drivers/net/sxe/base/sxe_offload_common.c +0 -1
index f87cce67a5..7ecb31f466 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/base/sxe_queue_common.c +2 -1
index 914718769f..e31ebd005a 100644
@@ -4,7 +4,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
@@ -294,6 +293,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	if (adapter->rx_vec_allowed) {
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
@@ -308,6 +308,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
 #endif
+
 	return;
 }
 
drivers/net/sxe/base/sxe_rx_common.c +6 -4
index e3fee580df..5e46ff76f3 100644
@@ -5,7 +5,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_mbuf.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_malloc.h>
@@ -80,8 +79,6 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	u16  i, is_using_sse;
 
 	if (sxe_rx_vec_condition_check(dev) ||
-		!rx_batch_alloc_allowed ||
-		rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128
 		!rx_batch_alloc_allowed
 		) {
 		PMD_LOG_DEBUG(INIT, "Port[%d] doesn't meet Vector Rx "
@@ -111,6 +108,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
+
 #endif
 			dev->rx_pkt_burst = sxe_scattered_pkts_vec_recv;
 
@@ -138,12 +136,13 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 			dev->rx_pkt_burst = sxe_single_alloc_lro_pkts_recv;
 		}
 	}
-#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	else if (*rx_vec_allowed) {
 		PMD_LOG_DEBUG(INIT, "Vector rx enabled, please make sure RX "
 					"burst size no less than %d (port=%d).",
 				 SXE_DESCS_PER_LOOP,
 				 dev->data->port_id);
+
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 		dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
 
@@ -166,6 +165,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 		dev->rx_pkt_burst = sxe_pkts_recv;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	is_using_sse =
 		(dev->rx_pkt_burst == sxe_scattered_pkts_vec_recv ||
@@ -177,6 +177,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 		rxq->is_using_sse = is_using_sse;
 	}
 #endif
+
 }
 
 s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset)
@@ -340,6 +341,7 @@ const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of
 		ptypes = ptypes_arr;
 		goto l_end;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #if defined(RTE_ARCH_X86)
 	if (dev->rx_pkt_burst == sxe_pkts_vec_recv ||
drivers/net/sxe/base/sxe_rx_common.h +0 -2
index f9afb517d9..d1bf172c89 100644
@@ -5,8 +5,6 @@
 #ifndef __SXE_RX_COMMON_H__
 #define __SXE_RX_COMMON_H__
 
-#include "sxe_dpdk_version.h"
-
 void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
 
drivers/net/sxe/base/sxe_tx_common.c +0 -1
index e4cf514547..5f8a951bbd 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <rte_net.h>
drivers/net/sxe/base/sxevf_hw.c +0 -1
index 7425bafedb..914860e912 100644
@@ -15,7 +15,6 @@
 #else
 #include "sxe_errno.h"
 #include "sxe_logs.h"
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include "sxevf.h"
 #include "sxevf_hw.h"
drivers/net/sxe/include/sxe/sxe_cli.h +3 -3
index 623347dab2..8ffb14f68b 100644
@@ -9,7 +9,7 @@
 #include "sxe_drv_type.h"
 #endif
 
-#define SXE_VERSION_LEN				  (32)
+#define SXE_VERION_LEN				  (32)
 #define SXE_MAC_NUM					 (128)
 #define SXE_PORT_TRANSCEIVER_LEN		(32)
 #define SXE_PORT_VENDOR_LEN			 (32)
@@ -47,8 +47,8 @@ typedef enum port_link_speed {
 } port_link_speed_e;
 
 typedef struct sys_soc_info {
-	S8	 fw_ver[SXE_VERSION_LEN];
-	S8	 opt_ver[SXE_VERSION_LEN];
+	S8	 fw_ver[SXE_VERION_LEN];
+	S8	 opt_ver[SXE_VERION_LEN];
 	U8	 soc_status;
 	U8	 pad[3];
 	S32	soc_temp;
drivers/net/sxe/meson.build +21 -21

64 lines not on this page · raw message

drivers/net/sxe/pf/sxe.h +5 -6
index abba0bd6fa..eaf66a3acb 100644
@@ -6,14 +6,16 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-#include "sxe_filter.h"
+
 #include <stdbool.h>
+
 #include "sxe_types.h"
-#include "sxe_stats.h"
+#include "sxe_filter.h"
 #include "sxe_irq.h"
+#include "sxe_stats.h"
+#include "sxe_phy.h"
 #include "sxe_vf.h"
 #include "sxe_dcb.h"
-#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -81,9 +83,6 @@ struct sxe_adapter {
 	RTE_ATOMIC(bool)link_thread_running;
 	RTE_ATOMIC(bool)is_stopping;
 	rte_thread_t link_thread_tid;
-	rte_atomic32_t link_thread_running;
-	rte_atomic32_t is_stopping;
-	pthread_t link_thread_tid;
 	bool is_stopped;
 };
 
drivers/net/sxe/pf/sxe_dcb.c +1 -1
index 0f59886010..ef32fdd611 100644
@@ -584,7 +584,7 @@ static void sxe_dcb_cee_pfc_parse(struct sxe_dcb_config *cfg,
 static s32 sxe_dcb_tc_stats_configure(struct sxe_hw *hw,
 					struct sxe_dcb_config *dcb_config)
 {
-	s32 ret;
+	s32 ret = 0;
 	u8 tc_count = 8;
 	bool vmdq_active = false;
 
drivers/net/sxe/pf/sxe_filter.c +0 -1
index bf3eb40177..6b0d02c042 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
 #include <rte_malloc.h>
drivers/net/sxe/pf/sxe_filter.h +0 -1
index e56baaf962..b0c6986a7e 100644
@@ -6,7 +6,6 @@
 #define __SXE_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_types.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_irq.h +0 -2
index b2c5692932..eba70f5361 100644
@@ -4,8 +4,6 @@
 
 #ifndef __SXE_IRQ_H__
 #define __SXE_IRQ_H__
-
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_compat_platform.h"
drivers/net/sxe/pf/sxe_main.c +0 -15
index 49f9dd2f27..6c0891dbde 100644
@@ -8,7 +8,6 @@
 #include <rte_pci.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
@@ -245,24 +244,10 @@ RTE_LOG_REGISTER_SUFFIX(sxe_log_rx, pmd.net.sxe.rx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_tx, pmd.net.sxe.tx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_hw, pmd.net.sxe.tx_hw, DEBUG);
 #else
-#ifdef DPDK_19_11_6
-s32 sxe_log_init;
-s32 sxe_log_drv;
-RTE_INIT(sxe_init_log)
-{
-	sxe_log_init = rte_log_register("pmd.net.sxe.init");
-	if (sxe_log_init >= 0)
-		rte_log_set_level(sxe_log_init, RTE_LOG_NOTICE);
 
-	sxe_log_drv = rte_log_register("pmd.net.sxe.drv");
-	if (sxe_log_drv >= 0)
-		rte_log_set_level(sxe_log_drv, RTE_LOG_NOTICE);
-}
-#else
 RTE_LOG_REGISTER_SUFFIX(sxe_log_init, pmd.net.sxe.init, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_drv, pmd.net.sxe.drv, NOTICE);
 #endif
-#endif
 
 int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
 	enum rte_eth_event_type event, void *ret_param)
drivers/net/sxe/pf/sxe_offload.c +0 -1
index 4b49cba707..d34cf7ecc8 100644
@@ -2,7 +2,6 @@
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
 #include <ethdev_driver.h>
-
 #include "sxe.h"
 #include "sxe_offload.h"
 #include "sxe_logs.h"
drivers/net/sxe/pf/sxe_phy.c +2 -2
index 787b16fb47..afc885545e 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include <rte_cycles.h>
@@ -69,7 +68,8 @@ void sxe_wait_setup_link_complete(struct rte_eth_dev *dev,
 	struct sxe_adapter *adapter = dev->data->dev_private;
 	uint32_t timeout = timeout_ms ? timeout_ms : SXE_WARNING_TIMEOUT;
 
-	while (rte_atomic_load_explicit(&adapter->link_thread_running, rte_memory_order_seq_cst)) {
+	while (rte_atomic_load_explicit(&adapter->link_thread_running,
+		rte_memory_order_seq_cst)) {
 		rte_delay_us_sleep(1000);
 		timeout--;
 
drivers/net/sxe/pf/sxe_pmd_hdc.c +0 -1
index 21f751ed26..61dcb6a6c1 100644
@@ -3,7 +3,6 @@
  */
 
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_version.h"
 #include <semaphore.h>
drivers/net/sxe/pf/sxe_queue.c +0 -2
index 9411da8ff8..75287defda 100644
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "rte_malloc.h"
 #include "sxe.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_queue.h +0 -2
index e67baf6135..027aea0755 100644
@@ -3,8 +3,6 @@
  */
 #ifndef __SXE_QUEUE_H__
 #define __SXE_QUEUE_H__
-
-#include "sxe_dpdk_version.h"
 #include "sxe_queue_common.h"
 
 #define SXE_TXRX_RING_NUM_MAX	 64
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 65cfcca4c9..b1c53a533a 100644
@@ -113,7 +113,6 @@
 
 
 const alignas(RTE_CACHE_LINE_SIZE) u32 sxe_ptype_table[SXE_PACKET_TYPE_MAX] = {
-
 	[SXE_PACKET_TYPE_ETHER] = RTE_PTYPE_L2_ETHER,
 	[SXE_PACKET_TYPE_IPV4] = RTE_PTYPE_L2_ETHER |
 		RTE_PTYPE_L3_IPV4,
drivers/net/sxe/pf/sxe_stats.c +18 -5
index af3c0bf84c..48b6b9da2c 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include "sxe_stats.h"
 #include "sxe.h"
 #include "sxe_logs.h"
@@ -221,7 +220,7 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	cnt = SXE_XSTAT_CNT;
 	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
 			"fc xstat field cnt: %" SXE_PRIU64, cnt,
-			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
+			(u64)SXE_XSTAT_MAC_CNT, (u64)SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -432,7 +431,11 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 size = SXE_XSTAT_CNT;
 	u32 i;
-	u64 value_all[size];
+	u64 *value_all = (u64 *)malloc(size * sizeof(u64));
+	if (value_all == NULL) {
+		perror("value_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_all_xstats_value_get(eth_dev, values, usr_cnt);
@@ -459,6 +462,9 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (value_all != NULL)
+		free(value_all);
+
 	return ret;
 }
 
@@ -470,7 +476,12 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 i;
 	u32 size = SXE_XSTAT_CNT;
-	struct rte_eth_xstat_name xstat_names_all[size];
+	struct rte_eth_xstat_name *xstat_names_all =
+	(struct rte_eth_xstat_name *)malloc(size * sizeof(struct rte_eth_xstat_name));
+	if (xstat_names_all == NULL) {
+		perror("xstat_names_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_xstats_names_get(eth_dev, xstats_names, usr_cnt);
@@ -490,6 +501,9 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (xstat_names_all != NULL)
+		free(xstat_names_all);
+
 	return ret;
 }
 
@@ -573,4 +587,3 @@ void sxe_queue_stats_map_reset(struct rte_eth_dev *eth_dev)
 		sxe_hw_rxq_stat_map_set(hw, reg_idx, 0);
 	}
 }
-
drivers/net/sxe/pf/sxe_stats.h +3 -5
index 78a13e7a0b..320a82a130 100644
@@ -7,8 +7,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxe_hw.h"
 
 #define SXE_STATS_FIELD_NAME_SIZE  50
@@ -49,11 +47,11 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 	struct rte_eth_xstat_name *xstats_names, __rte_unused unsigned int size);
 
 s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
-					const ulong *ids,
-					ulong *values, u32 usr_cnt);
+					const u64 *ids,
+					u64 *values, u32 usr_cnt);
 
 s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
-	const ulong *ids,
+	const u64 *ids,
 	struct rte_eth_xstat_name *xstats_names,
 	u32 usr_cnt);
 
drivers/net/sxe/pf/sxe_tx.c +1 -22
index b50052e0db..46e65ebcf7 100644
@@ -1,18 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
-#if defined DPDK_20_11_5 || defined DPDK_19_11_6
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
-#elif defined DPDK_21_11_5
-#include <ethdev_driver.h>
-#include <rte_dev.h>
-#else
 #include <ethdev_driver.h>
 #include <dev_driver.h>
-#endif
-
 #include <rte_net.h>
 
 #include "sxe.h"
@@ -43,17 +33,10 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 		dev->tx_pkt_prepare = NULL;
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
-#ifndef DPDK_19_11_6
-			rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128 &&
-#endif
 			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
 			sxe_txq_vec_setup(txq) == 0)) {
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_tx_mbufs_reuse = sxe_recycle_tx_mbufs_reuse_vec;
-#endif
-#endif
 #endif
 			dev->tx_pkt_burst   = sxe_pkts_vector_xmit;
 			PMD_LOG_INFO(INIT, "using vector tx code path");
@@ -72,7 +55,7 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 
 		PMD_LOG_INFO(INIT, "using full-featured tx code path");
 		PMD_LOG_INFO(INIT, " - offloads = 0x%" SXE_PRIX64,
-					(unsigned long)txq->offloads);
+							txq->offloads);
 		PMD_LOG_INFO(INIT, " - tx_rs_thresh = %d "
 				   "[RTE_PMD_SXE_MAX_TX_BURST=%d]",
 				txq->rs_thresh,
@@ -370,8 +353,6 @@ u16 sxe_pkts_simple_xmit(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num
 }
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	struct rte_eth_recycle_rxq_info *recycle_rxq_info)
@@ -438,8 +419,6 @@ u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	return nb_recycle_mbufs;
 }
 #endif
-#endif
-#endif
 
 u16 sxe_pkts_vector_xmit(void *tx_queue, struct rte_mbuf **tx_pkts,
 			   u16 pkts_num)
drivers/net/sxe/pf/sxe_vec_common.h +7 -1
index 85605507f5..90ace4c324 100644
@@ -11,6 +11,7 @@
 #include <dev_driver.h>
 #include <rte_malloc.h>
 #include "sxe.h"
+#include "sxe_queue.h"
 #include "sxe_rx.h"
 
 #define RTE_SXE_MAX_TX_FREE_BUF_SZ	64
@@ -77,7 +78,11 @@ static inline u16
 sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 			u16 bufs_num, u8 *split_flags)
 {
-	struct rte_mbuf *pkts[bufs_num];
+	struct rte_mbuf **pkts = (struct rte_mbuf **)malloc(bufs_num * sizeof(struct rte_mbuf *));
+	if (pkts == NULL) {
+		perror("pkts malloc failed");
+		exit(EXIT_FAILURE);
+	}
 	struct rte_mbuf *start = rxq->pkt_first_seg;
 	struct rte_mbuf *end = rxq->pkt_last_seg;
 	u32 pkt_idx, buf_idx;
@@ -129,6 +134,7 @@ sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 	rxq->pkt_last_seg = end;
 	memcpy(rx_bufs, pkts, pkt_idx * (sizeof(*pkts)));
 
+	free(pkts);
 	return pkt_idx;
 }
 
drivers/net/sxe/pf/sxe_vec_neon.c +0 -2
index 9012750c98..30d878ea39 100644
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 
drivers/net/sxe/pf/sxe_vec_sse.c +0 -1
index 8786af75f8..d54542f4a8 100644
@@ -4,7 +4,6 @@
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
drivers/net/sxe/pf/sxe_vf.c +0 -1
index f47a65279e..2e53087816 100644
@@ -6,7 +6,6 @@
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_memcpy.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/pf/sxe_vf.h +0 -1
index 05b91540cc..112d98df39 100644
@@ -5,7 +5,6 @@
 #ifndef __SXE_VF_H__
 #define __SXE_VF_H__
 
-#include "sxe_dpdk_version.h"
 #include <rte_ethdev.h>
 #include <bus_pci_driver.h>
 
drivers/net/sxe/sxe_drv_type.h +0 -4
index 6261f2d320..1ccf0b3f87 100644
@@ -5,14 +5,10 @@
 #ifndef __SXE_DRV_TYPEDEF_H__
 #define __SXE_DRV_TYPEDEF_H__
 
-#ifdef SXE_DPDK
 #include "sxe_types.h"
 #ifndef bool
 #define bool _Bool
 #endif
-#else
-#include <linux/types.h>
-#endif
 
 typedef u8 U8;
 typedef u16 U16;
drivers/net/sxe/sxe_testpmd.c +3 -2
index b533ae939b..6e4dfb31ee 100644
@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
+
 #include <ethdev_driver.h>
-#include "sxe_ethdev.h"
+#include "sxe_drv_type.h"
 #include "rte_pmd_sxe.h"
-
+#include "sxe_ethdev.h"
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_parse_num.h>
 #include <cmdline_parse_string.h>
drivers/net/sxe/vf/sxevf_ethdev.c +2 -4
index 69740bfa6c..b1655e8642 100644
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <inttypes.h>
-#include "sxe_dpdk_version.h"
+
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
@@ -252,6 +252,7 @@ static void sxevf_txrx_start(struct rte_eth_dev *eth_dev)
 		txq = eth_dev->data->tx_queues[i];
 		sxevf_tx_ring_switch(hw, txq->reg_idx, true);
 		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	}
 
 	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
@@ -332,7 +333,6 @@ static s32 sxevf_dev_stop(struct rte_eth_dev *dev)
 	sxevf_irq_free(dev);
 
 l_out:
-
 	return 0;
 }
 
@@ -362,7 +362,6 @@ static s32 sxevf_dev_close(struct rte_eth_dev *dev)
 	sxevf_irq_unregister(dev);
 
 l_out:
-
 	return ret;
 }
 
@@ -470,7 +469,6 @@ static s32 sxevf_mtu_set(struct rte_eth_dev *dev, u16 mtu)
 		goto l_out;
 	}
 
-	dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame;
 	LOG_INFO_BDF("change max frame size to %u success.", max_frame);
 
 l_out:
drivers/net/sxe/vf/sxevf_filter.h +2 -2
index f6af527cbe..defdf5ecc9 100644
@@ -6,9 +6,7 @@
 #define __SXEVF_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
-#endif
 
 #define SXEVF_MTA_ENTRY_NUM_MAX		128
 #define SXEVF_UTA_HASH_BIT_MAX		 4096
@@ -70,3 +68,5 @@ s32 sxevf_mac_addr_add(struct rte_eth_dev *dev,
 s32 sxevf_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
+
+#endif
drivers/net/sxe/vf/sxevf_irq.c +0 -2
index bf768a67f6..3263f56313 100644
@@ -9,10 +9,8 @@
 #include <rte_alarm.h>
 #include <rte_interrupts.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <eal_interrupts.h>
-
 #include "sxevf.h"
 #include "sxe_logs.h"
 #include "sxe_errno.h"
drivers/net/sxe/vf/sxevf_irq.h +0 -1
index def1167af7..2f9860ba15 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_IRQ_H__
 #define __SXEVF_IRQ_H__
 
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_platform.h"
 
drivers/net/sxe/vf/sxevf_main.c +0 -1
index d418705cf8..b1924c1475 100644
@@ -12,7 +12,6 @@
 #include <rte_dev.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/vf/sxevf_msg.c +1 -1
index faf6787e74..37d3f2c5dc 100644
@@ -101,7 +101,7 @@ static s32 sxevf_mailbox_lock(struct sxevf_hw *hw)
 		mailbox |= SXE_VFMAILBOX_VFU;
 		sxevf_mailbox_write(hw, mailbox);
 
-		if (sxevf_mbx_reg_read(hw) && SXE_VFMAILBOX_VFU) {
+		if (sxevf_mbx_reg_read(hw) & SXE_VFMAILBOX_VFU) {
 			ret = 0;
 			break;
 		}
drivers/net/sxe/vf/sxevf_offload.c +0 -1
index 4b0eacf7f0..b39245aa11 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/vf/sxevf_queue.c +0 -2
index 4461d13369..69ef1f6676 100644
@@ -7,8 +7,6 @@
 #include <rte_byteorder.h>
 #include <rte_mbuf_core.h>
 #include <rte_ethdev.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxevf_rx.h"
 #include "sxevf_tx.h"
 #include "sxe_logs.h"
drivers/net/sxe/vf/sxevf_queue.h +0 -1
index 9407e941fb..01e2ec216c 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_QUEUEU_H__
 #define __SXEVF_QUEUEU_H__
 
-#include "sxe_dpdk_version.h"
 #include "sxe_types.h"
 #include "sxe_queue_common.h"
 
drivers/net/sxe/vf/sxevf_rx.c +0 -1
index aee63d025d..81aab3f315 100644
@@ -5,7 +5,6 @@
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
 
 #include <rte_common.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_logs.h"
Signature · 1 line
2.18.4
author
#81 lore raw

PATCH v6 1/14 net/sxe: add base driver directory and doc

Adding a minimum maintainable directory structure for the network driver and request maintenance of the sxe driver.

---
 MAINTAINERS                         |  6 +++
 doc/guides/nics/features/sxe.ini    | 78 +++++++++++++++++++++++++++++
 doc/guides/nics/features/sxe_vf.ini | 37 ++++++++++++++
 doc/guides/nics/index.rst           |  1 +
 doc/guides/nics/sxe.rst             | 71 ++++++++++++++++++++++++++
 drivers/net/sxe/meson.build         |  9 ++++
 drivers/net/sxe/pf/sxe_ethdev.c     |  3 ++
 drivers/net/sxe/pf/sxe_ethdev.h     |  3 ++
 8 files changed, 208 insertions(+)
 create mode 100644 doc/guides/nics/features/sxe.ini
 create mode 100644 doc/guides/nics/features/sxe_vf.ini
 create mode 100644 doc/guides/nics/sxe.rst
 create mode 100644 drivers/net/sxe/meson.build
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.c
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.h
MAINTAINERS +6 -0
index 0e9357f3a3..b286452143 100644
@@ -2074,3 +2074,9 @@ F: examples/vmdq/
 F: doc/guides/sample_app_ug/vmdq_forwarding.rst
 F: examples/vmdq_dcb/
 F: doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst
+
+Linkdata sxe
+M: Jie Li <[email protected]>
+F: drivers/net/sxe/
+F: doc/guides/nics/sxe.rst
+F: doc/guides/nics/features/sxe*.ini
doc/guides/nics/features/sxe.ini new file +78 -0

78 lines not on this page · raw message

doc/guides/nics/features/sxe_vf.ini new file +37 -0
new file mode 100644
index 0000000000..7caf5435ae
@@ -0,0 +1,37 @@
+;
+; Supported features of the 'sxe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Link status          = Y
+Rx interrupt         = Y
+Power mgmt address monitor = Y
+MTU update           = Y
+Scattered Rx         = Y
+LRO                  = Y
+TSO                  = Y
+Promiscuous mode     = Y
+Allmulticast mode    = Y
+Unicast MAC filter   = Y
+RSS hash             = Y
+RSS key update       = Y
+RSS reta update      = Y
+VLAN filter          = Y
+Inline crypto        = Y
+CRC offload          = P
+VLAN offload         = P
+QinQ offload         = P
+L3 checksum offload  = P
+L4 checksum offload  = P
+Inner L3 checksum    = P
+Inner L4 checksum    = P
+Packet type parsing  = Y
+Rx descriptor status = Y
+Tx descriptor status = Y
+Basic stats          = Y
+Extended stats       = Y
+Registers dump       = Y
+Linux                = Y
+ARMv8                = Y
+x86-64               = Y
doc/guides/nics/index.rst +1 -0
index 57d161c526..3616bfc7a4 100644
@@ -64,6 +64,7 @@ Network Interface Controller Drivers
     rnp
     sfc_efx
     softnic
+    sxe
     tap
     thunderx
     txgbe
doc/guides/nics/sxe.rst new file +71 -0

71 lines not on this page · raw message

drivers/net/sxe/meson.build new file +9 -0
new file mode 100644
index 0000000000..dad9ee44a0
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C), 2020, Wuxi Stars Micro System Technologies Co., Ltd.
+
+deps += ['hash']
+sources = files(
+        'pf/sxe_ethdev.c',
+)
+
+includes += include_directories('pf')
drivers/net/sxe/pf/sxe_ethdev.c new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
drivers/net/sxe/pf/sxe_ethdev.h new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
Signature · 1 line
2.18.4
author
#82 lore raw

PATCH v6 2/14 net/sxe: add ethdev probe and remove

Add basic modules: logs、 hardware communication、common components and support basic PCIe ethdev probe and remove.

---
 drivers/net/sxe/base/sxe_common.c          |   66 +
 drivers/net/sxe/base/sxe_common.h          |   15 +
 drivers/net/sxe/base/sxe_compat_platform.h |  130 +
 drivers/net/sxe/base/sxe_compat_version.h  |   38 +
 drivers/net/sxe/base/sxe_errno.h           |   61 +
 drivers/net/sxe/base/sxe_hw.c              | 6260 ++++++++++++++++++++
 drivers/net/sxe/base/sxe_hw.h              | 1541 +++++
 drivers/net/sxe/base/sxe_logs.h            |  273 +
 drivers/net/sxe/base/sxe_types.h           |   40 +
 drivers/net/sxe/include/drv_msg.h          |   18 +
 drivers/net/sxe/include/sxe/sxe_hdc.h      |   42 +
 drivers/net/sxe/include/sxe/sxe_msg.h      |  135 +
 drivers/net/sxe/include/sxe/sxe_regs.h     | 1280 ++++
 drivers/net/sxe/include/sxe_version.h      |   29 +
 drivers/net/sxe/meson.build                |   15 +-
 drivers/net/sxe/pf/sxe.h                   |   56 +
 drivers/net/sxe/pf/sxe_ethdev.c            |  324 +-
 drivers/net/sxe/pf/sxe_ethdev.h            |   27 +-
 drivers/net/sxe/pf/sxe_irq.c               |  126 +
 drivers/net/sxe/pf/sxe_irq.h               |   41 +
 drivers/net/sxe/pf/sxe_main.c              |  251 +
 drivers/net/sxe/pf/sxe_phy.h               |   38 +
 drivers/net/sxe/pf/sxe_pmd_hdc.c           |  683 +++
 drivers/net/sxe/pf/sxe_pmd_hdc.h           |   44 +
 drivers/net/sxe/sxe_drv_type.h             |   19 +
 25 files changed, 11549 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxe_common.c
 create mode 100644 drivers/net/sxe/base/sxe_common.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_platform.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_version.h
 create mode 100644 drivers/net/sxe/base/sxe_errno.h
 create mode 100644 drivers/net/sxe/base/sxe_hw.c
 create mode 100644 drivers/net/sxe/base/sxe_hw.h
 create mode 100644 drivers/net/sxe/base/sxe_logs.h
 create mode 100644 drivers/net/sxe/base/sxe_types.h
 create mode 100644 drivers/net/sxe/include/drv_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_hdc.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_regs.h
 create mode 100644 drivers/net/sxe/include/sxe_version.h
 create mode 100644 drivers/net/sxe/pf/sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_irq.c
 create mode 100644 drivers/net/sxe/pf/sxe_irq.h
 create mode 100644 drivers/net/sxe/pf/sxe_main.c
 create mode 100644 drivers/net/sxe/pf/sxe_phy.h
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.c
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.h
 create mode 100644 drivers/net/sxe/sxe_drv_type.h
drivers/net/sxe/base/sxe_common.c new file +66 -0
new file mode 100644
index 0000000000..8b3fb13e73
@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#include <pthread.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <rte_common.h>
+#include <rte_cycles.h>
+#include <time.h>
+#include "sxe_types.h"
+#include "sxe_common.h"
+
+#define SXE_TRACE_ID_COUNT_MASK  0x00000000000000FFLLU
+#define SXE_TRACE_ID_TID_MASK	0x0000000000FFFF00LLU
+#define SXE_TRACE_ID_TIME_MASK   0x00FFFFFFFF000000LLU
+#define SXE_TRACE_ID_FLAG		0xFF00000000000000LLU
+
+#define SXE_TRACE_ID_COUNT_SHIFT 0
+#define SXE_TRACE_ID_TID_SHIFT   8
+#define SXE_TRACE_ID_TIME_SHIFT  24
+
+#define SXE_SEC_TO_MS(sec) ((sec) * 1000ULL)
+#define SXE_SEC_TO_NS(sec) ((sec) * 1000000000ULL)
+
+#define SXE_USEC_PER_MS		  1000000
+
+u64 sxe_trace_id;
+
+u64 sxe_time_get_real_ms(void)
+{
+	u64 ms = 0;
+	struct timespec ts;
+	s32 ret = clock_gettime(CLOCK_MONOTONIC, &ts);
+	if (ret < 0)
+		goto l_end;
+
+	ms = SXE_SEC_TO_MS(ts.tv_sec) + ts.tv_nsec / SXE_USEC_PER_MS;
+
+l_end:
+	return ms;
+}
+
+u64 sxe_trace_id_gen(void)
+{
+	u64 tid	   = getpid() + (pthread_self() << 20);
+	u64 index	 = 0;
+	u64 timestamp = sxe_time_get_real_ms();
+
+	sxe_trace_id = (SXE_TRACE_ID_FLAG)
+		| ((timestamp << SXE_TRACE_ID_TIME_SHIFT) & SXE_TRACE_ID_TIME_MASK)
+		| ((tid << SXE_TRACE_ID_TID_SHIFT) & SXE_TRACE_ID_TID_MASK)
+		| ((index << SXE_TRACE_ID_COUNT_SHIFT) & SXE_TRACE_ID_COUNT_MASK);
+	return sxe_trace_id;
+}
+
+void sxe_trace_id_clean(void)
+{
+	sxe_trace_id = 0;
+}
+
+u64 sxe_trace_id_get(void)
+{
+	return sxe_trace_id++;
+}
drivers/net/sxe/base/sxe_common.h new file +15 -0
new file mode 100644
index 0000000000..43c062b937
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef __SXE_DPDK_COMMON_H__
+#define __SXE_DPDK_COMMON_H__
+
+u64 sxe_trace_id_gen(void);
+
+void sxe_trace_id_clean(void);
+
+u64 sxe_trace_id_get(void);
+
+u64 sxe_time_get_real_ms(void);
+
+#endif
drivers/net/sxe/base/sxe_compat_platform.h new file +130 -0

130 lines not on this page · raw message

drivers/net/sxe/base/sxe_compat_version.h new file +38 -0
new file mode 100644
index 0000000000..5b8577067d
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_COMPAT_VERSION_H__
+#define __SXE_COMPAT_VERSION_H__
+
+#include <stdbool.h>
+#include "sxe_dpdk_version.h"
+
+struct rte_eth_dev;
+enum rte_eth_event_type;
+
+int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
+	enum rte_eth_event_type event, void *ret_param);
+
+#define SET_AUTOFILL_QUEUE_XSTATS
+#define PCI_REG_WC_WRITE
+
+#ifndef PCI_REG_WC_WRITE
+#define rte_write32_wc rte_write32
+#define rte_write32_wc_relaxed rte_write32_relaxed
+#endif
+
+#define SXE_PCI_INTR_HANDLE(pci_dev) \
+	((pci_dev)->intr_handle)
+#define SXE_DEV_FNAV_CONF(dev) \
+	(&((struct sxe_adapter *)(dev)->data->dev_private)->fnav_conf)
+#define RTE_ADAPTER_HAVE_FNAV_CONF
+#define SXE_GET_FRAME_SIZE(dev) \
+	((dev)->data->mtu + SXE_ETH_OVERHEAD)
+
+#define ETH_DEV_OPS_MONITOR
+
+#define DEV_RX_OFFLOAD_CHECKSUM RTE_ETH_RX_OFFLOAD_CHECKSUM
+#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES
+
+#endif
drivers/net/sxe/base/sxe_errno.h new file +61 -0

61 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.c new file +6260 -0

2,690 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.h new file +1541 -0

1,541 lines not on this page · raw message

drivers/net/sxe/base/sxe_logs.h new file +273 -0

273 lines not on this page · raw message

drivers/net/sxe/base/sxe_types.h new file +40 -0
new file mode 100644
index 0000000000..a36a3cfbf6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/drv_msg.h new file +18 -0
new file mode 100644
index 0000000000..87c505569d

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/sxe/sxe_hdc.h new file +42 -0

42 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_msg.h new file +135 -0

135 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_regs.h new file +1280 -0

1,280 lines not on this page · raw message

drivers/net/sxe/include/sxe_version.h new file +29 -0
new file mode 100644
index 0000000000..fb58e73399

Lines of this file are not shown. View the raw message.

drivers/net/sxe/meson.build +14 -1
index dad9ee44a0..f75feb0cc9 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe.h new file +56 -0

56 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.c +323 -1

324 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.h +26 -1
index e31a23deeb..66034343ea 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_irq.c new file +126 -0

126 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c new file +251 -0

251 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h new file +38 -0
new file mode 100644
index 0000000000..2947d88812

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_pmd_hdc.c new file +683 -0

683 lines not on this page · raw message

drivers/net/sxe/pf/sxe_pmd_hdc.h new file +44 -0

44 lines not on this page · raw message

drivers/net/sxe/sxe_drv_type.h new file +19 -0
new file mode 100644
index 0000000000..1ccf0b3f87

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#83 lore raw

PATCH v6 3/14 net/sxe: add tx rx setup and data path

In reply to Jie Liu

Add setup, initialization, and logic for tx and rx queues.

---
 drivers/net/meson.build                   |    1 +
 drivers/net/sxe/base/sxe_offload_common.c |   54 +
 drivers/net/sxe/base/sxe_offload_common.h |   14 +
 drivers/net/sxe/base/sxe_queue_common.c   |  397 ++++++
 drivers/net/sxe/base/sxe_queue_common.h   |  240 ++++
 drivers/net/sxe/base/sxe_rx_common.c      |  243 ++++
 drivers/net/sxe/base/sxe_rx_common.h      |   19 +
 drivers/net/sxe/base/sxe_tx_common.c      |   41 +
 drivers/net/sxe/base/sxe_tx_common.h      |   12 +
 drivers/net/sxe/include/sxe_type.h        |  795 +++++++++++
 drivers/net/sxe/meson.build               |   10 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h          |   14 +
 drivers/net/sxe/pf/sxe.h                  |    1 +
 drivers/net/sxe/pf/sxe_ethdev.c           |  202 +++
 drivers/net/sxe/pf/sxe_irq.c              |  258 ++++
 drivers/net/sxe/pf/sxe_irq.h              |   11 +
 drivers/net/sxe/pf/sxe_main.c             |    7 +
 drivers/net/sxe/pf/sxe_offload.c          |   39 +
 drivers/net/sxe/pf/sxe_offload.h          |   18 +
 drivers/net/sxe/pf/sxe_queue.c            |  776 +++++++++++
 drivers/net/sxe/pf/sxe_queue.h            |  133 ++
 drivers/net/sxe/pf/sxe_rx.c               | 1491 +++++++++++++++++++++
 drivers/net/sxe/pf/sxe_rx.h               |  194 +++
 drivers/net/sxe/pf/sxe_tx.c               | 1072 +++++++++++++++
 drivers/net/sxe/pf/sxe_tx.h               |   50 +
 drivers/net/sxe/rte_pmd_sxe_version.map   |    5 +
 26 files changed, 6096 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.c
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.h
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.c
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.h
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.h
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.h
 create mode 100644 drivers/net/sxe/include/sxe_type.h
 create mode 100644 drivers/net/sxe/pf/rte_pmd_sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_offload.c
 create mode 100644 drivers/net/sxe/pf/sxe_offload.h
 create mode 100644 drivers/net/sxe/pf/sxe_queue.c
 create mode 100644 drivers/net/sxe/pf/sxe_queue.h
 create mode 100644 drivers/net/sxe/pf/sxe_rx.c
 create mode 100644 drivers/net/sxe/pf/sxe_rx.h
 create mode 100644 drivers/net/sxe/pf/sxe_tx.c
 create mode 100644 drivers/net/sxe/pf/sxe_tx.h
 create mode 100644 drivers/net/sxe/rte_pmd_sxe_version.map
drivers/net/meson.build +1 -0
index 61f8cddb30..453871764c 100644
@@ -65,6 +65,7 @@ drivers = [
         'vmxnet3',
         'xsc',
         'zxdh',
+	'sxe',
 ]
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
drivers/net/sxe/base/sxe_offload_common.c new file +54 -0

54 lines not on this page · raw message

drivers/net/sxe/base/sxe_offload_common.h new file +14 -0
new file mode 100644
index 0000000000..cbfb7fd93f
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_COMMON_H__
+#define __SXE_OFFLOAD_COMMON_H__
+
+u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/base/sxe_queue_common.c new file +397 -0

397 lines not on this page · raw message

drivers/net/sxe/base/sxe_queue_common.h new file +240 -0

240 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.c new file +243 -0

243 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.h new file +19 -0
new file mode 100644
index 0000000000..f9afb517d9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_RX_COMMON_H__
+#define __SXE_RX_COMMON_H__
+
+#include "sxe_dpdk_version.h"
+
+void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
+	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
+
+s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset);
+
+u16 __sxe_pkts_recv(void *rx_queue, struct rte_mbuf **rx_pkts,
+		u16 pkts_num);
+
+const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements);
+#endif
drivers/net/sxe/base/sxe_tx_common.c new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/base/sxe_tx_common.h new file +12 -0
new file mode 100644
index 0000000000..2759ef5a7a
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_TX_COMMON_H__
+#define __SXE_TX_COMMON_H__
+
+int __sxe_tx_descriptor_status(void *tx_queue, u16 offset);
+
+u16 __sxe_pkts_xmit_with_offload(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num);
+
+#endif
drivers/net/sxe/include/sxe_type.h new file +795 -0

795 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -1
index f75feb0cc9..2af37bce4c 100644
@@ -11,7 +11,15 @@ sources = files(
         'pf/sxe_main.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
+	'pf/sxe_offload.c',
+	'pf/sxe_queue.c',
+	'pf/sxe_rx.c',
+	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'base/sxe_queue_common.c',
+	'base/sxe_rx_common.c',
+	'base/sxe_tx_common.c',
+	'base/sxe_offload_common.c',
         'base/sxe_common.c',
         'base/sxe_hw.c',
 )
@@ -19,4 +27,4 @@ sources = files(
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
\ No newline at end of file
+includes += include_directories('include/')
drivers/net/sxe/pf/rte_pmd_sxe.h new file +14 -0
new file mode 100644
index 0000000000..64c1140490
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __PMD_SXE_H__
+#define __PMD_SXE_H__
+
+typedef uint8_t		u8;
+typedef uint16_t	u16;
+typedef uint32_t	u32;
+typedef int32_t		s32;
+
+s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+#endif
drivers/net/sxe/pf/sxe.h +1 -0
index c839e297a6..8e76a1f931 100644
@@ -44,6 +44,7 @@ struct sxe_adapter {
 
 	struct sxe_irq_context irq_ctxt;
 
+	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
 };
 
drivers/net/sxe/pf/sxe_ethdev.c +202 -0

276 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.c +258 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h +11 -0
index e0834aff2d..b2c5692932 100644
@@ -35,7 +35,18 @@ void sxe_event_irq_delayed_handler(void *param);
 
 void sxe_irq_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_irq_configure(struct rte_eth_dev *dev);
+
+void sxe_irq_enable(struct rte_eth_dev *eth_dev);
+
+void sxe_irq_disable(struct rte_eth_dev *eth_dev);
+
 void sxe_irq_uninit(struct rte_eth_dev *eth_dev);
 
+s32 sxe_rx_queue_intr_enable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+s32 sxe_rx_queue_intr_disable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+void sxe_irq_vec_free(struct rte_intr_handle *handle);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +7 -0
index 1701d75571..4761e721ca 100644
@@ -20,9 +20,11 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_STARS, SXE_DEV_ID_ASIC) },
@@ -164,10 +166,15 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 {
 	s32 ret;
 
+	/* Rx DBU off */
+	sxe_hw_rx_cap_switch_off(hw);
+
 	sxe_hw_all_irq_disable(hw);
 
 	sxe_hw_pending_irq_read_clear(hw);
 
+	sxe_hw_all_ring_disable(hw, SXE_HW_TXRX_RING_NUM_MAX);
+
 	ret = sxe_mng_reset(hw, false);
 	if (ret) {
 		PMD_LOG_ERR(INIT, "mng reset disable failed, ret=%d", ret);
drivers/net/sxe/pf/sxe_offload.c new file +39 -0
new file mode 100644
index 0000000000..7049efe606
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#include "sxe_dpdk_version.h"
+#include <ethdev_driver.h>
+
+#include "sxe.h"
+#include "sxe_offload.h"
+#include "sxe_logs.h"
+#include "sxe_compat_version.h"
+#include "sxe_queue_common.h"
+#include "sxe_offload_common.h"
+
+#define SXE_4_BIT_WIDTH  (CHAR_BIT / 2)
+#define SXE_4_BIT_MASK   RTE_LEN2MASK(SXE_4_BIT_WIDTH, u8)
+#define SXE_8_BIT_WIDTH  CHAR_BIT
+#define SXE_8_BIT_MASK   UINT8_MAX
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_queue_offload_capa_get(dev);
+}
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_port_offload_capa_get(dev);
+}
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	RTE_SET_USED(dev);
+
+	return 0;
+}
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_tx_port_offload_capa_get(dev);
+}
drivers/net/sxe/pf/sxe_offload.h new file +18 -0
new file mode 100644
index 0000000000..a70d6bf94b
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_H__
+#define __SXE_OFFLOAD_H__
+
+#include "sxe_hw.h"
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/pf/sxe_queue.c new file +776 -0

479 lines not on this page · raw message

drivers/net/sxe/pf/sxe_queue.h new file +133 -0

133 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.c new file +1491 -0

1,491 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.h new file +194 -0

194 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.c new file +1072 -0

1,072 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.h new file +50 -0

50 lines not on this page · raw message

drivers/net/sxe/rte_pmd_sxe_version.map new file +5 -0
new file mode 100644
index 0000000000..1a25862ca2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#84 lore raw

PATCH v6 4/14 net/sxe: add link, flow ctrl, mac ops, mtu ops function

In reply to Jie Liu

Add link, flow ctrl, mac ops, mtu ops function.

---
 drivers/net/sxe/meson.build        |   3 +
 drivers/net/sxe/pf/sxe.h           |  13 +-
 drivers/net/sxe/pf/sxe_ethdev.c    | 443 +++++++++++++-
 drivers/net/sxe/pf/sxe_filter.c    | 279 +++++++++
 drivers/net/sxe/pf/sxe_filter.h    |  53 ++
 drivers/net/sxe/pf/sxe_flow_ctrl.c |  98 +++
 drivers/net/sxe/pf/sxe_flow_ctrl.h |  16 +
 drivers/net/sxe/pf/sxe_irq.c       | 146 ++++-
 drivers/net/sxe/pf/sxe_main.c      |   2 +
 drivers/net/sxe/pf/sxe_phy.c       | 932 +++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_phy.h       |  77 +++
 11 files changed, 2050 insertions(+), 12 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_filter.c
 create mode 100644 drivers/net/sxe/pf/sxe_filter.h
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.c
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.h
 create mode 100644 drivers/net/sxe/pf/sxe_phy.c
drivers/net/sxe/meson.build +3 -0
index 2af37bce4c..5ec2c3b843 100644
@@ -9,6 +9,8 @@ cflags += ['-DSXE_HOST_DRIVER']
 deps += ['hash']
 sources = files(
         'pf/sxe_main.c',
+	'pf/sxe_filter.c',
+        'pf/sxe_flow_ctrl.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
@@ -16,6 +18,7 @@ sources = files(
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'pf/sxe_phy.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/sxe.h +11 -2
index 8e76a1f931..8f0037ebb0 100644
@@ -21,8 +21,6 @@ struct sxe_hw;
 #define PCI_VENDOR_ID_STARS	  0x1FF2
 #define SXE_DEV_ID_ASIC		  0x10a1
 
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-
 #ifdef RTE_PMD_PACKET_PREFETCH
 #define rte_packet_prefetch(p)  rte_prefetch1(p)
 #else
@@ -43,9 +41,20 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
+
+	u32 mtu;
+
+	RTE_ATOMIC(bool) link_thread_running;
+	RTE_ATOMIC(bool) is_stopping;
+	rte_thread_t link_thread_tid;
+	rte_atomic32_t link_thread_running;
+	rte_atomic32_t is_stopping;
+	pthread_t link_thread_tid;
+	bool is_stopped;
 };
 
 s32 sxe_hw_reset(struct sxe_hw *hw);
drivers/net/sxe/pf/sxe_ethdev.c +437 -6

606 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.c new file +279 -0

279 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h new file +53 -0

53 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.c new file +98 -0

98 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.h new file +16 -0
new file mode 100644
index 0000000000..fb124b11bd
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_FLOW_CTRL_H__
+#define __SXE_FLOW_CTRL_H__
+
+s32 sxe_flow_ctrl_enable(struct rte_eth_dev *dev);
+
+s32 sxe_flow_ctrl_get(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+s32 sxe_flow_ctrl_set(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+#endif
drivers/net/sxe/pf/sxe_irq.c +142 -4

181 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +2 -0
index 4761e721ca..22418bf1ec 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_fc_autoneg_localcap_set(hw);
+
 	hw->mac.auto_restart = true;
 	PMD_LOG_INFO(INIT, "auto_restart:%u.", hw->mac.auto_restart);
 }
drivers/net/sxe/pf/sxe_phy.c new file +932 -0

932 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h +77 -0

82 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#85 lore raw

PATCH v6 5/14 net/sxe: support vlan filter

In reply to Jie Liu

Support vlan filter.

---
 drivers/net/sxe/base/sxe_offload_common.c |   4 +
 drivers/net/sxe/pf/sxe.h                  |   5 +-
 drivers/net/sxe/pf/sxe_filter.c           | 277 ++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h           |  13 +
 drivers/net/sxe/pf/sxe_main.c             |   2 +
 5 files changed, 300 insertions(+), 1 deletion(-)
drivers/net/sxe/base/sxe_offload_common.c +4 -0
index 48677863d7..cc35c16ddf 100644
@@ -14,6 +14,8 @@ u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
 
 	u64 offloads = 0;
 
+	offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
 	return offloads;
 }
 
@@ -28,6 +30,8 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 #ifdef DEV_RX_JUMBO_FRAME
 		   DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
+			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
 		   RTE_ETH_RX_OFFLOAD_SCATTER;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
drivers/net/sxe/pf/sxe.h +4 -1
index 8f0037ebb0..2936fbfbe2 100644
@@ -6,7 +6,7 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-
+#include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
 #include "sxe_irq.h"
@@ -14,6 +14,7 @@
 #include "sxe_hw.h"
 
 struct sxe_hw;
+struct sxe_vlan_context;
 
 #define SXE_LPBK_DISABLED   0x0
 #define SXE_LPBK_ENABLED	0x1
@@ -41,6 +42,8 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+
+	struct sxe_vlan_context vlan_ctxt;
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +277 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +13 -0
index 0f21f1ca81..a64b68374d 100644
@@ -44,10 +44,23 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
+
+s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
+			enum rte_vlan_type vlan_type, u16 tpid);
+
+s32 sxe_vlan_offload_set(struct rte_eth_dev *dev, s32 vlan_mask);
+
+void sxe_vlan_strip_queue_set(struct rte_eth_dev *dev, u16 queue, s32 on);
+
+void sxe_vlan_filter_configure(struct rte_eth_dev *dev);
+
 s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
 
+void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
+
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 22418bf1ec..cc3145c09b 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_hw_vlan_filter_array_clear(hw);
+
 	sxe_fc_autoneg_localcap_set(hw);
 
 	hw->mac.auto_restart = true;
Signature · 1 line
2.18.4
author
#86 lore raw

PATCH v6 6/14 net/sxe: add filter function

In reply to Jie Liu

Add filter function.

---
 drivers/net/sxe/pf/sxe.h        |   4 +
 drivers/net/sxe/pf/sxe_filter.c | 191 ++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h |  29 +++++
 drivers/net/sxe/pf/sxe_main.c   |   1 +
 4 files changed, 225 insertions(+)
drivers/net/sxe/pf/sxe.h +4 -0
index 2936fbfbe2..660c0ab8b5 100644
@@ -44,6 +44,10 @@ struct sxe_adapter {
 	struct sxe_irq_context irq_ctxt;
 
 	struct sxe_vlan_context vlan_ctxt;
+	struct sxe_mac_filter_context mac_filter_ctxt;
+#ifdef RTE_ADAPTER_HAVE_FNAV_CONF
+	struct rte_eth_fdir_conf fnav_conf;
+#endif
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +191 -0

203 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +29 -0
index a64b68374d..da40c75d84 100644
@@ -19,6 +19,27 @@ struct sxe_adapter;
 		RTE_ALIGN((SXE_HW_TXRX_RING_NUM_MAX / (sizeof(u32) * BYTE_BIT_NUM)), \
 		sizeof(u32))
 
+struct sxe_vlan_context {
+	u32 vlan_hash_table[SXE_VFT_TBL_SIZE];
+	u32 strip_bitmap[SXE_VLAN_STRIP_BITMAP_SIZE];
+	u32  vlan_table_size;
+};
+
+enum sxe_uc_addr_src_type {
+	SXE_PF = 0,
+	SXE_VF,
+	SXE_VF_MACVLAN
+};
+
+struct sxe_uc_addr_table {
+	u8 rar_idx;
+	u8 pool_idx;
+	u8 type;
+	u8 original_index;
+	bool used;
+	u8 addr[SXE_MAC_ADDR_LEN];
+};
+
 struct sxe_mac_filter_context {
 	struct rte_ether_addr def_mac_addr;
 	struct rte_ether_addr cur_mac_addr;
@@ -35,6 +56,14 @@ struct sxe_mac_filter_context {
 
 s32 sxe_mac_addr_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_promiscuous_enable(struct rte_eth_dev *dev);
+
+s32 sxe_promiscuous_disable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_enable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_disable(struct rte_eth_dev *dev);
+
 s32 sxe_mac_addr_add(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr,
 				 u32 rar_idx, u32 pool);
drivers/net/sxe/pf/sxe_main.c +1 -0
index cc3145c09b..700934b378 100644
@@ -195,6 +195,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 		goto l_end;
 	}
 
+	sxe_hw_uc_addr_clear(hw);
 l_end:
 	return ret;
 }
Signature · 1 line
2.18.4
author
#87 lore raw

PATCH v6 7/14 net/sxe: support rss offload

In reply to Jie Liu

Support rss offload.

---
 drivers/net/sxe/base/sxe_offload_common.c |  11 +-
 drivers/net/sxe/pf/sxe.h                  |   2 +-
 drivers/net/sxe/pf/sxe_offload.c          | 300 +++++++++++++++++++++-
 drivers/net/sxe/pf/sxe_offload.h          |  33 +++
 4 files changed, 339 insertions(+), 7 deletions(-)
drivers/net/sxe/base/sxe_offload_common.c +6 -5
index cc35c16ddf..f87cce67a5 100644
@@ -24,15 +24,16 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 	u64 rx_offload_capa;
 
 	rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
-		   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
+			RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
 #ifdef DEV_RX_JUMBO_FRAME
-		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+			DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
 			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
 			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
-		   RTE_ETH_RX_OFFLOAD_SCATTER;
+			RTE_ETH_RX_OFFLOAD_SCATTER |
+			RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
 		rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
drivers/net/sxe/pf/sxe.h +1 -1
index 660c0ab8b5..2199653e91 100644
@@ -54,7 +54,7 @@ struct sxe_adapter {
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
-
+	bool rss_reta_updated;
 	RTE_ATOMIC(bool) link_thread_running;
 	RTE_ATOMIC(bool) is_stopping;
 	rte_thread_t link_thread_tid;
drivers/net/sxe/pf/sxe_offload.c +299 -1

320 lines not on this page · raw message

drivers/net/sxe/pf/sxe_offload.h +33 -0
index a70d6bf94b..458b6464c5 100644
@@ -7,6 +7,21 @@
 
 #include "sxe_hw.h"
 
+#define SXE_RSS_OFFLOAD_ALL ( \
+		RTE_ETH_RSS_IPV4 | \
+		RTE_ETH_RSS_NONFRAG_IPV4_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
+		RTE_ETH_RSS_IPV6 | \
+		RTE_ETH_RSS_NONFRAG_IPV6_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV6_UDP)
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_FILTER_CTRL
+u8 *sxe_rss_hash_key_get(void);
+#endif
+
+void sxe_rss_hash_set(struct sxe_hw *hw,
+				struct rte_eth_rss_conf *rss_conf);
+
 u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
@@ -15,4 +30,22 @@ u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
 
+void sxe_rss_disable(struct rte_eth_dev *dev);
+
+void sxe_rss_configure(struct rte_eth_dev *dev);
+
+s32 sxe_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			u16 reta_size);
+
+s32 sxe_rss_reta_query(struct rte_eth_dev *dev,
+			 struct rte_eth_rss_reta_entry64 *reta_conf,
+			 u16 reta_size);
+
+s32 sxe_rss_hash_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_conf *rss_conf);
+
+s32 sxe_rss_hash_conf_get(struct rte_eth_dev *dev,
+				struct rte_eth_rss_conf *rss_conf);
+
 #endif
Signature · 1 line
2.18.4
author
#88 lore raw

PATCH v6 8/14 net/sxe: add dcb function

In reply to Jie Liu

Add dcb function.

---
 drivers/net/sxe/meson.build             |   1 +
 drivers/net/sxe/pf/rte_pmd_sxe.h        |   2 +
 drivers/net/sxe/pf/sxe.h                |   2 +
 drivers/net/sxe/pf/sxe_dcb.c            | 946 ++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_dcb.h            |  99 +++
 drivers/net/sxe/pf/sxe_main.c           |   1 +
 drivers/net/sxe/pf/sxe_phy.c            |  34 +
 drivers/net/sxe/pf/sxe_phy.h            |   2 +
 drivers/net/sxe/pf/sxe_rx.c             |   1 -
 drivers/net/sxe/rte_pmd_sxe_version.map |   1 +
 10 files changed, 1088 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.c
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.h
drivers/net/sxe/meson.build +1 -0
index 5ec2c3b843..2f528efe19 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/rte_pmd_sxe.h +2 -0
index 64c1140490..16406c6c26 100644
@@ -11,4 +11,6 @@ typedef uint32_t	u32;
 typedef int32_t		s32;
 
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+
+s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
 #endif
drivers/net/sxe/pf/sxe.h +2 -0
index 2199653e91..6ac0dba24e 100644
@@ -11,6 +11,7 @@
 #include "sxe_types.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
+#include "sxe_dcb.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -49,6 +50,7 @@ struct sxe_adapter {
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
drivers/net/sxe/pf/sxe_dcb.c new file +946 -0

946 lines not on this page · raw message

drivers/net/sxe/pf/sxe_dcb.h new file +99 -0

99 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +1 -0
index 700934b378..6fc4a41703 100644
@@ -203,6 +203,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
 
drivers/net/sxe/pf/sxe_phy.c +34 -0
index 7d3c22f85a..787b16fb47 100644
@@ -737,6 +737,40 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter)
 	return ret;
 }
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx)
+{
+	s32 ret;
+	struct sxe_hw *hw = &adapter->hw;
+
+	if (!hw->fc.pause_time) {
+		LOG_ERROR_BDF("link fc disabled since pause time is 0");
+		ret = -SXE_ERR_INVALID_LINK_SETTINGS;
+		goto l_ret;
+	}
+
+	if (hw->fc.current_mode & SXE_FC_TX_PAUSE) {
+		if (!hw->fc.high_water[tc_idx] || !hw->fc.low_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+
+		if (hw->fc.low_water[tc_idx] >= hw->fc.high_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+	}
+
+	sxe_fc_autoneg(adapter);
+
+	ret = sxe_hw_pfc_enable(hw, tc_idx);
+	if (ret)
+		PMD_LOG_ERR(INIT, "link fc enable failed, ret=%d", ret);
+
+l_ret:
+	return ret;
+}
 s32 sxe_sfp_identify(struct sxe_adapter *adapter)
 {
 	s32 ret;
drivers/net/sxe/pf/sxe_phy.h +2 -0
index a3d7dbf85b..9fd2746ec8 100644
@@ -105,6 +105,8 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter);
 
 void sxe_link_info_get(struct sxe_adapter *adapter, u32 *link_speed, bool *link_up);
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx);
+
 void sxe_sfp_link_capabilities_get(struct sxe_adapter *adapter, u32 *speed,
 							bool *autoneg);
 
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 48e7393840..65cfcca4c9 100644
@@ -10,7 +10,6 @@
 #include <rte_atomic.h>
 #include <ethdev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "sxe.h"
 #include "sxe_rx.h"
 #include "sxe_logs.h"
drivers/net/sxe/rte_pmd_sxe_version.map +1 -0
index 1a25862ca2..4b871872d6 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
     global:
     rte_pmd_sxe_tx_loopback_set;
+    rte_pmd_sxe_tc_bw_set;
     local: *;
 };
Signature · 1 line
2.18.4
author
#89 lore raw

PATCH v6 9/14 net/sxe: support ptp

In reply to Jie Liu

Add ptp module.

---
 drivers/net/sxe/meson.build  |   1 +
 drivers/net/sxe/pf/sxe.h     |   9 ++
 drivers/net/sxe/pf/sxe_ptp.c | 209 +++++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_ptp.h |  26 +++++
 4 files changed, 245 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.c
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.h
drivers/net/sxe/meson.build +1 -0
index 2f528efe19..5bd44f3f65 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_ptp.c',
         'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
drivers/net/sxe/pf/sxe.h +9 -0
index 6ac0dba24e..d92540ac97 100644
@@ -39,6 +39,14 @@ struct sxe_vlan_context;
 #define rte_sxe_prefetch(p)   do {} while (0)
 #endif
 
+struct sxe_ptp_context {
+	struct rte_timecounter	  systime_tc;
+	struct rte_timecounter	  rx_tstamp_tc;
+	struct rte_timecounter	  tx_tstamp_tc;
+	u32 tx_hwtstamp_sec;
+	u32 tx_hwtstamp_nsec;
+};
+
 struct sxe_adapter {
 	struct sxe_hw hw;
 
@@ -49,6 +57,7 @@ struct sxe_adapter {
 #ifdef RTE_ADAPTER_HAVE_FNAV_CONF
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
+	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_ptp.c new file +209 -0

209 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ptp.h new file +26 -0
new file mode 100644
index 0000000000..14971b2d50
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_PTP_H__
+#define __SXE_PTP_H__
+
+s32 sxe_timesync_enable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_disable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp,
+				 u32 flags __rte_unused);
+
+s32 sxe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp);
+
+s32 sxe_timesync_adjust_time(struct rte_eth_dev *dev, s64 delta);
+
+s32 sxe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts);
+
+s32 sxe_timesync_write_time(struct rte_eth_dev *dev,
+					const struct timespec *ts);
+
+#endif
Signature · 1 line
2.18.4
author
#90 lore raw

PATCH v6 10/14 net/sxe: add xstats function

In reply to Jie Liu

Add xstats function.

---
 drivers/net/sxe/meson.build    |   1 +
 drivers/net/sxe/pf/sxe.h       |   2 +
 drivers/net/sxe/pf/sxe_main.c  |   2 +
 drivers/net/sxe/pf/sxe_stats.c | 577 +++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_stats.h |  71 ++++
 5 files changed, 653 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_stats.c
 create mode 100644 drivers/net/sxe/pf/sxe_stats.h
drivers/net/sxe/meson.build +1 -0
index 5bd44f3f65..b06cc4c1fe 100644
@@ -17,6 +17,7 @@ sources = files(
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
+	'pf/sxe_stats.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
         'pf/sxe_ptp.c',
drivers/net/sxe/pf/sxe.h +2 -0
index d92540ac97..6a1f90f4a5 100644
@@ -9,6 +9,7 @@
 #include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
+#include "sxe_stats.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
 #include "sxe_dcb.h"
@@ -59,6 +60,7 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_main.c +2 -0
index 6fc4a41703..bbee8035d6 100644
@@ -203,6 +203,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+
+	sxe_hw_stats_regs_clean(hw);
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/pf/sxe_stats.c new file +577 -0

577 lines not on this page · raw message

drivers/net/sxe/pf/sxe_stats.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#91 lore raw

PATCH v6 11/14 net/sxe: add custom cmd led ctrl

In reply to Jie Liu

Add custom cmd led ctrl.

---
 drivers/net/sxe/include/sxe/sxe_cli.h   | 218 ++++++++++++++++++++++++
 drivers/net/sxe/include/sxe/sxe_ioctl.h |  21 +++
 drivers/net/sxe/meson.build             |   2 +
 drivers/net/sxe/pf/sxe_main.c           |   3 +
 drivers/net/sxe/sxe_testpmd.c           |  65 +++++++
 5 files changed, 309 insertions(+)
 create mode 100644 drivers/net/sxe/include/sxe/sxe_cli.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_ioctl.h
 create mode 100644 drivers/net/sxe/sxe_testpmd.c
drivers/net/sxe/include/sxe/sxe_cli.h new file +218 -0
new file mode 100644
index 0000000000..623347dab2
@@ -0,0 +1,218 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_CLI_H__
+#define __SXE_CLI_H__
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+#define SXE_VERSION_LEN				  (32)
+#define SXE_MAC_NUM					 (128)
+#define SXE_PORT_TRANSCEIVER_LEN		(32)
+#define SXE_PORT_VENDOR_LEN			 (32)
+#define SXE_CHIP_TYPE_LEN			   (32)
+#define SXE_VPD_SN_LEN				  (16)
+#define SXE_SOC_RST_TIME				(0x93A80)
+#define SXE_SFP_TEMP_THRESHOLD_INTERVAL (3)
+#define MGC_TERMLOG_INFO_MAX_LEN		(12 * 1024)
+#define SXE_REGS_DUMP_MAX_LEN		   (12 * 1024)
+#define SXE_PRODUCT_NAME_LEN		(32)
+
+typedef enum sxe_led_mode {
+	SXE_IDENTIFY_LED_BLINK_ON   = 0,
+	SXE_IDENTIFY_LED_BLINK_OFF,
+	SXE_IDENTIFY_LED_ON,
+	SXE_IDENTIFY_LED_OFF,
+	SXE_IDENTIFY_LED_RESET,
+} sxe_led_mode_s;
+
+typedef struct sxe_led_ctrl {
+	U32	mode;
+	U32	duration;
+
+} sxe_led_ctrl_s;
+
+typedef struct sxe_led_ctrl_resp {
+	U32	ack;
+} sxe_led_ctrl_resp_s;
+
+typedef enum port_link_speed {
+	PORT_LINK_NO			= 0,
+	PORT_LINK_100M		  = 1,
+	PORT_LINK_1G			= 2,
+	PORT_LINK_10G		   = 3,
+} port_link_speed_e;
+
+typedef struct sys_soc_info {
+	S8	 fw_ver[SXE_VERSION_LEN];
+	S8	 opt_ver[SXE_VERSION_LEN];
+	U8	 soc_status;
+	U8	 pad[3];
+	S32	soc_temp;
+	U64	chipid;
+	S8	 chip_type[SXE_CHIP_TYPE_LEN];
+	S8	 pba[SXE_VPD_SN_LEN];
+	S8	 product_name[SXE_PRODUCT_NAME_LEN];
+} sys_soc_info_s;
+
+typedef struct sys_port_info {
+	U64	mac[SXE_MAC_NUM];
+	U8	 is_port_abs;
+	U8	 link_stat;
+	U8	 link_speed;
+
+
+	U8	 is_sfp:1;
+	U8	 is_get_info:1;
+	U8	 rvd:6;
+	S8	 optical_mod_temp;
+	U8	 pad[3];
+	S8	 transceiver_type[SXE_PORT_TRANSCEIVER_LEN];
+	S8	 vendor_name[SXE_PORT_VENDOR_LEN];
+	S8	 vendor_pn[SXE_PORT_VENDOR_LEN];
+} sys_port_info_s;
+
+typedef struct sys_info_resp {
+	sys_soc_info_s	 soc_info;
+	sys_port_info_s	port_info;
+} sys_info_resp_s;
+
+typedef enum sfp_temp_td_mode {
+	SFP_TEMP_THRESHOLD_MODE_ALARM   = 0,
+	SFP_TEMP_THRESHOLD_MODE_WARN,
+} sfp_temp_td_mode_e;
+
+typedef struct sfp_temp_td_set {
+	U8	 mode;
+	U8	 pad[3];
+	S8	 hthreshold;
+	S8	 lthreshold;
+} sfp_temp_td_set_s;
+
+typedef struct sxe_log_export_resp {
+	U16	cur_log_len;
+	U8	 is_end;
+	U8	 pad;
+	S32	session_id;
+	S8	 data[0];
+} sxe_log_export_resp_s;
+
+typedef enum sxe_log_export_type  {
+	SXE_LOG_EXPORT_REQ	= 0,
+	SXE_LOG_EXPORT_FIN,
+	SXE_LOG_EXPORT_ABORT,
+} sxe_log_export_type_e;
+
+typedef struct sxe_log_export_req {
+	U8	 is_all_log;
+	U8	 cmdtype;
+	U8	 is_begin;
+	U8	 pad;
+	S32	session_id;
+	U32	log_len;
+} sxe_log_export_req_s;
+
+typedef struct soc_rst_req {
+	U32	time;
+} soc_rst_req_s;
+
+typedef struct regs_dump_resp {
+	U32	curdw_len;
+	U8	 data[0];
+} regs_dump_resp_s;
+
+enum {
+	SXE_MFG_PART_NUMBER_LEN   = 8,
+	SXE_MFG_SERIAL_NUMBER_LEN = 16,
+	SXE_MFG_REVISION_LEN	  = 4,
+	SXE_MFG_OEM_STR_LEN	   = 64,
+	SXE_MFG_SXE_BOARD_ASSEMBLY_LEN  = 32,
+	SXE_MFG_SXE_BOARD_TRACE_NUM_LEN = 16,
+	SXE_MFG_SXE_MAC_ADDR_CNT		= 2,
+};
+
+typedef struct sxe_mfg_info {
+	U8 part_number[SXE_MFG_PART_NUMBER_LEN];
+	U8 serial_number[SXE_MFG_SERIAL_NUMBER_LEN];
+	U32 mfg_date;
+	U8 revision[SXE_MFG_REVISION_LEN];
+	U32 rework_date;
+	U8 pad[4];
+	U64 mac_addr[SXE_MFG_SXE_MAC_ADDR_CNT];
+	U8 board_trace_num[SXE_MFG_SXE_BOARD_TRACE_NUM_LEN];
+	U8 board_assembly[SXE_MFG_SXE_BOARD_ASSEMBLY_LEN];
+	U8 extra1[SXE_MFG_OEM_STR_LEN];
+	U8 extra2[SXE_MFG_OEM_STR_LEN];
+} sxe_mfg_info_t;
+
+typedef struct sxe_lldp_info {
+	U8	  lldp_state;
+	U8	  pad[3];
+} sxe_lldp_info_t;
+
+typedef struct regs_dump_req {
+	U32	base_addr;
+	U32	dw_len;
+} regs_dump_req_s;
+
+typedef enum sxe_pcs_mode {
+	SXE_PCS_MODE_1000BASE_KX_WO = 0,
+	SXE_PCS_MODE_1000BASE_KX_W,
+	SXE_PCS_MODE_SGMII,
+	SXE_PCS_MODE_10GBASE_KR_WO,
+	SXE_PCS_MODE_AUTO_NEGT_73,
+	SXE_PCS_MODE_LPBK_PHY_TX2RX,
+	SXE_PCS_MODE_LPBK_PHY_RX2TX,
+	SXE_PCS_MODE_LPBK_PCS_RX2TX,
+	SXE_PCS_MODE_BUTT,
+} sxe_pcs_mode_e;
+
+typedef enum sxe_remote_fault_mode {
+	SXE_REMOTE_FALUT_NO_ERROR		= 0,
+	SXE_REMOTE_FALUT_OFFLINE,
+	SXE_REMOTE_FALUT_LINK_FAILURE,
+	SXE_REMOTE_FALUT_AUTO_NEGOTIATION,
+	SXE_REMOTE_UNKNOWN,
+} sxe_remote_fault_e;
+
+typedef struct sxe_phy_cfg {
+	sxe_pcs_mode_e mode;
+	U32 mtu;
+} sxe_pcs_cfg_s;
+
+typedef enum sxe_an_speed {
+	SXE_AN_SPEED_NO_LINK = 0,
+	SXE_AN_SPEED_100M,
+	SXE_AN_SPEED_1G,
+	SXE_AN_SPEED_10G,
+	SXE_AN_SPEED_UNKNOWN,
+} sxe_an_speed_e;
+
+typedef enum sxe_phy_pause_cap {
+	SXE_PAUSE_CAP_NO_PAUSE	= 0,
+	SXE_PAUSE_CAP_ASYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_SYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_BOTH_PAUSE,
+	SXE_PAUSE_CAP_UNKNOWN,
+} sxe_phy_pause_cap_e;
+
+typedef enum sxe_phy_duplex_type {
+	SXE_FULL_DUPLEX	= 0,
+	SXE_HALF_DUPLEX	= 1,
+	SXE_UNKNOWN_DUPLEX,
+} sxe_phy_duplex_type_e;
+
+typedef struct sxe_phy_an_cap {
+	sxe_remote_fault_e   remote_fault;
+	sxe_phy_pause_cap_e  pause_cap;
+	sxe_phy_duplex_type_e duplex_cap;
+} sxe_phy_an_cap_s;
+
+typedef struct sxe_an_cap {
+	sxe_phy_an_cap_s local;
+	sxe_phy_an_cap_s peer;
+} sxe_an_cap_s;
+#endif
drivers/net/sxe/include/sxe/sxe_ioctl.h new file +21 -0
new file mode 100644
index 0000000000..4a4b0bc304
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef _SXE_IOCTL_H_
+#define _SXE_IOCTL_H_
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+struct sxe_ioctl_sync_cmd {
+	U64   traceid;
+	void *in_data;
+	U32   in_len;
+	void *out_data;
+	U32   out_len;
+};
+
+#define SXE_CMD_IOCTL_SYNC_CMD _IOWR('M', 1, struct sxe_ioctl_sync_cmd)
+
+#endif
drivers/net/sxe/meson.build +2 -0
index b06cc4c1fe..4ecf29ba6b 100644
@@ -30,6 +30,8 @@ sources = files(
         'base/sxe_hw.c',
 )
 
+testpmd_sources = files('sxe_testpmd.c')
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe_main.c +3 -0
index bbee8035d6..85bd87d495 100644
@@ -205,6 +205,9 @@ void sxe_hw_start(struct sxe_hw *hw)
 	sxe_hw_vlan_filter_array_clear(hw);
 
 	sxe_hw_stats_regs_clean(hw);
+
+	sxe_hw_no_snoop_disable(hw);
+
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/sxe_testpmd.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#92 lore raw

PATCH v6 12/14 net/sxe: add simd function

In reply to Jie Liu

Add simd function.

---
 drivers/net/sxe/base/sxe_queue_common.c |  52 +-
 drivers/net/sxe/base/sxe_rx_common.c    | 125 ++++-
 drivers/net/sxe/meson.build             |   9 +
 drivers/net/sxe/pf/sxe.h                |   3 +
 drivers/net/sxe/pf/sxe_vec_common.h     | 315 ++++++++++++
 drivers/net/sxe/pf/sxe_vec_neon.c       | 603 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vec_sse.c        | 625 ++++++++++++++++++++++++
 7 files changed, 1725 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_vec_common.h
 create mode 100644 drivers/net/sxe/pf/sxe_vec_neon.c
 create mode 100644 drivers/net/sxe/pf/sxe_vec_sse.c
drivers/net/sxe/base/sxe_queue_common.c +51 -1
index 2c08e24b43..978e56e98b 100644
@@ -14,6 +14,10 @@
 #include "sxe_logs.h"
 #include "sxe_regs.h"
 #include "sxe.h"
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+#include "sxe_vec_common.h"
+#include <rte_vect.h>
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
@@ -58,6 +62,10 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 	u16 len;
 	u64 offloads;
 	s32 ret = 0;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *pf_adapter = dev->data->dev_private;
+	struct sxevf_adapter *vf_adapter = dev->data->dev_private;
+#endif
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -162,6 +170,23 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 				"dma_addr=0x%" SXE_PRIX64,
 			 rxq->buffer_ring, rxq->sc_buffer_ring, rxq->desc_ring,
 			 rxq->base_addr);
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (!rte_is_power_of_2(desc_num)) {
+		PMD_LOG_DEBUG(INIT, "queue[%d] doesn't meet Vector Rx "
+					"preconditions - canceling the feature for "
+					"the whole port[%d]",
+				 rxq->queue_id, rxq->port_id);
+		if (is_vf)
+			vf_adapter->rx_vec_allowed = false;
+		else
+			pf_adapter->rx_vec_allowed = false;
+
+	} else {
+		sxe_rxq_vec_setup(rxq);
+	}
+#endif
+
 	dev->data->rx_queues[queue_idx] = rxq;
 
 	sxe_rx_queue_init(*rx_setup->rx_batch_alloc_allowed, rxq);
@@ -255,6 +280,9 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 		struct rte_eth_recycle_rxq_info *q_info)
 {
 	struct sxe_rx_queue *rxq;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *adapter = dev->data->dev_private;
+#endif
 
 	rxq = dev->data->rx_queues[queue_id];
 
@@ -262,9 +290,21 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
-
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (adapter->rx_vec_allowed) {
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
+		q_info->refill_requirement = rxq->realloc_num;
+		q_info->refill_head = &rxq->realloc_start;
+#endif
+	} else {
+		q_info->refill_requirement = rxq->batch_alloc_size;
+		q_info->refill_head = &rxq->batch_alloc_trigger;
+	}
+#else
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
+#endif
+	return;
 }
 
 void __sxe_tx_queue_info_get(struct rte_eth_dev *dev, u16 queue_id,
@@ -290,7 +330,17 @@ s32 __sxe_tx_done_cleanup(void *tx_queue, u32 free_cnt)
 	struct sxe_tx_queue *txq = (struct sxe_tx_queue *)tx_queue;
 	if (txq->offloads == 0 &&
 		txq->rs_thresh >= RTE_PMD_SXE_MAX_TX_BURST) {
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
+			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
+			txq->buffer_ring_vec != NULL)) {
+			ret = sxe_tx_done_cleanup_vec(txq, free_cnt);
+		} else {
+			ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+		}
+#else
 		ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+#endif
 
 	} else {
 		ret = sxe_tx_done_cleanup_full(txq, free_cnt);
drivers/net/sxe/base/sxe_rx_common.c +119 -6

181 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -0
index 4ecf29ba6b..f53ca7ecaf 100644
@@ -2,6 +2,9 @@
 # Copyright (C), 2022, Linkdata Technology Co., Ltd.
 cflags += ['-DSXE_DPDK']
 cflags += ['-DSXE_HOST_DRIVER']
+cflags += ['-DSXE_DPDK_L4_FEATURES']
+cflags += ['-DSXE_DPDK_SRIOV']
+cflags += ['-DSXE_DPDK_SIMD']
 
 #subdir('base')
 #objs = [base_objs]
@@ -32,6 +35,12 @@ sources = files(
 
 testpmd_sources = files('sxe_testpmd.c')
 
+if arch_subdir == 'x86'
+	sources += files('pf/sxe_vec_sse.c')
+elif arch_subdir == 'arm'
+	sources += files('pf/sxe_vec_neon.c')
+endif
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe.h +3 -0
index 6a1f90f4a5..1b24a9b9e7 100644
@@ -64,6 +64,9 @@ struct sxe_adapter {
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	bool rx_vec_allowed;
+#endif
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
drivers/net/sxe/pf/sxe_vec_common.h new file +315 -0

315 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_neon.c new file +603 -0

603 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_sse.c new file +625 -0

625 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#93 lore raw

PATCH v6 13/14 net/sxe: add virtual function

In reply to Jie Liu

Add virtual function.

---
 drivers/net/sxe/base/sxe_queue_common.c |    4 +
 drivers/net/sxe/base/sxevf_hw.c         |  951 +++++++++++++++
 drivers/net/sxe/base/sxevf_hw.h         |  349 ++++++
 drivers/net/sxe/base/sxevf_regs.h       |  119 ++
 drivers/net/sxe/meson.build             |   37 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h        |    4 +-
 drivers/net/sxe/pf/sxe.h                |    5 +-
 drivers/net/sxe/pf/sxe_filter.c         |  177 +++
 drivers/net/sxe/pf/sxe_filter.h         |   15 +
 drivers/net/sxe/pf/sxe_main.c           |    2 +
 drivers/net/sxe/pf/sxe_phy.h            |    1 +
 drivers/net/sxe/pf/sxe_stats.c          |    9 +-
 drivers/net/sxe/pf/sxe_vf.c             | 1427 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vf.h             |  219 ++++
 drivers/net/sxe/sxe_testpmd.c           |  130 +++
 drivers/net/sxe/vf/sxevf.h              |   43 +
 drivers/net/sxe/vf/sxevf_ethdev.c       |  768 ++++++++++++
 drivers/net/sxe/vf/sxevf_ethdev.h       |   16 +
 drivers/net/sxe/vf/sxevf_filter.c       |  493 ++++++++
 drivers/net/sxe/vf/sxevf_filter.h       |   70 ++
 drivers/net/sxe/vf/sxevf_irq.c          |  434 +++++++
 drivers/net/sxe/vf/sxevf_irq.h          |   35 +
 drivers/net/sxe/vf/sxevf_main.c         |   83 ++
 drivers/net/sxe/vf/sxevf_msg.c          |  624 ++++++++++
 drivers/net/sxe/vf/sxevf_msg.h          |  201 ++++
 drivers/net/sxe/vf/sxevf_offload.c      |   31 +
 drivers/net/sxe/vf/sxevf_offload.h      |   16 +
 drivers/net/sxe/vf/sxevf_queue.c        |  210 ++++
 drivers/net/sxe/vf/sxevf_queue.h        |   70 ++
 drivers/net/sxe/vf/sxevf_rx.c           |  163 +++
 drivers/net/sxe/vf/sxevf_rx.h           |   18 +
 drivers/net/sxe/vf/sxevf_stats.c        |  162 +++
 drivers/net/sxe/vf/sxevf_stats.h        |   31 +
 drivers/net/sxe/vf/sxevf_tx.c           |   46 +
 drivers/net/sxe/vf/sxevf_tx.h           |   14 +
 35 files changed, 6958 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxevf_hw.c
 create mode 100644 drivers/net/sxe/base/sxevf_hw.h
 create mode 100644 drivers/net/sxe/base/sxevf_regs.h
 create mode 100644 drivers/net/sxe/pf/sxe_vf.c
 create mode 100644 drivers/net/sxe/pf/sxe_vf.h
 create mode 100644 drivers/net/sxe/vf/sxevf.h
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.c
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.h
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.c
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.h
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.c
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.h
 create mode 100644 drivers/net/sxe/vf/sxevf_main.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.h
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.c
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.h
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.c
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.h
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.h
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.c
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.h
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.h
drivers/net/sxe/base/sxe_queue_common.c +4 -0
index 978e56e98b..914718769f 100644
@@ -13,11 +13,15 @@
 #include "sxe_tx.h"
 #include "sxe_logs.h"
 #include "sxe_regs.h"
+#include "sxevf_regs.h"
 #include "sxe.h"
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include "sxe_vec_common.h"
 #include <rte_vect.h>
 #endif
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
+#include "sxevf.h"
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
drivers/net/sxe/base/sxevf_hw.c new file +951 -0

951 lines not on this page · raw message

drivers/net/sxe/base/sxevf_hw.h new file +349 -0

349 lines not on this page · raw message

drivers/net/sxe/base/sxevf_regs.h new file +119 -0

119 lines not on this page · raw message

drivers/net/sxe/meson.build +25 -12
index f53ca7ecaf..a3b874b7e2 100644
@@ -11,26 +11,38 @@ cflags += ['-DSXE_DPDK_SIMD']
 
 deps += ['hash']
 sources = files(
-        'pf/sxe_main.c',
+    'pf/sxe_main.c',
 	'pf/sxe_filter.c',
-        'pf/sxe_flow_ctrl.c',
-        'pf/sxe_irq.c',
-        'pf/sxe_ethdev.c',
+    'pf/sxe_flow_ctrl.c',
+    'pf/sxe_irq.c',
+    'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
 	'pf/sxe_stats.c',
-        'pf/sxe_pmd_hdc.c',
-        'pf/sxe_phy.c',
-        'pf/sxe_ptp.c',
-        'pf/sxe_dcb.c',
-        'base/sxe_queue_common.c',
+	'pf/sxe_pmd_hdc.c',
+    'pf/sxe_phy.c',
+    'pf/sxe_ptp.c',
+    'pf/sxe_vf.c',
+    'pf/sxe_dcb.c',
+    'vf/sxevf_main.c',
+	'vf/sxevf_filter.c',
+	'vf/sxevf_irq.c',
+	'vf/sxevf_msg.c',
+	'vf/sxevf_ethdev.c',
+	'vf/sxevf_stats.c',
+	'vf/sxevf_rx.c',
+	'vf/sxevf_tx.c',
+	'vf/sxevf_queue.c',
+	'vf/sxevf_offload.c',
+    'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
 	'base/sxe_offload_common.c',
-        'base/sxe_common.c',
-        'base/sxe_hw.c',
+    'base/sxe_common.c',
+    'base/sxe_hw.c',
+    'base/sxevf_hw.c',
 )
 
 testpmd_sources = files('sxe_testpmd.c')
@@ -43,5 +55,6 @@ endif
 
 includes += include_directories('base')
 includes += include_directories('pf')
+includes += include_directories('vf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
+includes += include_directories('include/')
\ No newline at end of file
drivers/net/sxe/pf/rte_pmd_sxe.h +3 -1
index 16406c6c26..69b0df2bd1 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #ifndef __PMD_SXE_H__
 #define __PMD_SXE_H__
 
@@ -13,4 +12,7 @@ typedef int32_t		s32;
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
 
 s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
+
+int rte_pmd_sxe_set_vf_rxmode(u16 port, u16 vf,
+u16 rx_mask, u8 on);
 #endif
drivers/net/sxe/pf/sxe.h +4 -1
index 1b24a9b9e7..212929cf04 100644
@@ -11,8 +11,9 @@
 #include "sxe_types.h"
 #include "sxe_stats.h"
 #include "sxe_irq.h"
-#include "sxe_phy.h"
+#include "sxe_vf.h"
 #include "sxe_dcb.h"
+#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -60,6 +61,8 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_virtual_context vt_ctxt;
+
 	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_filter.c +177 -0

202 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +15 -0
index da40c75d84..de6170a3f4 100644
@@ -73,6 +73,15 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_uc_hash_table_set(struct rte_eth_dev *dev,
+			struct rte_ether_addr *mac_addr, u8 on);
+
+s32 sxe_uc_all_hash_table_set(struct rte_eth_dev *dev, u8 on);
+
+s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
+			  struct rte_ether_addr *mc_addr_list,
+			  u32 nb_mc_addr);
+
 s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
 
 s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
@@ -92,4 +101,10 @@ void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
 
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
+u8 sxe_sw_uc_entry_vf_add(struct sxe_adapter *adapter,
+				u8 vf_idx, u8 *mac_addr, bool macvlan);
+
+void sxe_sw_uc_entry_vf_del(struct sxe_adapter *adapter, u8 vf_idx,
+					bool macvlan);
+
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 85bd87d495..49f9dd2f27 100644
@@ -20,10 +20,12 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_vf.h"
 #include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
drivers/net/sxe/pf/sxe_phy.h +1 -0
index 9fd2746ec8..d907b3c8f8 100644
@@ -6,6 +6,7 @@
 
 #include <rte_ethdev.h>
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_msg.h"
 
 #define SXE_SFF_BASE_ADDR			0x0
drivers/net/sxe/pf/sxe_stats.c +4 -5
index 6b9e1beb3e..af3c0bf84c 100644
@@ -219,10 +219,9 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	u8 prio;
 
 	cnt = SXE_XSTAT_CNT;
-	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt:%u "
-			"fc xstat field cnt:%u ", cnt,
-			SXE_XSTAT_MAC_CNT,
-			SXE_XSTAT_FC_CNT);
+	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
+			"fc xstat field cnt: %" SXE_PRIU64, cnt,
+			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -333,7 +332,7 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 
 	if (usr_cnt < SXE_XSTAT_CNT) {
 		ret = -SXE_ERR_PARAM;
-		PMD_LOG_ERR(DRV, "max:%u usr_cnt:%u invalid.(err:%d)",
+		PMD_LOG_ERR(DRV, "max: %" SXE_PRIU64 " usr_cnt:%u invalid.(err:%d)",
 				SXE_XSTAT_CNT, usr_cnt, ret);
 		goto l_out;
 	}
drivers/net/sxe/pf/sxe_vf.c new file +1427 -0

1,210 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vf.h new file +219 -0

219 lines not on this page · raw message

drivers/net/sxe/sxe_testpmd.c +130 -0

130 lines not on this page · raw message

drivers/net/sxe/vf/sxevf.h new file +43 -0

43 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.c new file +768 -0

768 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.h new file +16 -0
new file mode 100644
index 0000000000..57dfeea2e6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_filter.c new file +493 -0

493 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_filter.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.c new file +434 -0

434 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.h new file +35 -0
new file mode 100644
index 0000000000..def1167af7

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_main.c new file +83 -0

83 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.c new file +624 -0

624 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.h new file +201 -0

201 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_offload.c new file +31 -0
new file mode 100644
index 0000000000..4b0eacf7f0

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_offload.h new file +16 -0
new file mode 100644
index 0000000000..ae4bf87f30

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_queue.c new file +210 -0

210 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_queue.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.c new file +163 -0

163 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.h new file +18 -0
new file mode 100644
index 0000000000..55ca2705c1

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_stats.c new file +162 -0

162 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_stats.h new file +31 -0
new file mode 100644
index 0000000000..ddf56c39df

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_tx.c new file +46 -0

46 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_tx.h new file +14 -0
new file mode 100644
index 0000000000..c8ad400bca

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#94 lore raw

PATCH v6 14/14 net/sxe: add Solve compilation problems.

In reply to Jie Liu

Add Fix compiling issues.

---
 drivers/net/sxe/base/sxe_common.c         |  2 +-
 drivers/net/sxe/base/sxe_compat_version.h |  1 -
 drivers/net/sxe/base/sxe_hw.c             | 21 ++++++++----
 drivers/net/sxe/base/sxe_offload_common.c |  1 -
 drivers/net/sxe/base/sxe_queue_common.c   |  3 +-
 drivers/net/sxe/base/sxe_rx_common.c      | 10 +++---
 drivers/net/sxe/base/sxe_rx_common.h      |  2 --
 drivers/net/sxe/base/sxe_tx_common.c      |  1 -
 drivers/net/sxe/base/sxevf_hw.c           |  1 -
 drivers/net/sxe/include/sxe/sxe_cli.h     |  6 ++--
 drivers/net/sxe/meson.build               | 42 +++++++++++------------
 drivers/net/sxe/pf/sxe.h                  | 13 +++----
 drivers/net/sxe/pf/sxe_dcb.c              |  6 ++--
 drivers/net/sxe/pf/sxe_ethdev.c           |  5 ++-
 drivers/net/sxe/pf/sxe_filter.c           |  1 -
 drivers/net/sxe/pf/sxe_filter.h           |  1 -
 drivers/net/sxe/pf/sxe_irq.h              |  2 --
 drivers/net/sxe/pf/sxe_main.c             | 15 --------
 drivers/net/sxe/pf/sxe_offload.c          |  1 -
 drivers/net/sxe/pf/sxe_phy.c              |  4 +--
 drivers/net/sxe/pf/sxe_pmd_hdc.c          |  1 -
 drivers/net/sxe/pf/sxe_queue.c            |  2 --
 drivers/net/sxe/pf/sxe_queue.h            |  2 --
 drivers/net/sxe/pf/sxe_rx.c               |  1 -
 drivers/net/sxe/pf/sxe_stats.c            | 25 ++++++++++----
 drivers/net/sxe/pf/sxe_stats.h            |  8 ++---
 drivers/net/sxe/pf/sxe_tx.c               | 23 +------------
 drivers/net/sxe/pf/sxe_vec_common.h       |  8 ++++-
 drivers/net/sxe/pf/sxe_vec_neon.c         |  2 --
 drivers/net/sxe/pf/sxe_vec_sse.c          |  1 -
 drivers/net/sxe/pf/sxe_vf.c               |  1 -
 drivers/net/sxe/pf/sxe_vf.h               |  1 -
 drivers/net/sxe/sxe_testpmd.c             |  4 +--
 drivers/net/sxe/vf/sxevf_ethdev.c         |  6 ++--
 drivers/net/sxe/vf/sxevf_filter.h         |  4 +--
 drivers/net/sxe/vf/sxevf_irq.c            |  2 --
 drivers/net/sxe/vf/sxevf_irq.h            |  1 -
 drivers/net/sxe/vf/sxevf_main.c           |  1 -
 drivers/net/sxe/vf/sxevf_msg.c            |  2 +-
 drivers/net/sxe/vf/sxevf_offload.c        |  1 -
 drivers/net/sxe/vf/sxevf_queue.c          |  2 --
 drivers/net/sxe/vf/sxevf_queue.h          |  1 -
 drivers/net/sxe/vf/sxevf_rx.c             |  1 -
 drivers/net/sxe/vf/sxevf_stats.c          |  2 +-
 44 files changed, 99 insertions(+), 141 deletions(-)
drivers/net/sxe/base/sxe_common.c +1 -1
index 8b3fb13e73..cf6b656680 100644
@@ -44,7 +44,7 @@ u64 sxe_time_get_real_ms(void)
 
 u64 sxe_trace_id_gen(void)
 {
-	u64 tid	   = getpid() + (pthread_self() << 20);
+	u64 tid	   = (u64)getpid() + ((u64)pthread_self() << 20);
 	u64 index	 = 0;
 	u64 timestamp = sxe_time_get_real_ms();
 
drivers/net/sxe/base/sxe_compat_version.h +0 -1
index 5b8577067d..f3c6893ad9 100644
@@ -6,7 +6,6 @@
 #define __SXE_COMPAT_VERSION_H__
 
 #include <stdbool.h>
-#include "sxe_dpdk_version.h"
 
 struct rte_eth_dev;
 enum rte_eth_event_type;
drivers/net/sxe/base/sxe_hw.c +14 -7
index 4fe8f84f6b..0034e64151 100644
@@ -3,6 +3,7 @@
  */
 #ifdef SXE_PHY_CONFIGURE
 #include <linux/mdio.h>
+#include <rte_compat.h>
 #endif
 #include <rte_byteorder.h>
 #if defined(__KERNEL__) || defined(SXE_KERNEL_TEST)
@@ -1893,7 +1894,7 @@ static void sxe_hw_rx_pkt_buf_size_configure(struct sxe_hw *hw,
 		for (i = 0; i < (num_pb / 2); i++)
 			SXE_REG_WRITE(hw, SXE_RXPBSIZE(i), rx_buf_size);
 
-		fallthrough;
+		/* fallthrough */
 	case (PBA_STRATEGY_EQUAL):
 		rx_buf_size = (total_buf_size / (num_pb - i))
 				<< SXE_RX_PKT_BUF_SIZE_SHIFT;
@@ -2231,7 +2232,7 @@ static s32 sxe_hw_fnav_vm_pool_mask_get(struct sxe_hw *hw,
 	switch (vm_pool & SXE_SAMPLE_VM_POOL_MASK) {
 	case 0x0:
 		*fnavm |= SXE_FNAVM_POOL;
-		fallthrough;
+		/* fallthrough */
 	case 0x7F:
 		break;
 	default:
@@ -2279,13 +2280,13 @@ static s32 sxe_hw_fnav_vlan_mask_get(struct sxe_hw *hw,
 	switch (ntohs(vlan_id) & SXE_SAMPLE_VLAN_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0x0FFF:
 		*fnavm |= SXE_FNAVM_VLANP;
 		break;
 	case 0xE000:
 		*fnavm |= SXE_FNAVM_VLANID;
-		fallthrough;
+		/* fallthrough */
 	case 0xEFFF:
 		break;
 	default:
@@ -2305,7 +2306,7 @@ static s32 sxe_hw_fnav_flex_bytes_mask_get(struct sxe_hw *hw,
 	switch ((__force u16)flex_bytes & SXE_SAMPLE_FLEX_BYTES_MASK) {
 	case 0x0000:
 		*fnavm |= SXE_FNAVM_FLEX;
-		fallthrough;
+		/* fallthrough */
 	case 0xFFFF:
 		break;
 	default:
@@ -4963,7 +4964,14 @@ bool sxe_hw_is_rss_enabled(struct sxe_hw *hw)
 {
 	bool rss_enable = false;
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
-	if (mrqc & SXE_MRQC_RSSEN)
+
+
+	u32 mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
+	if (mrqe_val == SXE_MRQC_RSSEN ||
+		mrqe_val == SXE_MRQC_RTRSS8TCEN ||
+		mrqe_val == SXE_MRQC_RTRSS4TCEN ||
+		mrqe_val == SXE_MRQC_VMDQRSS32EN ||
+		mrqe_val == SXE_MRQC_VMDQRSS64EN)
 		rss_enable = true;
 
 	return rss_enable;
@@ -5497,7 +5505,6 @@ void sxe_hw_rss_cap_switch(struct sxe_hw *hw, bool is_on)
 {
 	u32 mrqc = SXE_REG_READ(hw, SXE_MRQC);
 	u32 mrqe_val;
-
 	mrqe_val = mrqc & SXE_MRQC_MRQE_MASK;
 	if (is_on) {
 		mrqe_val = SXE_MRQC_RSSEN;
drivers/net/sxe/base/sxe_offload_common.c +0 -1
index f87cce67a5..7ecb31f466 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/base/sxe_queue_common.c +2 -1
index 914718769f..e31ebd005a 100644
@@ -4,7 +4,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
@@ -294,6 +293,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	if (adapter->rx_vec_allowed) {
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
@@ -308,6 +308,7 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
 #endif
+
 	return;
 }
 
drivers/net/sxe/base/sxe_rx_common.c +6 -4
index e3fee580df..5e46ff76f3 100644
@@ -5,7 +5,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_mbuf.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_malloc.h>
@@ -80,8 +79,6 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	u16  i, is_using_sse;
 
 	if (sxe_rx_vec_condition_check(dev) ||
-		!rx_batch_alloc_allowed ||
-		rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128
 		!rx_batch_alloc_allowed
 		) {
 		PMD_LOG_DEBUG(INIT, "Port[%d] doesn't meet Vector Rx "
@@ -111,6 +108,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
+
 #endif
 			dev->rx_pkt_burst = sxe_scattered_pkts_vec_recv;
 
@@ -138,12 +136,13 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 			dev->rx_pkt_burst = sxe_single_alloc_lro_pkts_recv;
 		}
 	}
-#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	else if (*rx_vec_allowed) {
 		PMD_LOG_DEBUG(INIT, "Vector rx enabled, please make sure RX "
 					"burst size no less than %d (port=%d).",
 				 SXE_DESCS_PER_LOOP,
 				 dev->data->port_id);
+
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 		dev->recycle_rx_descriptors_refill = sxe_recycle_rx_descriptors_refill_vec;
 
@@ -166,6 +165,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 
 		dev->rx_pkt_burst = sxe_pkts_recv;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 	is_using_sse =
 		(dev->rx_pkt_burst == sxe_scattered_pkts_vec_recv ||
@@ -177,6 +177,7 @@ void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 		rxq->is_using_sse = is_using_sse;
 	}
 #endif
+
 }
 
 s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset)
@@ -340,6 +341,7 @@ const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of
 		ptypes = ptypes_arr;
 		goto l_end;
 	}
+
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #if defined(RTE_ARCH_X86)
 	if (dev->rx_pkt_burst == sxe_pkts_vec_recv ||
drivers/net/sxe/base/sxe_rx_common.h +0 -2
index f9afb517d9..d1bf172c89 100644
@@ -5,8 +5,6 @@
 #ifndef __SXE_RX_COMMON_H__
 #define __SXE_RX_COMMON_H__
 
-#include "sxe_dpdk_version.h"
-
 void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
 	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
 
drivers/net/sxe/base/sxe_tx_common.c +0 -1
index e4cf514547..5f8a951bbd 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <rte_net.h>
drivers/net/sxe/base/sxevf_hw.c +0 -1
index 7425bafedb..914860e912 100644
@@ -15,7 +15,6 @@
 #else
 #include "sxe_errno.h"
 #include "sxe_logs.h"
-#include "sxe_dpdk_version.h"
 #include "sxe_compat_version.h"
 #include "sxevf.h"
 #include "sxevf_hw.h"
drivers/net/sxe/include/sxe/sxe_cli.h +3 -3
index 623347dab2..8ffb14f68b 100644
@@ -9,7 +9,7 @@
 #include "sxe_drv_type.h"
 #endif
 
-#define SXE_VERSION_LEN				  (32)
+#define SXE_VERION_LEN				  (32)
 #define SXE_MAC_NUM					 (128)
 #define SXE_PORT_TRANSCEIVER_LEN		(32)
 #define SXE_PORT_VENDOR_LEN			 (32)
@@ -47,8 +47,8 @@ typedef enum port_link_speed {
 } port_link_speed_e;
 
 typedef struct sys_soc_info {
-	S8	 fw_ver[SXE_VERSION_LEN];
-	S8	 opt_ver[SXE_VERSION_LEN];
+	S8	 fw_ver[SXE_VERION_LEN];
+	S8	 opt_ver[SXE_VERION_LEN];
 	U8	 soc_status;
 	U8	 pad[3];
 	S32	soc_temp;
drivers/net/sxe/meson.build +21 -21

64 lines not on this page · raw message

drivers/net/sxe/pf/sxe.h +7 -6
index 212929cf04..73c9ad55a1 100644
@@ -6,14 +6,14 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-#include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
-#include "sxe_stats.h"
+#include "sxe_filter.h"
 #include "sxe_irq.h"
+#include "sxe_stats.h"
+#include "sxe_phy.h"
 #include "sxe_vf.h"
 #include "sxe_dcb.h"
-#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -25,6 +25,8 @@ struct sxe_vlan_context;
 #define PCI_VENDOR_ID_STARS	  0x1FF2
 #define SXE_DEV_ID_ASIC		  0x10a1
 
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+
 #ifdef RTE_PMD_PACKET_PREFETCH
 #define rte_packet_prefetch(p)  rte_prefetch1(p)
 #else
@@ -73,13 +75,12 @@ struct sxe_adapter {
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
+
 	bool rss_reta_updated;
+
 	RTE_ATOMIC(bool) link_thread_running;
 	RTE_ATOMIC(bool) is_stopping;
 	rte_thread_t link_thread_tid;
-	rte_atomic32_t link_thread_running;
-	rte_atomic32_t is_stopping;
-	pthread_t link_thread_tid;
 	bool is_stopped;
 };
 
drivers/net/sxe/pf/sxe_dcb.c +3 -3
index 7decd70e07..78fc2d4cc9 100644
@@ -11,6 +11,7 @@
 #include "sxe_ethdev.h"
 #include "sxe_compat_version.h"
 #include "rte_pmd_sxe.h"
+#include <eal_export.h>
 
 #define DCB_RX_CONFIG  1
 #define DCB_TX_CONFIG  1
@@ -584,7 +585,7 @@ static void sxe_dcb_cee_pfc_parse(struct sxe_dcb_config *cfg,
 static s32 sxe_dcb_tc_stats_configure(struct sxe_hw *hw,
 					struct sxe_dcb_config *dcb_config)
 {
-	s32 ret;
+	s32 ret = 0;
 	u8 tc_count = 8;
 	bool vmdq_active = false;
 
@@ -862,8 +863,7 @@ void sxe_dcb_configure(struct rte_eth_dev *dev)
 }
 
 RTE_EXPORT_SYMBOL(rte_pmd_sxe_tc_bw_set)
-s32
-rte_pmd_sxe_tc_bw_set(u8 port,
+s32 rte_pmd_sxe_tc_bw_set(u8 port,
 				u8 tc_num, u8 *bw_weight)
 {
 	struct sxe_adapter *adapter;
drivers/net/sxe/pf/sxe_ethdev.c +2 -3
index 0a5b04493d..fd39c4acff 100644
@@ -8,7 +8,7 @@
 #include <rte_ethdev.h>
 #include <rte_pmd_sxe.h>
 #include <rte_alarm.h>
-
+#include <eal_export.h>
 #include "sxe_types.h"
 #include "sxe_logs.h"
 #include "sxe_compat_platform.h"
@@ -923,8 +923,7 @@ static s32 sxe_dev_reset(struct rte_eth_dev *eth_dev)
 }
 
 RTE_EXPORT_SYMBOL(rte_pmd_sxe_tx_loopback_set)
-s32
-rte_pmd_sxe_tx_loopback_set(u16 port, u8 on)
+s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on)
 {
 	struct rte_eth_dev *dev;
 	struct sxe_adapter *adapter;
drivers/net/sxe/pf/sxe_filter.c +0 -1
index 55c534d692..8d09d8596f 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <bus_pci_driver.h>
 #include <rte_malloc.h>
drivers/net/sxe/pf/sxe_filter.h +0 -1
index de6170a3f4..7b9026fcfb 100644
@@ -6,7 +6,6 @@
 #define __SXE_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_types.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_irq.h +0 -2
index b2c5692932..eba70f5361 100644
@@ -4,8 +4,6 @@
 
 #ifndef __SXE_IRQ_H__
 #define __SXE_IRQ_H__
-
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_compat_platform.h"
drivers/net/sxe/pf/sxe_main.c +0 -15
index 49f9dd2f27..6c0891dbde 100644
@@ -8,7 +8,6 @@
 #include <rte_pci.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
@@ -245,24 +244,10 @@ RTE_LOG_REGISTER_SUFFIX(sxe_log_rx, pmd.net.sxe.rx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_tx, pmd.net.sxe.tx, DEBUG);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_hw, pmd.net.sxe.tx_hw, DEBUG);
 #else
-#ifdef DPDK_19_11_6
-s32 sxe_log_init;
-s32 sxe_log_drv;
-RTE_INIT(sxe_init_log)
-{
-	sxe_log_init = rte_log_register("pmd.net.sxe.init");
-	if (sxe_log_init >= 0)
-		rte_log_set_level(sxe_log_init, RTE_LOG_NOTICE);
 
-	sxe_log_drv = rte_log_register("pmd.net.sxe.drv");
-	if (sxe_log_drv >= 0)
-		rte_log_set_level(sxe_log_drv, RTE_LOG_NOTICE);
-}
-#else
 RTE_LOG_REGISTER_SUFFIX(sxe_log_init, pmd.net.sxe.init, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(sxe_log_drv, pmd.net.sxe.drv, NOTICE);
 #endif
-#endif
 
 int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
 	enum rte_eth_event_type event, void *ret_param)
drivers/net/sxe/pf/sxe_offload.c +0 -1
index 4b49cba707..d34cf7ecc8 100644
@@ -2,7 +2,6 @@
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
 #include <ethdev_driver.h>
-
 #include "sxe.h"
 #include "sxe_offload.h"
 #include "sxe_logs.h"
drivers/net/sxe/pf/sxe_phy.c +2 -2
index 787b16fb47..afc885545e 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include <rte_cycles.h>
@@ -69,7 +68,8 @@ void sxe_wait_setup_link_complete(struct rte_eth_dev *dev,
 	struct sxe_adapter *adapter = dev->data->dev_private;
 	uint32_t timeout = timeout_ms ? timeout_ms : SXE_WARNING_TIMEOUT;
 
-	while (rte_atomic_load_explicit(&adapter->link_thread_running, rte_memory_order_seq_cst)) {
+	while (rte_atomic_load_explicit(&adapter->link_thread_running,
+		rte_memory_order_seq_cst)) {
 		rte_delay_us_sleep(1000);
 		timeout--;
 
drivers/net/sxe/pf/sxe_pmd_hdc.c +0 -1
index 21f751ed26..61dcb6a6c1 100644
@@ -3,7 +3,6 @@
  */
 
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_version.h"
 #include <semaphore.h>
drivers/net/sxe/pf/sxe_queue.c +0 -2
index 9411da8ff8..75287defda 100644
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <dev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "rte_malloc.h"
 #include "sxe.h"
 #include "sxe_hw.h"
drivers/net/sxe/pf/sxe_queue.h +0 -2
index e67baf6135..027aea0755 100644
@@ -3,8 +3,6 @@
  */
 #ifndef __SXE_QUEUE_H__
 #define __SXE_QUEUE_H__
-
-#include "sxe_dpdk_version.h"
 #include "sxe_queue_common.h"
 
 #define SXE_TXRX_RING_NUM_MAX	 64
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 65cfcca4c9..b1c53a533a 100644
@@ -113,7 +113,6 @@
 
 
 const alignas(RTE_CACHE_LINE_SIZE) u32 sxe_ptype_table[SXE_PACKET_TYPE_MAX] = {
-
 	[SXE_PACKET_TYPE_ETHER] = RTE_PTYPE_L2_ETHER,
 	[SXE_PACKET_TYPE_IPV4] = RTE_PTYPE_L2_ETHER |
 		RTE_PTYPE_L3_IPV4,
drivers/net/sxe/pf/sxe_stats.c +19 -6
index af3c0bf84c..34470eae64 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include "sxe_stats.h"
 #include "sxe.h"
 #include "sxe_logs.h"
@@ -221,7 +220,7 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	cnt = SXE_XSTAT_CNT;
 	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
 			"fc xstat field cnt: %" SXE_PRIU64, cnt,
-			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
+			(u64)SXE_XSTAT_MAC_CNT, (u64)SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -333,7 +332,7 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 	if (usr_cnt < SXE_XSTAT_CNT) {
 		ret = -SXE_ERR_PARAM;
 		PMD_LOG_ERR(DRV, "max: %" SXE_PRIU64 " usr_cnt:%u invalid.(err:%d)",
-				SXE_XSTAT_CNT, usr_cnt, ret);
+				(u64)SXE_XSTAT_CNT, usr_cnt, ret);
 		goto l_out;
 	}
 
@@ -432,7 +431,11 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 size = SXE_XSTAT_CNT;
 	u32 i;
-	u64 value_all[size];
+	u64 *value_all = (u64 *)malloc(size * sizeof(u64));
+	if (value_all == NULL) {
+		perror("value_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_all_xstats_value_get(eth_dev, values, usr_cnt);
@@ -459,6 +462,9 @@ s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (value_all != NULL)
+		free(value_all);
+
 	return ret;
 }
 
@@ -470,7 +476,12 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	s32 ret;
 	u32 i;
 	u32 size = SXE_XSTAT_CNT;
-	struct rte_eth_xstat_name xstat_names_all[size];
+	struct rte_eth_xstat_name *xstat_names_all =
+	(struct rte_eth_xstat_name *)malloc(size * sizeof(struct rte_eth_xstat_name));
+	if (xstat_names_all == NULL) {
+		perror("xstat_names_all malloc failed");
+		return -ENOMEM;
+	}
 
 	if (ids == NULL) {
 		ret = sxe_xstats_names_get(eth_dev, xstats_names, usr_cnt);
@@ -490,6 +501,9 @@ s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
 	ret = usr_cnt;
 
 l_out:
+	if (xstat_names_all != NULL)
+		free(xstat_names_all);
+
 	return ret;
 }
 
@@ -573,4 +587,3 @@ void sxe_queue_stats_map_reset(struct rte_eth_dev *eth_dev)
 		sxe_hw_rxq_stat_map_set(hw, reg_idx, 0);
 	}
 }
-
drivers/net/sxe/pf/sxe_stats.h +3 -5
index 78a13e7a0b..320a82a130 100644
@@ -7,8 +7,6 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxe_hw.h"
 
 #define SXE_STATS_FIELD_NAME_SIZE  50
@@ -49,11 +47,11 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 	struct rte_eth_xstat_name *xstats_names, __rte_unused unsigned int size);
 
 s32 sxe_xstats_get_by_id(struct rte_eth_dev *eth_dev,
-					const ulong *ids,
-					ulong *values, u32 usr_cnt);
+					const u64 *ids,
+					u64 *values, u32 usr_cnt);
 
 s32 sxe_xstats_names_get_by_id(struct rte_eth_dev *eth_dev,
-	const ulong *ids,
+	const u64 *ids,
 	struct rte_eth_xstat_name *xstats_names,
 	u32 usr_cnt);
 
drivers/net/sxe/pf/sxe_tx.c +1 -22
index b50052e0db..46e65ebcf7 100644
@@ -1,18 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
-#if defined DPDK_20_11_5 || defined DPDK_19_11_6
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
-#elif defined DPDK_21_11_5
-#include <ethdev_driver.h>
-#include <rte_dev.h>
-#else
 #include <ethdev_driver.h>
 #include <dev_driver.h>
-#endif
-
 #include <rte_net.h>
 
 #include "sxe.h"
@@ -43,17 +33,10 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 		dev->tx_pkt_prepare = NULL;
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
-#ifndef DPDK_19_11_6
-			rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128 &&
-#endif
 			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
 			sxe_txq_vec_setup(txq) == 0)) {
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 			dev->recycle_tx_mbufs_reuse = sxe_recycle_tx_mbufs_reuse_vec;
-#endif
-#endif
 #endif
 			dev->tx_pkt_burst   = sxe_pkts_vector_xmit;
 			PMD_LOG_INFO(INIT, "using vector tx code path");
@@ -72,7 +55,7 @@ void __rte_cold sxe_tx_function_set(struct rte_eth_dev *dev,
 
 		PMD_LOG_INFO(INIT, "using full-featured tx code path");
 		PMD_LOG_INFO(INIT, " - offloads = 0x%" SXE_PRIX64,
-					(unsigned long)txq->offloads);
+							txq->offloads);
 		PMD_LOG_INFO(INIT, " - tx_rs_thresh = %d "
 				   "[RTE_PMD_SXE_MAX_TX_BURST=%d]",
 				txq->rs_thresh,
@@ -370,8 +353,6 @@ u16 sxe_pkts_simple_xmit(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num
 }
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
-#if defined DPDK_23_11_3 || defined DPDK_24_11_1
-#ifndef DPDK_23_7
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
 u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	struct rte_eth_recycle_rxq_info *recycle_rxq_info)
@@ -438,8 +419,6 @@ u16 sxe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	return nb_recycle_mbufs;
 }
 #endif
-#endif
-#endif
 
 u16 sxe_pkts_vector_xmit(void *tx_queue, struct rte_mbuf **tx_pkts,
 			   u16 pkts_num)
drivers/net/sxe/pf/sxe_vec_common.h +7 -1
index 85605507f5..90ace4c324 100644
@@ -11,6 +11,7 @@
 #include <dev_driver.h>
 #include <rte_malloc.h>
 #include "sxe.h"
+#include "sxe_queue.h"
 #include "sxe_rx.h"
 
 #define RTE_SXE_MAX_TX_FREE_BUF_SZ	64
@@ -77,7 +78,11 @@ static inline u16
 sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 			u16 bufs_num, u8 *split_flags)
 {
-	struct rte_mbuf *pkts[bufs_num];
+	struct rte_mbuf **pkts = (struct rte_mbuf **)malloc(bufs_num * sizeof(struct rte_mbuf *));
+	if (pkts == NULL) {
+		perror("pkts malloc failed");
+		exit(EXIT_FAILURE);
+	}
 	struct rte_mbuf *start = rxq->pkt_first_seg;
 	struct rte_mbuf *end = rxq->pkt_last_seg;
 	u32 pkt_idx, buf_idx;
@@ -129,6 +134,7 @@ sxe_packets_reassemble(sxe_rx_queue_s *rxq, struct rte_mbuf **rx_bufs,
 	rxq->pkt_last_seg = end;
 	memcpy(rx_bufs, pkts, pkt_idx * (sizeof(*pkts)));
 
+	free(pkts);
 	return pkt_idx;
 }
 
drivers/net/sxe/pf/sxe_vec_neon.c +0 -2
index 9012750c98..30d878ea39 100644
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 
drivers/net/sxe/pf/sxe_vec_sse.c +0 -1
index 8786af75f8..d54542f4a8 100644
@@ -4,7 +4,6 @@
 
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include <stdint.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
drivers/net/sxe/pf/sxe_vf.c +0 -1
index d75ec913f3..178a69a2bf 100644
@@ -6,7 +6,6 @@
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_memcpy.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/pf/sxe_vf.h +0 -1
index 05b91540cc..112d98df39 100644
@@ -5,7 +5,6 @@
 #ifndef __SXE_VF_H__
 #define __SXE_VF_H__
 
-#include "sxe_dpdk_version.h"
 #include <rte_ethdev.h>
 #include <bus_pci_driver.h>
 
drivers/net/sxe/sxe_testpmd.c +2 -2
index b533ae939b..6deb502124 100644
@@ -2,9 +2,9 @@
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
 #include <ethdev_driver.h>
-#include "sxe_ethdev.h"
+#include "sxe_drv_type.h"
 #include "rte_pmd_sxe.h"
-
+#include "sxe_ethdev.h"
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_parse_num.h>
 #include <cmdline_parse_string.h>
drivers/net/sxe/vf/sxevf_ethdev.c +2 -4
index 1466465fe1..9bcdd11c6f 100644
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <inttypes.h>
-#include "sxe_dpdk_version.h"
+
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
@@ -252,6 +252,7 @@ static void sxevf_txrx_start(struct rte_eth_dev *eth_dev)
 		txq = eth_dev->data->tx_queues[i];
 		sxevf_tx_ring_switch(hw, txq->reg_idx, true);
 		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	}
 
 	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
@@ -332,7 +333,6 @@ static s32 sxevf_dev_stop(struct rte_eth_dev *dev)
 	sxevf_irq_free(dev);
 
 l_out:
-
 	return 0;
 }
 
@@ -362,7 +362,6 @@ static s32 sxevf_dev_close(struct rte_eth_dev *dev)
 	sxevf_irq_unregister(dev);
 
 l_out:
-
 	return ret;
 }
 
@@ -470,7 +469,6 @@ static s32 sxevf_mtu_set(struct rte_eth_dev *dev, u16 mtu)
 		goto l_out;
 	}
 
-	dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame;
 	LOG_INFO_BDF("change max frame size to %u success.", max_frame);
 
 l_out:
drivers/net/sxe/vf/sxevf_filter.h +2 -2
index d468be12cc..6fa51e3af1 100644
@@ -6,9 +6,7 @@
 #define __SXEVF_FILTER_H__
 
 #include <rte_ether.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
-#endif
 
 #define SXEVF_MTA_ENTRY_NUM_MAX		128
 #define SXEVF_UTA_HASH_BIT_MAX		 4096
@@ -68,3 +66,5 @@ s32 sxevf_mac_addr_add(struct rte_eth_dev *dev,
 s32 sxevf_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
+
+#endif
drivers/net/sxe/vf/sxevf_irq.c +0 -2
index bf768a67f6..3263f56313 100644
@@ -9,10 +9,8 @@
 #include <rte_alarm.h>
 #include <rte_interrupts.h>
 #include <rte_malloc.h>
-#include "sxe_dpdk_version.h"
 #include <bus_pci_driver.h>
 #include <eal_interrupts.h>
-
 #include "sxevf.h"
 #include "sxe_logs.h"
 #include "sxe_errno.h"
drivers/net/sxe/vf/sxevf_irq.h +0 -1
index def1167af7..2f9860ba15 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_IRQ_H__
 #define __SXEVF_IRQ_H__
 
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include "sxe_compat_platform.h"
 
drivers/net/sxe/vf/sxevf_main.c +0 -1
index d418705cf8..b1924c1475 100644
@@ -12,7 +12,6 @@
 #include <rte_dev.h>
 
 #include "sxe_version.h"
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 #include <bus_pci_driver.h>
drivers/net/sxe/vf/sxevf_msg.c +1 -1
index faf6787e74..37d3f2c5dc 100644
@@ -101,7 +101,7 @@ static s32 sxevf_mailbox_lock(struct sxevf_hw *hw)
 		mailbox |= SXE_VFMAILBOX_VFU;
 		sxevf_mailbox_write(hw, mailbox);
 
-		if (sxevf_mbx_reg_read(hw) && SXE_VFMAILBOX_VFU) {
+		if (sxevf_mbx_reg_read(hw) & SXE_VFMAILBOX_VFU) {
 			ret = 0;
 			break;
 		}
drivers/net/sxe/vf/sxevf_offload.c +0 -1
index 4b0eacf7f0..b39245aa11 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_types.h"
drivers/net/sxe/vf/sxevf_queue.c +0 -2
index 4461d13369..69ef1f6676 100644
@@ -7,8 +7,6 @@
 #include <rte_byteorder.h>
 #include <rte_mbuf_core.h>
 #include <rte_ethdev.h>
-
-#include "sxe_dpdk_version.h"
 #include "sxevf_rx.h"
 #include "sxevf_tx.h"
 #include "sxe_logs.h"
drivers/net/sxe/vf/sxevf_queue.h +0 -1
index 9407e941fb..01e2ec216c 100644
@@ -5,7 +5,6 @@
 #ifndef __SXEVF_QUEUEU_H__
 #define __SXEVF_QUEUEU_H__
 
-#include "sxe_dpdk_version.h"
 #include "sxe_types.h"
 #include "sxe_queue_common.h"
 
drivers/net/sxe/vf/sxevf_rx.c +0 -1
index aee63d025d..81aab3f315 100644
@@ -5,7 +5,6 @@
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
 
 #include <rte_common.h>
-#include "sxe_dpdk_version.h"
 #include <ethdev_driver.h>
 
 #include "sxe_logs.h"
drivers/net/sxe/vf/sxevf_stats.c +1 -1
index 21407dac42..defe65c5db 100644
@@ -118,7 +118,7 @@ s32 sxevf_xstats_get(struct rte_eth_dev *eth_dev,
 	cnt = 0;
 	for (i = 0; i < SXE_HW_XSTATS_CNT; i++) {
 		sxevf_hw_xstat_offset_get(i, &offset);
-		xstats[cnt].value = *(ulong *)(((s8 *)(&stats_info->hw_stats)) + offset);
+		xstats[cnt].value = *(u_long *)(((s8 *)(&stats_info->hw_stats)) + offset);
 		xstats[cnt].id = cnt;
 		cnt++;
 	}
Signature · 1 line
2.18.4
author
#95 lore raw

PATCH v7 1/14 net/sxe: add base driver directory and doc

Adding a minimum maintainable directory structure for the network driver and request maintenance of the sxe driver.

---
 MAINTAINERS                         |  6 +++
 doc/guides/nics/features/sxe.ini    | 78 +++++++++++++++++++++++++++++
 doc/guides/nics/features/sxe_vf.ini | 37 ++++++++++++++
 doc/guides/nics/index.rst           |  1 +
 doc/guides/nics/sxe.rst             | 71 ++++++++++++++++++++++++++
 drivers/net/sxe/meson.build         |  9 ++++
 drivers/net/sxe/pf/sxe_ethdev.c     |  3 ++
 drivers/net/sxe/pf/sxe_ethdev.h     |  3 ++
 8 files changed, 208 insertions(+)
 create mode 100644 doc/guides/nics/features/sxe.ini
 create mode 100644 doc/guides/nics/features/sxe_vf.ini
 create mode 100644 doc/guides/nics/sxe.rst
 create mode 100644 drivers/net/sxe/meson.build
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.c
 create mode 100644 drivers/net/sxe/pf/sxe_ethdev.h
MAINTAINERS +6 -0
index 0e9357f3a3..b286452143 100644
@@ -2074,3 +2074,9 @@ F: examples/vmdq/
 F: doc/guides/sample_app_ug/vmdq_forwarding.rst
 F: examples/vmdq_dcb/
 F: doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst
+
+Linkdata sxe
+M: Jie Li <[email protected]>
+F: drivers/net/sxe/
+F: doc/guides/nics/sxe.rst
+F: doc/guides/nics/features/sxe*.ini
doc/guides/nics/features/sxe.ini new file +78 -0

78 lines not on this page · raw message

doc/guides/nics/features/sxe_vf.ini new file +37 -0
new file mode 100644
index 0000000000..7caf5435ae
@@ -0,0 +1,37 @@
+;
+; Supported features of the 'sxe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Link status          = Y
+Rx interrupt         = Y
+Power mgmt address monitor = Y
+MTU update           = Y
+Scattered Rx         = Y
+LRO                  = Y
+TSO                  = Y
+Promiscuous mode     = Y
+Allmulticast mode    = Y
+Unicast MAC filter   = Y
+RSS hash             = Y
+RSS key update       = Y
+RSS reta update      = Y
+VLAN filter          = Y
+Inline crypto        = Y
+CRC offload          = P
+VLAN offload         = P
+QinQ offload         = P
+L3 checksum offload  = P
+L4 checksum offload  = P
+Inner L3 checksum    = P
+Inner L4 checksum    = P
+Packet type parsing  = Y
+Rx descriptor status = Y
+Tx descriptor status = Y
+Basic stats          = Y
+Extended stats       = Y
+Registers dump       = Y
+Linux                = Y
+ARMv8                = Y
+x86-64               = Y
doc/guides/nics/index.rst +1 -0
index 57d161c526..3616bfc7a4 100644
@@ -64,6 +64,7 @@ Network Interface Controller Drivers
     rnp
     sfc_efx
     softnic
+    sxe
     tap
     thunderx
     txgbe
doc/guides/nics/sxe.rst new file +71 -0

71 lines not on this page · raw message

drivers/net/sxe/meson.build new file +9 -0
new file mode 100644
index 0000000000..dad9ee44a0
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C), 2020, Wuxi Stars Micro System Technologies Co., Ltd.
+
+deps += ['hash']
+sources = files(
+        'pf/sxe_ethdev.c',
+)
+
+includes += include_directories('pf')
drivers/net/sxe/pf/sxe_ethdev.c new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
drivers/net/sxe/pf/sxe_ethdev.h new file +3 -0
new file mode 100644
index 0000000000..e31a23deeb
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
Signature · 1 line
2.18.4
author
#96 lore raw

PATCH v7 2/14 net/sxe: add ethdev probe and remove

Add basic modules: logs、 hardware communication、common components and support basic PCIe ethdev probe and remove.

---
 drivers/net/sxe/base/sxe_common.c          |   66 +
 drivers/net/sxe/base/sxe_common.h          |   15 +
 drivers/net/sxe/base/sxe_compat_platform.h |  130 +
 drivers/net/sxe/base/sxe_compat_version.h  |   38 +
 drivers/net/sxe/base/sxe_errno.h           |   61 +
 drivers/net/sxe/base/sxe_hw.c              | 6260 ++++++++++++++++++++
 drivers/net/sxe/base/sxe_hw.h              | 1541 +++++
 drivers/net/sxe/base/sxe_logs.h            |  273 +
 drivers/net/sxe/base/sxe_types.h           |   40 +
 drivers/net/sxe/include/drv_msg.h          |   18 +
 drivers/net/sxe/include/sxe/sxe_hdc.h      |   42 +
 drivers/net/sxe/include/sxe/sxe_msg.h      |  135 +
 drivers/net/sxe/include/sxe/sxe_regs.h     | 1280 ++++
 drivers/net/sxe/include/sxe_version.h      |   29 +
 drivers/net/sxe/meson.build                |   15 +-
 drivers/net/sxe/pf/sxe.h                   |   56 +
 drivers/net/sxe/pf/sxe_ethdev.c            |  324 +-
 drivers/net/sxe/pf/sxe_ethdev.h            |   27 +-
 drivers/net/sxe/pf/sxe_irq.c               |  126 +
 drivers/net/sxe/pf/sxe_irq.h               |   41 +
 drivers/net/sxe/pf/sxe_main.c              |  251 +
 drivers/net/sxe/pf/sxe_phy.h               |   38 +
 drivers/net/sxe/pf/sxe_pmd_hdc.c           |  683 +++
 drivers/net/sxe/pf/sxe_pmd_hdc.h           |   44 +
 drivers/net/sxe/sxe_drv_type.h             |   19 +
 25 files changed, 11549 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxe_common.c
 create mode 100644 drivers/net/sxe/base/sxe_common.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_platform.h
 create mode 100644 drivers/net/sxe/base/sxe_compat_version.h
 create mode 100644 drivers/net/sxe/base/sxe_errno.h
 create mode 100644 drivers/net/sxe/base/sxe_hw.c
 create mode 100644 drivers/net/sxe/base/sxe_hw.h
 create mode 100644 drivers/net/sxe/base/sxe_logs.h
 create mode 100644 drivers/net/sxe/base/sxe_types.h
 create mode 100644 drivers/net/sxe/include/drv_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_hdc.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_msg.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_regs.h
 create mode 100644 drivers/net/sxe/include/sxe_version.h
 create mode 100644 drivers/net/sxe/pf/sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_irq.c
 create mode 100644 drivers/net/sxe/pf/sxe_irq.h
 create mode 100644 drivers/net/sxe/pf/sxe_main.c
 create mode 100644 drivers/net/sxe/pf/sxe_phy.h
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.c
 create mode 100644 drivers/net/sxe/pf/sxe_pmd_hdc.h
 create mode 100644 drivers/net/sxe/sxe_drv_type.h
drivers/net/sxe/base/sxe_common.c new file +66 -0
new file mode 100644
index 0000000000..8b3fb13e73
@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#include <pthread.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <rte_common.h>
+#include <rte_cycles.h>
+#include <time.h>
+#include "sxe_types.h"
+#include "sxe_common.h"
+
+#define SXE_TRACE_ID_COUNT_MASK  0x00000000000000FFLLU
+#define SXE_TRACE_ID_TID_MASK	0x0000000000FFFF00LLU
+#define SXE_TRACE_ID_TIME_MASK   0x00FFFFFFFF000000LLU
+#define SXE_TRACE_ID_FLAG		0xFF00000000000000LLU
+
+#define SXE_TRACE_ID_COUNT_SHIFT 0
+#define SXE_TRACE_ID_TID_SHIFT   8
+#define SXE_TRACE_ID_TIME_SHIFT  24
+
+#define SXE_SEC_TO_MS(sec) ((sec) * 1000ULL)
+#define SXE_SEC_TO_NS(sec) ((sec) * 1000000000ULL)
+
+#define SXE_USEC_PER_MS		  1000000
+
+u64 sxe_trace_id;
+
+u64 sxe_time_get_real_ms(void)
+{
+	u64 ms = 0;
+	struct timespec ts;
+	s32 ret = clock_gettime(CLOCK_MONOTONIC, &ts);
+	if (ret < 0)
+		goto l_end;
+
+	ms = SXE_SEC_TO_MS(ts.tv_sec) + ts.tv_nsec / SXE_USEC_PER_MS;
+
+l_end:
+	return ms;
+}
+
+u64 sxe_trace_id_gen(void)
+{
+	u64 tid	   = getpid() + (pthread_self() << 20);
+	u64 index	 = 0;
+	u64 timestamp = sxe_time_get_real_ms();
+
+	sxe_trace_id = (SXE_TRACE_ID_FLAG)
+		| ((timestamp << SXE_TRACE_ID_TIME_SHIFT) & SXE_TRACE_ID_TIME_MASK)
+		| ((tid << SXE_TRACE_ID_TID_SHIFT) & SXE_TRACE_ID_TID_MASK)
+		| ((index << SXE_TRACE_ID_COUNT_SHIFT) & SXE_TRACE_ID_COUNT_MASK);
+	return sxe_trace_id;
+}
+
+void sxe_trace_id_clean(void)
+{
+	sxe_trace_id = 0;
+}
+
+u64 sxe_trace_id_get(void)
+{
+	return sxe_trace_id++;
+}
drivers/net/sxe/base/sxe_common.h new file +15 -0
new file mode 100644
index 0000000000..43c062b937
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef __SXE_DPDK_COMMON_H__
+#define __SXE_DPDK_COMMON_H__
+
+u64 sxe_trace_id_gen(void);
+
+void sxe_trace_id_clean(void);
+
+u64 sxe_trace_id_get(void);
+
+u64 sxe_time_get_real_ms(void);
+
+#endif
drivers/net/sxe/base/sxe_compat_platform.h new file +130 -0

130 lines not on this page · raw message

drivers/net/sxe/base/sxe_compat_version.h new file +38 -0
new file mode 100644
index 0000000000..5b8577067d
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_COMPAT_VERSION_H__
+#define __SXE_COMPAT_VERSION_H__
+
+#include <stdbool.h>
+#include "sxe_dpdk_version.h"
+
+struct rte_eth_dev;
+enum rte_eth_event_type;
+
+int sxe_eth_dev_callback_process(struct rte_eth_dev *dev,
+	enum rte_eth_event_type event, void *ret_param);
+
+#define SET_AUTOFILL_QUEUE_XSTATS
+#define PCI_REG_WC_WRITE
+
+#ifndef PCI_REG_WC_WRITE
+#define rte_write32_wc rte_write32
+#define rte_write32_wc_relaxed rte_write32_relaxed
+#endif
+
+#define SXE_PCI_INTR_HANDLE(pci_dev) \
+	((pci_dev)->intr_handle)
+#define SXE_DEV_FNAV_CONF(dev) \
+	(&((struct sxe_adapter *)(dev)->data->dev_private)->fnav_conf)
+#define RTE_ADAPTER_HAVE_FNAV_CONF
+#define SXE_GET_FRAME_SIZE(dev) \
+	((dev)->data->mtu + SXE_ETH_OVERHEAD)
+
+#define ETH_DEV_OPS_MONITOR
+
+#define DEV_RX_OFFLOAD_CHECKSUM RTE_ETH_RX_OFFLOAD_CHECKSUM
+#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES
+
+#endif
drivers/net/sxe/base/sxe_errno.h new file +61 -0

61 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.c new file +6260 -0

2,690 lines not on this page · raw message

drivers/net/sxe/base/sxe_hw.h new file +1541 -0

1,541 lines not on this page · raw message

drivers/net/sxe/base/sxe_logs.h new file +273 -0

273 lines not on this page · raw message

drivers/net/sxe/base/sxe_types.h new file +40 -0
new file mode 100644
index 0000000000..a36a3cfbf6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/drv_msg.h new file +18 -0
new file mode 100644
index 0000000000..87c505569d

Lines of this file are not shown. View the raw message.

drivers/net/sxe/include/sxe/sxe_hdc.h new file +42 -0

42 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_msg.h new file +135 -0

135 lines not on this page · raw message

drivers/net/sxe/include/sxe/sxe_regs.h new file +1280 -0

1,280 lines not on this page · raw message

drivers/net/sxe/include/sxe_version.h new file +29 -0
new file mode 100644
index 0000000000..fb58e73399

Lines of this file are not shown. View the raw message.

drivers/net/sxe/meson.build +14 -1
index dad9ee44a0..f75feb0cc9 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe.h new file +56 -0

56 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.c +323 -1

324 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ethdev.h +26 -1
index e31a23deeb..66034343ea 100644

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_irq.c new file +126 -0

126 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c new file +251 -0

251 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h new file +38 -0
new file mode 100644
index 0000000000..2947d88812

Lines of this file are not shown. View the raw message.

drivers/net/sxe/pf/sxe_pmd_hdc.c new file +683 -0

683 lines not on this page · raw message

drivers/net/sxe/pf/sxe_pmd_hdc.h new file +44 -0

44 lines not on this page · raw message

drivers/net/sxe/sxe_drv_type.h new file +19 -0
new file mode 100644
index 0000000000..1ccf0b3f87

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#97 lore raw

PATCH v7 3/14 net/sxe: add tx rx setup and data path

In reply to Jie Liu

Add setup, initialization, and logic for tx and rx queues.

---
 drivers/net/meson.build                   |    1 +
 drivers/net/sxe/base/sxe_offload_common.c |   54 +
 drivers/net/sxe/base/sxe_offload_common.h |   14 +
 drivers/net/sxe/base/sxe_queue_common.c   |  397 ++++++
 drivers/net/sxe/base/sxe_queue_common.h   |  240 ++++
 drivers/net/sxe/base/sxe_rx_common.c      |  243 ++++
 drivers/net/sxe/base/sxe_rx_common.h      |   19 +
 drivers/net/sxe/base/sxe_tx_common.c      |   41 +
 drivers/net/sxe/base/sxe_tx_common.h      |   12 +
 drivers/net/sxe/include/sxe_type.h        |  795 +++++++++++
 drivers/net/sxe/meson.build               |   10 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h          |   14 +
 drivers/net/sxe/pf/sxe.h                  |    1 +
 drivers/net/sxe/pf/sxe_ethdev.c           |  202 +++
 drivers/net/sxe/pf/sxe_irq.c              |  258 ++++
 drivers/net/sxe/pf/sxe_irq.h              |   11 +
 drivers/net/sxe/pf/sxe_main.c             |    7 +
 drivers/net/sxe/pf/sxe_offload.c          |   39 +
 drivers/net/sxe/pf/sxe_offload.h          |   18 +
 drivers/net/sxe/pf/sxe_queue.c            |  776 +++++++++++
 drivers/net/sxe/pf/sxe_queue.h            |  133 ++
 drivers/net/sxe/pf/sxe_rx.c               | 1491 +++++++++++++++++++++
 drivers/net/sxe/pf/sxe_rx.h               |  194 +++
 drivers/net/sxe/pf/sxe_tx.c               | 1072 +++++++++++++++
 drivers/net/sxe/pf/sxe_tx.h               |   50 +
 drivers/net/sxe/rte_pmd_sxe_version.map   |    5 +
 26 files changed, 6096 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.c
 create mode 100644 drivers/net/sxe/base/sxe_offload_common.h
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.c
 create mode 100644 drivers/net/sxe/base/sxe_queue_common.h
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_rx_common.h
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.c
 create mode 100644 drivers/net/sxe/base/sxe_tx_common.h
 create mode 100644 drivers/net/sxe/include/sxe_type.h
 create mode 100644 drivers/net/sxe/pf/rte_pmd_sxe.h
 create mode 100644 drivers/net/sxe/pf/sxe_offload.c
 create mode 100644 drivers/net/sxe/pf/sxe_offload.h
 create mode 100644 drivers/net/sxe/pf/sxe_queue.c
 create mode 100644 drivers/net/sxe/pf/sxe_queue.h
 create mode 100644 drivers/net/sxe/pf/sxe_rx.c
 create mode 100644 drivers/net/sxe/pf/sxe_rx.h
 create mode 100644 drivers/net/sxe/pf/sxe_tx.c
 create mode 100644 drivers/net/sxe/pf/sxe_tx.h
 create mode 100644 drivers/net/sxe/rte_pmd_sxe_version.map
drivers/net/meson.build +1 -0
index 61f8cddb30..453871764c 100644
@@ -65,6 +65,7 @@ drivers = [
         'vmxnet3',
         'xsc',
         'zxdh',
+	'sxe',
 ]
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
drivers/net/sxe/base/sxe_offload_common.c new file +54 -0

54 lines not on this page · raw message

drivers/net/sxe/base/sxe_offload_common.h new file +14 -0
new file mode 100644
index 0000000000..cbfb7fd93f
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_COMMON_H__
+#define __SXE_OFFLOAD_COMMON_H__
+
+u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 __sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/base/sxe_queue_common.c new file +397 -0

397 lines not on this page · raw message

drivers/net/sxe/base/sxe_queue_common.h new file +240 -0

240 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.c new file +243 -0

243 lines not on this page · raw message

drivers/net/sxe/base/sxe_rx_common.h new file +19 -0
new file mode 100644
index 0000000000..f9afb517d9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_RX_COMMON_H__
+#define __SXE_RX_COMMON_H__
+
+#include "sxe_dpdk_version.h"
+
+void __rte_cold __sxe_rx_function_set(struct rte_eth_dev *dev,
+	bool rx_batch_alloc_allowed, bool *rx_vec_allowed);
+
+s32 __sxe_rx_descriptor_status(void *rx_queue, u16 offset);
+
+u16 __sxe_pkts_recv(void *rx_queue, struct rte_mbuf **rx_pkts,
+		u16 pkts_num);
+
+const u32 *__sxe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements);
+#endif
drivers/net/sxe/base/sxe_tx_common.c new file +41 -0

41 lines not on this page · raw message

drivers/net/sxe/base/sxe_tx_common.h new file +12 -0
new file mode 100644
index 0000000000..2759ef5a7a
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_TX_COMMON_H__
+#define __SXE_TX_COMMON_H__
+
+int __sxe_tx_descriptor_status(void *tx_queue, u16 offset);
+
+u16 __sxe_pkts_xmit_with_offload(void *tx_queue, struct rte_mbuf **tx_pkts, u16 pkts_num);
+
+#endif
drivers/net/sxe/include/sxe_type.h new file +795 -0

795 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -1
index f75feb0cc9..2af37bce4c 100644
@@ -11,7 +11,15 @@ sources = files(
         'pf/sxe_main.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
+	'pf/sxe_offload.c',
+	'pf/sxe_queue.c',
+	'pf/sxe_rx.c',
+	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'base/sxe_queue_common.c',
+	'base/sxe_rx_common.c',
+	'base/sxe_tx_common.c',
+	'base/sxe_offload_common.c',
         'base/sxe_common.c',
         'base/sxe_hw.c',
 )
@@ -19,4 +27,4 @@ sources = files(
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
\ No newline at end of file
+includes += include_directories('include/')
drivers/net/sxe/pf/rte_pmd_sxe.h new file +14 -0
new file mode 100644
index 0000000000..64c1140490
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __PMD_SXE_H__
+#define __PMD_SXE_H__
+
+typedef uint8_t		u8;
+typedef uint16_t	u16;
+typedef uint32_t	u32;
+typedef int32_t		s32;
+
+s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+#endif
drivers/net/sxe/pf/sxe.h +1 -0
index c839e297a6..8e76a1f931 100644
@@ -44,6 +44,7 @@ struct sxe_adapter {
 
 	struct sxe_irq_context irq_ctxt;
 
+	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
 };
 
drivers/net/sxe/pf/sxe_ethdev.c +202 -0

276 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.c +258 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_irq.h +11 -0
index e0834aff2d..b2c5692932 100644
@@ -35,7 +35,18 @@ void sxe_event_irq_delayed_handler(void *param);
 
 void sxe_irq_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_irq_configure(struct rte_eth_dev *dev);
+
+void sxe_irq_enable(struct rte_eth_dev *eth_dev);
+
+void sxe_irq_disable(struct rte_eth_dev *eth_dev);
+
 void sxe_irq_uninit(struct rte_eth_dev *eth_dev);
 
+s32 sxe_rx_queue_intr_enable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+s32 sxe_rx_queue_intr_disable(struct rte_eth_dev *eth_dev, u16 queue_id);
+
+void sxe_irq_vec_free(struct rte_intr_handle *handle);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +7 -0
index 1701d75571..4761e721ca 100644
@@ -20,9 +20,11 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_STARS, SXE_DEV_ID_ASIC) },
@@ -164,10 +166,15 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 {
 	s32 ret;
 
+	/* Rx DBU off */
+	sxe_hw_rx_cap_switch_off(hw);
+
 	sxe_hw_all_irq_disable(hw);
 
 	sxe_hw_pending_irq_read_clear(hw);
 
+	sxe_hw_all_ring_disable(hw, SXE_HW_TXRX_RING_NUM_MAX);
+
 	ret = sxe_mng_reset(hw, false);
 	if (ret) {
 		PMD_LOG_ERR(INIT, "mng reset disable failed, ret=%d", ret);
drivers/net/sxe/pf/sxe_offload.c new file +39 -0
new file mode 100644
index 0000000000..7049efe606
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#include "sxe_dpdk_version.h"
+#include <ethdev_driver.h>
+
+#include "sxe.h"
+#include "sxe_offload.h"
+#include "sxe_logs.h"
+#include "sxe_compat_version.h"
+#include "sxe_queue_common.h"
+#include "sxe_offload_common.h"
+
+#define SXE_4_BIT_WIDTH  (CHAR_BIT / 2)
+#define SXE_4_BIT_MASK   RTE_LEN2MASK(SXE_4_BIT_WIDTH, u8)
+#define SXE_8_BIT_WIDTH  CHAR_BIT
+#define SXE_8_BIT_MASK   UINT8_MAX
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_queue_offload_capa_get(dev);
+}
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_rx_port_offload_capa_get(dev);
+}
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev)
+{
+	RTE_SET_USED(dev);
+
+	return 0;
+}
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev)
+{
+	return __sxe_tx_port_offload_capa_get(dev);
+}
drivers/net/sxe/pf/sxe_offload.h new file +18 -0
new file mode 100644
index 0000000000..a70d6bf94b
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_OFFLOAD_H__
+#define __SXE_OFFLOAD_H__
+
+#include "sxe_hw.h"
+
+u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
+
+u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
+
+#endif
drivers/net/sxe/pf/sxe_queue.c new file +776 -0

479 lines not on this page · raw message

drivers/net/sxe/pf/sxe_queue.h new file +133 -0

133 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.c new file +1491 -0

1,491 lines not on this page · raw message

drivers/net/sxe/pf/sxe_rx.h new file +194 -0

194 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.c new file +1072 -0

1,072 lines not on this page · raw message

drivers/net/sxe/pf/sxe_tx.h new file +50 -0

50 lines not on this page · raw message

drivers/net/sxe/rte_pmd_sxe_version.map new file +5 -0
new file mode 100644
index 0000000000..1a25862ca2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.

author
#98 lore raw

PATCH v7 4/14 net/sxe: add link, flow ctrl, mac ops, mtu ops function

In reply to Jie Liu

Add link, flow ctrl, mac ops, mtu ops function.

---
 drivers/net/sxe/meson.build        |   3 +
 drivers/net/sxe/pf/sxe.h           |  13 +-
 drivers/net/sxe/pf/sxe_ethdev.c    | 443 +++++++++++++-
 drivers/net/sxe/pf/sxe_filter.c    | 279 +++++++++
 drivers/net/sxe/pf/sxe_filter.h    |  53 ++
 drivers/net/sxe/pf/sxe_flow_ctrl.c |  98 +++
 drivers/net/sxe/pf/sxe_flow_ctrl.h |  16 +
 drivers/net/sxe/pf/sxe_irq.c       | 146 ++++-
 drivers/net/sxe/pf/sxe_main.c      |   2 +
 drivers/net/sxe/pf/sxe_phy.c       | 932 +++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_phy.h       |  77 +++
 11 files changed, 2050 insertions(+), 12 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_filter.c
 create mode 100644 drivers/net/sxe/pf/sxe_filter.h
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.c
 create mode 100644 drivers/net/sxe/pf/sxe_flow_ctrl.h
 create mode 100644 drivers/net/sxe/pf/sxe_phy.c
drivers/net/sxe/meson.build +3 -0
index 2af37bce4c..5ec2c3b843 100644
@@ -9,6 +9,8 @@ cflags += ['-DSXE_HOST_DRIVER']
 deps += ['hash']
 sources = files(
         'pf/sxe_main.c',
+	'pf/sxe_filter.c',
+        'pf/sxe_flow_ctrl.c',
         'pf/sxe_irq.c',
         'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
@@ -16,6 +18,7 @@ sources = files(
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
+        'pf/sxe_phy.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/sxe.h +11 -2
index 8e76a1f931..8f0037ebb0 100644
@@ -21,8 +21,6 @@ struct sxe_hw;
 #define PCI_VENDOR_ID_STARS	  0x1FF2
 #define SXE_DEV_ID_ASIC		  0x10a1
 
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-
 #ifdef RTE_PMD_PACKET_PREFETCH
 #define rte_packet_prefetch(p)  rte_prefetch1(p)
 #else
@@ -43,9 +41,20 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
+
+	u32 mtu;
+
+	RTE_ATOMIC(bool) link_thread_running;
+	RTE_ATOMIC(bool) is_stopping;
+	rte_thread_t link_thread_tid;
+	rte_atomic32_t link_thread_running;
+	rte_atomic32_t is_stopping;
+	pthread_t link_thread_tid;
+	bool is_stopped;
 };
 
 s32 sxe_hw_reset(struct sxe_hw *hw);
drivers/net/sxe/pf/sxe_ethdev.c +437 -6

606 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.c new file +279 -0

279 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h new file +53 -0

53 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.c new file +98 -0

98 lines not on this page · raw message

drivers/net/sxe/pf/sxe_flow_ctrl.h new file +16 -0
new file mode 100644
index 0000000000..fb124b11bd
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_FLOW_CTRL_H__
+#define __SXE_FLOW_CTRL_H__
+
+s32 sxe_flow_ctrl_enable(struct rte_eth_dev *dev);
+
+s32 sxe_flow_ctrl_get(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+s32 sxe_flow_ctrl_set(struct rte_eth_dev *dev,
+					struct rte_eth_fc_conf *fc_conf);
+
+#endif
drivers/net/sxe/pf/sxe_irq.c +142 -4

181 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +2 -0
index 4761e721ca..22418bf1ec 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_fc_autoneg_localcap_set(hw);
+
 	hw->mac.auto_restart = true;
 	PMD_LOG_INFO(INIT, "auto_restart:%u.", hw->mac.auto_restart);
 }
drivers/net/sxe/pf/sxe_phy.c new file +932 -0

932 lines not on this page · raw message

drivers/net/sxe/pf/sxe_phy.h +77 -0

82 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#99 lore raw

PATCH v7 5/14 net/sxe: support vlan filter

In reply to Jie Liu

Support vlan filter.

---
 drivers/net/sxe/base/sxe_offload_common.c |   4 +
 drivers/net/sxe/pf/sxe.h                  |   5 +-
 drivers/net/sxe/pf/sxe_filter.c           | 277 ++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h           |  13 +
 drivers/net/sxe/pf/sxe_main.c             |   2 +
 5 files changed, 300 insertions(+), 1 deletion(-)
drivers/net/sxe/base/sxe_offload_common.c +4 -0
index 48677863d7..cc35c16ddf 100644
@@ -14,6 +14,8 @@ u64 __sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev)
 
 	u64 offloads = 0;
 
+	offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
 	return offloads;
 }
 
@@ -28,6 +30,8 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 #ifdef DEV_RX_JUMBO_FRAME
 		   DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
+			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
 		   RTE_ETH_RX_OFFLOAD_SCATTER;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
drivers/net/sxe/pf/sxe.h +4 -1
index 8f0037ebb0..2936fbfbe2 100644
@@ -6,7 +6,7 @@
 
 #include <rte_pci.h>
 #include <rte_time.h>
-
+#include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
 #include "sxe_irq.h"
@@ -14,6 +14,7 @@
 #include "sxe_hw.h"
 
 struct sxe_hw;
+struct sxe_vlan_context;
 
 #define SXE_LPBK_DISABLED   0x0
 #define SXE_LPBK_ENABLED	0x1
@@ -41,6 +42,8 @@ struct sxe_adapter {
 	struct sxe_hw hw;
 
 	struct sxe_irq_context irq_ctxt;
+
+	struct sxe_vlan_context vlan_ctxt;
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +277 -0

280 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +13 -0
index 0f21f1ca81..a64b68374d 100644
@@ -44,10 +44,23 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
+
+s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
+			enum rte_vlan_type vlan_type, u16 tpid);
+
+s32 sxe_vlan_offload_set(struct rte_eth_dev *dev, s32 vlan_mask);
+
+void sxe_vlan_strip_queue_set(struct rte_eth_dev *dev, u16 queue, s32 on);
+
+void sxe_vlan_filter_configure(struct rte_eth_dev *dev);
+
 s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
 			  struct rte_ether_addr *mc_addr_list,
 			  u32 nb_mc_addr);
 
+void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
+
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 22418bf1ec..cc3145c09b 100644
@@ -201,6 +201,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 
 void sxe_hw_start(struct sxe_hw *hw)
 {
+	sxe_hw_vlan_filter_array_clear(hw);
+
 	sxe_fc_autoneg_localcap_set(hw);
 
 	hw->mac.auto_restart = true;
Signature · 1 line
2.18.4
author
#100 lore raw

PATCH v7 6/14 net/sxe: add filter function

In reply to Jie Liu

Add filter function.

---
 drivers/net/sxe/pf/sxe.h        |   4 +
 drivers/net/sxe/pf/sxe_filter.c | 191 ++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_filter.h |  29 +++++
 drivers/net/sxe/pf/sxe_main.c   |   1 +
 4 files changed, 225 insertions(+)
drivers/net/sxe/pf/sxe.h +4 -0
index 2936fbfbe2..660c0ab8b5 100644
@@ -44,6 +44,10 @@ struct sxe_adapter {
 	struct sxe_irq_context irq_ctxt;
 
 	struct sxe_vlan_context vlan_ctxt;
+	struct sxe_mac_filter_context mac_filter_ctxt;
+#ifdef RTE_ADAPTER_HAVE_FNAV_CONF
+	struct rte_eth_fdir_conf fnav_conf;
+#endif
 	struct sxe_phy_context phy_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_filter.c +191 -0

203 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +29 -0
index a64b68374d..da40c75d84 100644
@@ -19,6 +19,27 @@ struct sxe_adapter;
 		RTE_ALIGN((SXE_HW_TXRX_RING_NUM_MAX / (sizeof(u32) * BYTE_BIT_NUM)), \
 		sizeof(u32))
 
+struct sxe_vlan_context {
+	u32 vlan_hash_table[SXE_VFT_TBL_SIZE];
+	u32 strip_bitmap[SXE_VLAN_STRIP_BITMAP_SIZE];
+	u32  vlan_table_size;
+};
+
+enum sxe_uc_addr_src_type {
+	SXE_PF = 0,
+	SXE_VF,
+	SXE_VF_MACVLAN
+};
+
+struct sxe_uc_addr_table {
+	u8 rar_idx;
+	u8 pool_idx;
+	u8 type;
+	u8 original_index;
+	bool used;
+	u8 addr[SXE_MAC_ADDR_LEN];
+};
+
 struct sxe_mac_filter_context {
 	struct rte_ether_addr def_mac_addr;
 	struct rte_ether_addr cur_mac_addr;
@@ -35,6 +56,14 @@ struct sxe_mac_filter_context {
 
 s32 sxe_mac_addr_init(struct rte_eth_dev *eth_dev);
 
+s32 sxe_promiscuous_enable(struct rte_eth_dev *dev);
+
+s32 sxe_promiscuous_disable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_enable(struct rte_eth_dev *dev);
+
+s32 sxe_allmulticast_disable(struct rte_eth_dev *dev);
+
 s32 sxe_mac_addr_add(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr,
 				 u32 rar_idx, u32 pool);
drivers/net/sxe/pf/sxe_main.c +1 -0
index cc3145c09b..700934b378 100644
@@ -195,6 +195,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 		goto l_end;
 	}
 
+	sxe_hw_uc_addr_clear(hw);
 l_end:
 	return ret;
 }
Signature · 1 line
2.18.4
author
#101 lore raw

PATCH v7 7/14 net/sxe: support rss offload

In reply to Jie Liu

Support rss offload.

---
 drivers/net/sxe/base/sxe_offload_common.c |  11 +-
 drivers/net/sxe/pf/sxe.h                  |   2 +-
 drivers/net/sxe/pf/sxe_offload.c          | 300 +++++++++++++++++++++-
 drivers/net/sxe/pf/sxe_offload.h          |  33 +++
 4 files changed, 339 insertions(+), 7 deletions(-)
drivers/net/sxe/base/sxe_offload_common.c +6 -5
index cc35c16ddf..f87cce67a5 100644
@@ -24,15 +24,16 @@ u64 __sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev)
 	u64 rx_offload_capa;
 
 	rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
-		   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
-		   RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
+			RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+			RTE_ETH_RX_OFFLOAD_KEEP_CRC	|
 #ifdef DEV_RX_JUMBO_FRAME
-		   DEV_RX_OFFLOAD_JUMBO_FRAME |
+			DEV_RX_OFFLOAD_JUMBO_FRAME |
 #endif
 			RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
 			RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
-		   RTE_ETH_RX_OFFLOAD_SCATTER;
+			RTE_ETH_RX_OFFLOAD_SCATTER |
+			RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
 	if (!RTE_ETH_DEV_SRIOV(dev).active)
 		rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
drivers/net/sxe/pf/sxe.h +1 -1
index 660c0ab8b5..2199653e91 100644
@@ -54,7 +54,7 @@ struct sxe_adapter {
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
-
+	bool rss_reta_updated;
 	RTE_ATOMIC(bool) link_thread_running;
 	RTE_ATOMIC(bool) is_stopping;
 	rte_thread_t link_thread_tid;
drivers/net/sxe/pf/sxe_offload.c +299 -1

320 lines not on this page · raw message

drivers/net/sxe/pf/sxe_offload.h +33 -0
index a70d6bf94b..458b6464c5 100644
@@ -7,6 +7,21 @@
 
 #include "sxe_hw.h"
 
+#define SXE_RSS_OFFLOAD_ALL ( \
+		RTE_ETH_RSS_IPV4 | \
+		RTE_ETH_RSS_NONFRAG_IPV4_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
+		RTE_ETH_RSS_IPV6 | \
+		RTE_ETH_RSS_NONFRAG_IPV6_TCP | \
+		RTE_ETH_RSS_NONFRAG_IPV6_UDP)
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_FILTER_CTRL
+u8 *sxe_rss_hash_key_get(void);
+#endif
+
+void sxe_rss_hash_set(struct sxe_hw *hw,
+				struct rte_eth_rss_conf *rss_conf);
+
 u64 sxe_rx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_rx_port_offload_capa_get(struct rte_eth_dev *dev);
@@ -15,4 +30,22 @@ u64 sxe_tx_queue_offload_capa_get(struct rte_eth_dev *dev);
 
 u64 sxe_tx_port_offload_capa_get(struct rte_eth_dev *dev);
 
+void sxe_rss_disable(struct rte_eth_dev *dev);
+
+void sxe_rss_configure(struct rte_eth_dev *dev);
+
+s32 sxe_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			u16 reta_size);
+
+s32 sxe_rss_reta_query(struct rte_eth_dev *dev,
+			 struct rte_eth_rss_reta_entry64 *reta_conf,
+			 u16 reta_size);
+
+s32 sxe_rss_hash_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_conf *rss_conf);
+
+s32 sxe_rss_hash_conf_get(struct rte_eth_dev *dev,
+				struct rte_eth_rss_conf *rss_conf);
+
 #endif
Signature · 1 line
2.18.4
author
#102 lore raw

PATCH v7 8/14 net/sxe: add dcb function

In reply to Jie Liu

Add dcb function.

---
 drivers/net/sxe/meson.build             |   1 +
 drivers/net/sxe/pf/rte_pmd_sxe.h        |   2 +
 drivers/net/sxe/pf/sxe.h                |   2 +
 drivers/net/sxe/pf/sxe_dcb.c            | 946 ++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_dcb.h            |  99 +++
 drivers/net/sxe/pf/sxe_main.c           |   1 +
 drivers/net/sxe/pf/sxe_phy.c            |  34 +
 drivers/net/sxe/pf/sxe_phy.h            |   2 +
 drivers/net/sxe/pf/sxe_rx.c             |   1 -
 drivers/net/sxe/rte_pmd_sxe_version.map |   1 +
 10 files changed, 1088 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.c
 create mode 100644 drivers/net/sxe/pf/sxe_dcb.h
drivers/net/sxe/meson.build +1 -0
index 5ec2c3b843..2f528efe19 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
drivers/net/sxe/pf/rte_pmd_sxe.h +2 -0
index 64c1140490..16406c6c26 100644
@@ -11,4 +11,6 @@ typedef uint32_t	u32;
 typedef int32_t		s32;
 
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
+
+s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
 #endif
drivers/net/sxe/pf/sxe.h +2 -0
index 2199653e91..6ac0dba24e 100644
@@ -11,6 +11,7 @@
 #include "sxe_types.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
+#include "sxe_dcb.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -49,6 +50,7 @@ struct sxe_adapter {
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
 	s8 name[PCI_PRI_STR_SIZE + 1];
drivers/net/sxe/pf/sxe_dcb.c new file +946 -0

946 lines not on this page · raw message

drivers/net/sxe/pf/sxe_dcb.h new file +99 -0

99 lines not on this page · raw message

drivers/net/sxe/pf/sxe_main.c +1 -0
index 700934b378..6fc4a41703 100644
@@ -203,6 +203,7 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
 
drivers/net/sxe/pf/sxe_phy.c +34 -0
index 7d3c22f85a..787b16fb47 100644
@@ -737,6 +737,40 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter)
 	return ret;
 }
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx)
+{
+	s32 ret;
+	struct sxe_hw *hw = &adapter->hw;
+
+	if (!hw->fc.pause_time) {
+		LOG_ERROR_BDF("link fc disabled since pause time is 0");
+		ret = -SXE_ERR_INVALID_LINK_SETTINGS;
+		goto l_ret;
+	}
+
+	if (hw->fc.current_mode & SXE_FC_TX_PAUSE) {
+		if (!hw->fc.high_water[tc_idx] || !hw->fc.low_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+
+		if (hw->fc.low_water[tc_idx] >= hw->fc.high_water[tc_idx]) {
+			LOG_ERROR_BDF("Invalid water mark configuration");
+			ret = SXE_ERR_INVALID_LINK_SETTINGS;
+			goto l_ret;
+		}
+	}
+
+	sxe_fc_autoneg(adapter);
+
+	ret = sxe_hw_pfc_enable(hw, tc_idx);
+	if (ret)
+		PMD_LOG_ERR(INIT, "link fc enable failed, ret=%d", ret);
+
+l_ret:
+	return ret;
+}
 s32 sxe_sfp_identify(struct sxe_adapter *adapter)
 {
 	s32 ret;
drivers/net/sxe/pf/sxe_phy.h +2 -0
index a3d7dbf85b..9fd2746ec8 100644
@@ -105,6 +105,8 @@ s32 sxe_fc_enable(struct sxe_adapter *adapter);
 
 void sxe_link_info_get(struct sxe_adapter *adapter, u32 *link_speed, bool *link_up);
 
+s32 sxe_pfc_enable(struct sxe_adapter *adapter, u8 tc_idx);
+
 void sxe_sfp_link_capabilities_get(struct sxe_adapter *adapter, u32 *speed,
 							bool *autoneg);
 
drivers/net/sxe/pf/sxe_rx.c +0 -1
index 48e7393840..65cfcca4c9 100644
@@ -10,7 +10,6 @@
 #include <rte_atomic.h>
 #include <ethdev_driver.h>
 #include "sxe_ethdev.h"
-
 #include "sxe.h"
 #include "sxe_rx.h"
 #include "sxe_logs.h"
drivers/net/sxe/rte_pmd_sxe_version.map +1 -0
index 1a25862ca2..4b871872d6 100644
@@ -1,5 +1,6 @@
 EXPERIMENTAL {
     global:
     rte_pmd_sxe_tx_loopback_set;
+    rte_pmd_sxe_tc_bw_set;
     local: *;
 };
Signature · 1 line
2.18.4
author
#103 lore raw

PATCH v7 9/14 net/sxe: support ptp

In reply to Jie Liu

Add ptp module.

---
 drivers/net/sxe/meson.build  |   1 +
 drivers/net/sxe/pf/sxe.h     |   9 ++
 drivers/net/sxe/pf/sxe_ptp.c | 209 +++++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_ptp.h |  26 +++++
 4 files changed, 245 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.c
 create mode 100644 drivers/net/sxe/pf/sxe_ptp.h
drivers/net/sxe/meson.build +1 -0
index 2f528efe19..5bd44f3f65 100644
@@ -19,6 +19,7 @@ sources = files(
 	'pf/sxe_tx.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
+        'pf/sxe_ptp.c',
         'pf/sxe_dcb.c',
         'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
drivers/net/sxe/pf/sxe.h +9 -0
index 6ac0dba24e..d92540ac97 100644
@@ -39,6 +39,14 @@ struct sxe_vlan_context;
 #define rte_sxe_prefetch(p)   do {} while (0)
 #endif
 
+struct sxe_ptp_context {
+	struct rte_timecounter	  systime_tc;
+	struct rte_timecounter	  rx_tstamp_tc;
+	struct rte_timecounter	  tx_tstamp_tc;
+	u32 tx_hwtstamp_sec;
+	u32 tx_hwtstamp_nsec;
+};
+
 struct sxe_adapter {
 	struct sxe_hw hw;
 
@@ -49,6 +57,7 @@ struct sxe_adapter {
 #ifdef RTE_ADAPTER_HAVE_FNAV_CONF
 	struct rte_eth_fdir_conf fnav_conf;
 #endif
+	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_ptp.c new file +209 -0

209 lines not on this page · raw message

drivers/net/sxe/pf/sxe_ptp.h new file +26 -0
new file mode 100644
index 0000000000..14971b2d50
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_PTP_H__
+#define __SXE_PTP_H__
+
+s32 sxe_timesync_enable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_disable(struct rte_eth_dev *dev);
+
+s32 sxe_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp,
+				 u32 flags __rte_unused);
+
+s32 sxe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+				 struct timespec *timestamp);
+
+s32 sxe_timesync_adjust_time(struct rte_eth_dev *dev, s64 delta);
+
+s32 sxe_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts);
+
+s32 sxe_timesync_write_time(struct rte_eth_dev *dev,
+					const struct timespec *ts);
+
+#endif
Signature · 1 line
2.18.4
author
#104 lore raw

PATCH v7 10/14 net/sxe: add xstats function

In reply to Jie Liu

Add xstats function.

---
 drivers/net/sxe/meson.build    |   1 +
 drivers/net/sxe/pf/sxe.h       |   2 +
 drivers/net/sxe/pf/sxe_main.c  |   2 +
 drivers/net/sxe/pf/sxe_stats.c | 577 +++++++++++++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_stats.h |  71 ++++
 5 files changed, 653 insertions(+)
 create mode 100644 drivers/net/sxe/pf/sxe_stats.c
 create mode 100644 drivers/net/sxe/pf/sxe_stats.h
drivers/net/sxe/meson.build +1 -0
index 5bd44f3f65..b06cc4c1fe 100644
@@ -17,6 +17,7 @@ sources = files(
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
+	'pf/sxe_stats.c',
         'pf/sxe_pmd_hdc.c',
         'pf/sxe_phy.c',
         'pf/sxe_ptp.c',
drivers/net/sxe/pf/sxe.h +2 -0
index d92540ac97..6a1f90f4a5 100644
@@ -9,6 +9,7 @@
 #include "sxe_filter.h"
 #include <stdbool.h>
 #include "sxe_types.h"
+#include "sxe_stats.h"
 #include "sxe_irq.h"
 #include "sxe_phy.h"
 #include "sxe_dcb.h"
@@ -59,6 +60,7 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
drivers/net/sxe/pf/sxe_main.c +2 -0
index 6fc4a41703..bbee8035d6 100644
@@ -203,6 +203,8 @@ s32 sxe_hw_reset(struct sxe_hw *hw)
 void sxe_hw_start(struct sxe_hw *hw)
 {
 	sxe_hw_vlan_filter_array_clear(hw);
+
+	sxe_hw_stats_regs_clean(hw);
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/pf/sxe_stats.c new file +577 -0

577 lines not on this page · raw message

drivers/net/sxe/pf/sxe_stats.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#105 lore raw

PATCH v7 11/14 net/sxe: add custom cmd led ctrl

In reply to Jie Liu

Add custom cmd led ctrl.

---
 drivers/net/sxe/include/sxe/sxe_cli.h   | 218 ++++++++++++++++++++++++
 drivers/net/sxe/include/sxe/sxe_ioctl.h |  21 +++
 drivers/net/sxe/meson.build             |   2 +
 drivers/net/sxe/pf/sxe_main.c           |   3 +
 drivers/net/sxe/sxe_testpmd.c           |  65 +++++++
 5 files changed, 309 insertions(+)
 create mode 100644 drivers/net/sxe/include/sxe/sxe_cli.h
 create mode 100644 drivers/net/sxe/include/sxe/sxe_ioctl.h
 create mode 100644 drivers/net/sxe/sxe_testpmd.c
drivers/net/sxe/include/sxe/sxe_cli.h new file +218 -0
new file mode 100644
index 0000000000..623347dab2
@@ -0,0 +1,218 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+
+#ifndef __SXE_CLI_H__
+#define __SXE_CLI_H__
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+#define SXE_VERSION_LEN				  (32)
+#define SXE_MAC_NUM					 (128)
+#define SXE_PORT_TRANSCEIVER_LEN		(32)
+#define SXE_PORT_VENDOR_LEN			 (32)
+#define SXE_CHIP_TYPE_LEN			   (32)
+#define SXE_VPD_SN_LEN				  (16)
+#define SXE_SOC_RST_TIME				(0x93A80)
+#define SXE_SFP_TEMP_THRESHOLD_INTERVAL (3)
+#define MGC_TERMLOG_INFO_MAX_LEN		(12 * 1024)
+#define SXE_REGS_DUMP_MAX_LEN		   (12 * 1024)
+#define SXE_PRODUCT_NAME_LEN		(32)
+
+typedef enum sxe_led_mode {
+	SXE_IDENTIFY_LED_BLINK_ON   = 0,
+	SXE_IDENTIFY_LED_BLINK_OFF,
+	SXE_IDENTIFY_LED_ON,
+	SXE_IDENTIFY_LED_OFF,
+	SXE_IDENTIFY_LED_RESET,
+} sxe_led_mode_s;
+
+typedef struct sxe_led_ctrl {
+	U32	mode;
+	U32	duration;
+
+} sxe_led_ctrl_s;
+
+typedef struct sxe_led_ctrl_resp {
+	U32	ack;
+} sxe_led_ctrl_resp_s;
+
+typedef enum port_link_speed {
+	PORT_LINK_NO			= 0,
+	PORT_LINK_100M		  = 1,
+	PORT_LINK_1G			= 2,
+	PORT_LINK_10G		   = 3,
+} port_link_speed_e;
+
+typedef struct sys_soc_info {
+	S8	 fw_ver[SXE_VERSION_LEN];
+	S8	 opt_ver[SXE_VERSION_LEN];
+	U8	 soc_status;
+	U8	 pad[3];
+	S32	soc_temp;
+	U64	chipid;
+	S8	 chip_type[SXE_CHIP_TYPE_LEN];
+	S8	 pba[SXE_VPD_SN_LEN];
+	S8	 product_name[SXE_PRODUCT_NAME_LEN];
+} sys_soc_info_s;
+
+typedef struct sys_port_info {
+	U64	mac[SXE_MAC_NUM];
+	U8	 is_port_abs;
+	U8	 link_stat;
+	U8	 link_speed;
+
+
+	U8	 is_sfp:1;
+	U8	 is_get_info:1;
+	U8	 rvd:6;
+	S8	 optical_mod_temp;
+	U8	 pad[3];
+	S8	 transceiver_type[SXE_PORT_TRANSCEIVER_LEN];
+	S8	 vendor_name[SXE_PORT_VENDOR_LEN];
+	S8	 vendor_pn[SXE_PORT_VENDOR_LEN];
+} sys_port_info_s;
+
+typedef struct sys_info_resp {
+	sys_soc_info_s	 soc_info;
+	sys_port_info_s	port_info;
+} sys_info_resp_s;
+
+typedef enum sfp_temp_td_mode {
+	SFP_TEMP_THRESHOLD_MODE_ALARM   = 0,
+	SFP_TEMP_THRESHOLD_MODE_WARN,
+} sfp_temp_td_mode_e;
+
+typedef struct sfp_temp_td_set {
+	U8	 mode;
+	U8	 pad[3];
+	S8	 hthreshold;
+	S8	 lthreshold;
+} sfp_temp_td_set_s;
+
+typedef struct sxe_log_export_resp {
+	U16	cur_log_len;
+	U8	 is_end;
+	U8	 pad;
+	S32	session_id;
+	S8	 data[0];
+} sxe_log_export_resp_s;
+
+typedef enum sxe_log_export_type  {
+	SXE_LOG_EXPORT_REQ	= 0,
+	SXE_LOG_EXPORT_FIN,
+	SXE_LOG_EXPORT_ABORT,
+} sxe_log_export_type_e;
+
+typedef struct sxe_log_export_req {
+	U8	 is_all_log;
+	U8	 cmdtype;
+	U8	 is_begin;
+	U8	 pad;
+	S32	session_id;
+	U32	log_len;
+} sxe_log_export_req_s;
+
+typedef struct soc_rst_req {
+	U32	time;
+} soc_rst_req_s;
+
+typedef struct regs_dump_resp {
+	U32	curdw_len;
+	U8	 data[0];
+} regs_dump_resp_s;
+
+enum {
+	SXE_MFG_PART_NUMBER_LEN   = 8,
+	SXE_MFG_SERIAL_NUMBER_LEN = 16,
+	SXE_MFG_REVISION_LEN	  = 4,
+	SXE_MFG_OEM_STR_LEN	   = 64,
+	SXE_MFG_SXE_BOARD_ASSEMBLY_LEN  = 32,
+	SXE_MFG_SXE_BOARD_TRACE_NUM_LEN = 16,
+	SXE_MFG_SXE_MAC_ADDR_CNT		= 2,
+};
+
+typedef struct sxe_mfg_info {
+	U8 part_number[SXE_MFG_PART_NUMBER_LEN];
+	U8 serial_number[SXE_MFG_SERIAL_NUMBER_LEN];
+	U32 mfg_date;
+	U8 revision[SXE_MFG_REVISION_LEN];
+	U32 rework_date;
+	U8 pad[4];
+	U64 mac_addr[SXE_MFG_SXE_MAC_ADDR_CNT];
+	U8 board_trace_num[SXE_MFG_SXE_BOARD_TRACE_NUM_LEN];
+	U8 board_assembly[SXE_MFG_SXE_BOARD_ASSEMBLY_LEN];
+	U8 extra1[SXE_MFG_OEM_STR_LEN];
+	U8 extra2[SXE_MFG_OEM_STR_LEN];
+} sxe_mfg_info_t;
+
+typedef struct sxe_lldp_info {
+	U8	  lldp_state;
+	U8	  pad[3];
+} sxe_lldp_info_t;
+
+typedef struct regs_dump_req {
+	U32	base_addr;
+	U32	dw_len;
+} regs_dump_req_s;
+
+typedef enum sxe_pcs_mode {
+	SXE_PCS_MODE_1000BASE_KX_WO = 0,
+	SXE_PCS_MODE_1000BASE_KX_W,
+	SXE_PCS_MODE_SGMII,
+	SXE_PCS_MODE_10GBASE_KR_WO,
+	SXE_PCS_MODE_AUTO_NEGT_73,
+	SXE_PCS_MODE_LPBK_PHY_TX2RX,
+	SXE_PCS_MODE_LPBK_PHY_RX2TX,
+	SXE_PCS_MODE_LPBK_PCS_RX2TX,
+	SXE_PCS_MODE_BUTT,
+} sxe_pcs_mode_e;
+
+typedef enum sxe_remote_fault_mode {
+	SXE_REMOTE_FALUT_NO_ERROR		= 0,
+	SXE_REMOTE_FALUT_OFFLINE,
+	SXE_REMOTE_FALUT_LINK_FAILURE,
+	SXE_REMOTE_FALUT_AUTO_NEGOTIATION,
+	SXE_REMOTE_UNKNOWN,
+} sxe_remote_fault_e;
+
+typedef struct sxe_phy_cfg {
+	sxe_pcs_mode_e mode;
+	U32 mtu;
+} sxe_pcs_cfg_s;
+
+typedef enum sxe_an_speed {
+	SXE_AN_SPEED_NO_LINK = 0,
+	SXE_AN_SPEED_100M,
+	SXE_AN_SPEED_1G,
+	SXE_AN_SPEED_10G,
+	SXE_AN_SPEED_UNKNOWN,
+} sxe_an_speed_e;
+
+typedef enum sxe_phy_pause_cap {
+	SXE_PAUSE_CAP_NO_PAUSE	= 0,
+	SXE_PAUSE_CAP_ASYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_SYMMETRIC_PAUSE,
+	SXE_PAUSE_CAP_BOTH_PAUSE,
+	SXE_PAUSE_CAP_UNKNOWN,
+} sxe_phy_pause_cap_e;
+
+typedef enum sxe_phy_duplex_type {
+	SXE_FULL_DUPLEX	= 0,
+	SXE_HALF_DUPLEX	= 1,
+	SXE_UNKNOWN_DUPLEX,
+} sxe_phy_duplex_type_e;
+
+typedef struct sxe_phy_an_cap {
+	sxe_remote_fault_e   remote_fault;
+	sxe_phy_pause_cap_e  pause_cap;
+	sxe_phy_duplex_type_e duplex_cap;
+} sxe_phy_an_cap_s;
+
+typedef struct sxe_an_cap {
+	sxe_phy_an_cap_s local;
+	sxe_phy_an_cap_s peer;
+} sxe_an_cap_s;
+#endif
drivers/net/sxe/include/sxe/sxe_ioctl.h new file +21 -0
new file mode 100644
index 0000000000..4a4b0bc304
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C), 2022, Linkdata Technology Co., Ltd.
+ */
+#ifndef _SXE_IOCTL_H_
+#define _SXE_IOCTL_H_
+
+#ifdef SXE_HOST_DRIVER
+#include "sxe_drv_type.h"
+#endif
+
+struct sxe_ioctl_sync_cmd {
+	U64   traceid;
+	void *in_data;
+	U32   in_len;
+	void *out_data;
+	U32   out_len;
+};
+
+#define SXE_CMD_IOCTL_SYNC_CMD _IOWR('M', 1, struct sxe_ioctl_sync_cmd)
+
+#endif
drivers/net/sxe/meson.build +2 -0
index b06cc4c1fe..4ecf29ba6b 100644
@@ -30,6 +30,8 @@ sources = files(
         'base/sxe_hw.c',
 )
 
+testpmd_sources = files('sxe_testpmd.c')
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe_main.c +3 -0
index bbee8035d6..85bd87d495 100644
@@ -205,6 +205,9 @@ void sxe_hw_start(struct sxe_hw *hw)
 	sxe_hw_vlan_filter_array_clear(hw);
 
 	sxe_hw_stats_regs_clean(hw);
+
+	sxe_hw_no_snoop_disable(hw);
+
 	sxe_hw_dcb_rate_limiter_clear(hw, SXE_TXRX_RING_NUM_MAX);
 
 	sxe_fc_autoneg_localcap_set(hw);
drivers/net/sxe/sxe_testpmd.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#106 lore raw

PATCH v7 12/14 net/sxe: add simd function

In reply to Jie Liu

Add simd function.

---
 drivers/net/sxe/base/sxe_queue_common.c |  52 +-
 drivers/net/sxe/base/sxe_rx_common.c    | 125 ++++-
 drivers/net/sxe/meson.build             |   9 +
 drivers/net/sxe/pf/sxe.h                |   3 +
 drivers/net/sxe/pf/sxe_vec_common.h     | 315 ++++++++++++
 drivers/net/sxe/pf/sxe_vec_neon.c       | 603 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vec_sse.c        | 625 ++++++++++++++++++++++++
 7 files changed, 1725 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/sxe/pf/sxe_vec_common.h
 create mode 100644 drivers/net/sxe/pf/sxe_vec_neon.c
 create mode 100644 drivers/net/sxe/pf/sxe_vec_sse.c
drivers/net/sxe/base/sxe_queue_common.c +51 -1
index 2c08e24b43..978e56e98b 100644
@@ -14,6 +14,10 @@
 #include "sxe_logs.h"
 #include "sxe_regs.h"
 #include "sxe.h"
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+#include "sxe_vec_common.h"
+#include <rte_vect.h>
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
@@ -58,6 +62,10 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 	u16 len;
 	u64 offloads;
 	s32 ret = 0;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *pf_adapter = dev->data->dev_private;
+	struct sxevf_adapter *vf_adapter = dev->data->dev_private;
+#endif
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -162,6 +170,23 @@ s32 __rte_cold __sxe_rx_queue_setup(struct rx_setup *rx_setup, bool is_vf)
 				"dma_addr=0x%" SXE_PRIX64,
 			 rxq->buffer_ring, rxq->sc_buffer_ring, rxq->desc_ring,
 			 rxq->base_addr);
+
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (!rte_is_power_of_2(desc_num)) {
+		PMD_LOG_DEBUG(INIT, "queue[%d] doesn't meet Vector Rx "
+					"preconditions - canceling the feature for "
+					"the whole port[%d]",
+				 rxq->queue_id, rxq->port_id);
+		if (is_vf)
+			vf_adapter->rx_vec_allowed = false;
+		else
+			pf_adapter->rx_vec_allowed = false;
+
+	} else {
+		sxe_rxq_vec_setup(rxq);
+	}
+#endif
+
 	dev->data->rx_queues[queue_idx] = rxq;
 
 	sxe_rx_queue_init(*rx_setup->rx_batch_alloc_allowed, rxq);
@@ -255,6 +280,9 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 		struct rte_eth_recycle_rxq_info *q_info)
 {
 	struct sxe_rx_queue *rxq;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	struct sxe_adapter *adapter = dev->data->dev_private;
+#endif
 
 	rxq = dev->data->rx_queues[queue_id];
 
@@ -262,9 +290,21 @@ void __sxe_recycle_rxq_info_get(struct rte_eth_dev *dev, u16 queue_id,
 	q_info->mp = rxq->mb_pool;
 	q_info->mbuf_ring_size = rxq->ring_depth;
 	q_info->receive_tail = &rxq->processing_idx;
-
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	if (adapter->rx_vec_allowed) {
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM)
+		q_info->refill_requirement = rxq->realloc_num;
+		q_info->refill_head = &rxq->realloc_start;
+#endif
+	} else {
+		q_info->refill_requirement = rxq->batch_alloc_size;
+		q_info->refill_head = &rxq->batch_alloc_trigger;
+	}
+#else
 	q_info->refill_requirement = rxq->batch_alloc_size;
 	q_info->refill_head = &rxq->batch_alloc_trigger;
+#endif
+	return;
 }
 
 void __sxe_tx_queue_info_get(struct rte_eth_dev *dev, u16 queue_id,
@@ -290,7 +330,17 @@ s32 __sxe_tx_done_cleanup(void *tx_queue, u32 free_cnt)
 	struct sxe_tx_queue *txq = (struct sxe_tx_queue *)tx_queue;
 	if (txq->offloads == 0 &&
 		txq->rs_thresh >= RTE_PMD_SXE_MAX_TX_BURST) {
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+		if (txq->rs_thresh <= RTE_SXE_MAX_TX_FREE_BUF_SZ &&
+			(rte_eal_process_type() != RTE_PROC_PRIMARY ||
+			txq->buffer_ring_vec != NULL)) {
+			ret = sxe_tx_done_cleanup_vec(txq, free_cnt);
+		} else {
+			ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+		}
+#else
 		ret = sxe_tx_done_cleanup_simple(txq, free_cnt);
+#endif
 
 	} else {
 		ret = sxe_tx_done_cleanup_full(txq, free_cnt);
drivers/net/sxe/base/sxe_rx_common.c +119 -6

181 lines not on this page · raw message

drivers/net/sxe/meson.build +9 -0
index 4ecf29ba6b..f53ca7ecaf 100644
@@ -2,6 +2,9 @@
 # Copyright (C), 2022, Linkdata Technology Co., Ltd.
 cflags += ['-DSXE_DPDK']
 cflags += ['-DSXE_HOST_DRIVER']
+cflags += ['-DSXE_DPDK_L4_FEATURES']
+cflags += ['-DSXE_DPDK_SRIOV']
+cflags += ['-DSXE_DPDK_SIMD']
 
 #subdir('base')
 #objs = [base_objs]
@@ -32,6 +35,12 @@ sources = files(
 
 testpmd_sources = files('sxe_testpmd.c')
 
+if arch_subdir == 'x86'
+	sources += files('pf/sxe_vec_sse.c')
+elif arch_subdir == 'arm'
+	sources += files('pf/sxe_vec_neon.c')
+endif
+
 includes += include_directories('base')
 includes += include_directories('pf')
 includes += include_directories('include/sxe/')
drivers/net/sxe/pf/sxe.h +3 -0
index 6a1f90f4a5..1b24a9b9e7 100644
@@ -64,6 +64,9 @@ struct sxe_adapter {
 	struct sxe_dcb_context dcb_ctxt;
 
 	bool rx_batch_alloc_allowed;
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
+	bool rx_vec_allowed;
+#endif
 	s8 name[PCI_PRI_STR_SIZE + 1];
 
 	u32 mtu;
drivers/net/sxe/pf/sxe_vec_common.h new file +315 -0

315 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_neon.c new file +603 -0

603 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vec_sse.c new file +625 -0

625 lines not on this page · raw message

Signature · 1 line
2.18.4
author
#107 lore raw

PATCH v7 13/14 net/sxe: add virtual function

In reply to Jie Liu

Add virtual function.

---
 drivers/net/sxe/base/sxe_queue_common.c |    4 +
 drivers/net/sxe/base/sxevf_hw.c         |  951 +++++++++++++++
 drivers/net/sxe/base/sxevf_hw.h         |  349 ++++++
 drivers/net/sxe/base/sxevf_regs.h       |  119 ++
 drivers/net/sxe/meson.build             |   37 +-
 drivers/net/sxe/pf/rte_pmd_sxe.h        |    4 +-
 drivers/net/sxe/pf/sxe.h                |    5 +-
 drivers/net/sxe/pf/sxe_filter.c         |  177 +++
 drivers/net/sxe/pf/sxe_filter.h         |   15 +
 drivers/net/sxe/pf/sxe_main.c           |    2 +
 drivers/net/sxe/pf/sxe_phy.h            |    1 +
 drivers/net/sxe/pf/sxe_stats.c          |    9 +-
 drivers/net/sxe/pf/sxe_vf.c             | 1427 +++++++++++++++++++++++
 drivers/net/sxe/pf/sxe_vf.h             |  219 ++++
 drivers/net/sxe/sxe_testpmd.c           |  130 +++
 drivers/net/sxe/vf/sxevf.h              |   43 +
 drivers/net/sxe/vf/sxevf_ethdev.c       |  768 ++++++++++++
 drivers/net/sxe/vf/sxevf_ethdev.h       |   16 +
 drivers/net/sxe/vf/sxevf_filter.c       |  493 ++++++++
 drivers/net/sxe/vf/sxevf_filter.h       |   70 ++
 drivers/net/sxe/vf/sxevf_irq.c          |  434 +++++++
 drivers/net/sxe/vf/sxevf_irq.h          |   35 +
 drivers/net/sxe/vf/sxevf_main.c         |   83 ++
 drivers/net/sxe/vf/sxevf_msg.c          |  624 ++++++++++
 drivers/net/sxe/vf/sxevf_msg.h          |  201 ++++
 drivers/net/sxe/vf/sxevf_offload.c      |   31 +
 drivers/net/sxe/vf/sxevf_offload.h      |   16 +
 drivers/net/sxe/vf/sxevf_queue.c        |  210 ++++
 drivers/net/sxe/vf/sxevf_queue.h        |   70 ++
 drivers/net/sxe/vf/sxevf_rx.c           |  163 +++
 drivers/net/sxe/vf/sxevf_rx.h           |   18 +
 drivers/net/sxe/vf/sxevf_stats.c        |  162 +++
 drivers/net/sxe/vf/sxevf_stats.h        |   31 +
 drivers/net/sxe/vf/sxevf_tx.c           |   46 +
 drivers/net/sxe/vf/sxevf_tx.h           |   14 +
 35 files changed, 6958 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/sxe/base/sxevf_hw.c
 create mode 100644 drivers/net/sxe/base/sxevf_hw.h
 create mode 100644 drivers/net/sxe/base/sxevf_regs.h
 create mode 100644 drivers/net/sxe/pf/sxe_vf.c
 create mode 100644 drivers/net/sxe/pf/sxe_vf.h
 create mode 100644 drivers/net/sxe/vf/sxevf.h
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.c
 create mode 100644 drivers/net/sxe/vf/sxevf_ethdev.h
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.c
 create mode 100644 drivers/net/sxe/vf/sxevf_filter.h
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.c
 create mode 100644 drivers/net/sxe/vf/sxevf_irq.h
 create mode 100644 drivers/net/sxe/vf/sxevf_main.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.c
 create mode 100644 drivers/net/sxe/vf/sxevf_msg.h
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.c
 create mode 100644 drivers/net/sxe/vf/sxevf_offload.h
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.c
 create mode 100644 drivers/net/sxe/vf/sxevf_queue.h
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_rx.h
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.c
 create mode 100644 drivers/net/sxe/vf/sxevf_stats.h
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.c
 create mode 100644 drivers/net/sxe/vf/sxevf_tx.h
drivers/net/sxe/base/sxe_queue_common.c +4 -0
index 978e56e98b..914718769f 100644
@@ -13,11 +13,15 @@
 #include "sxe_tx.h"
 #include "sxe_logs.h"
 #include "sxe_regs.h"
+#include "sxevf_regs.h"
 #include "sxe.h"
 #if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SIMD
 #include "sxe_vec_common.h"
 #include <rte_vect.h>
 #endif
+#if defined SXE_DPDK_L4_FEATURES && defined SXE_DPDK_SRIOV
+#include "sxevf.h"
+#endif
 #include "sxe_queue_common.h"
 #include "sxe_queue.h"
 
drivers/net/sxe/base/sxevf_hw.c new file +951 -0

951 lines not on this page · raw message

drivers/net/sxe/base/sxevf_hw.h new file +349 -0

349 lines not on this page · raw message

drivers/net/sxe/base/sxevf_regs.h new file +119 -0

119 lines not on this page · raw message

drivers/net/sxe/meson.build +25 -12
index f53ca7ecaf..a3b874b7e2 100644
@@ -11,26 +11,38 @@ cflags += ['-DSXE_DPDK_SIMD']
 
 deps += ['hash']
 sources = files(
-        'pf/sxe_main.c',
+    'pf/sxe_main.c',
 	'pf/sxe_filter.c',
-        'pf/sxe_flow_ctrl.c',
-        'pf/sxe_irq.c',
-        'pf/sxe_ethdev.c',
+    'pf/sxe_flow_ctrl.c',
+    'pf/sxe_irq.c',
+    'pf/sxe_ethdev.c',
 	'pf/sxe_offload.c',
 	'pf/sxe_queue.c',
 	'pf/sxe_rx.c',
 	'pf/sxe_tx.c',
 	'pf/sxe_stats.c',
-        'pf/sxe_pmd_hdc.c',
-        'pf/sxe_phy.c',
-        'pf/sxe_ptp.c',
-        'pf/sxe_dcb.c',
-        'base/sxe_queue_common.c',
+	'pf/sxe_pmd_hdc.c',
+    'pf/sxe_phy.c',
+    'pf/sxe_ptp.c',
+    'pf/sxe_vf.c',
+    'pf/sxe_dcb.c',
+    'vf/sxevf_main.c',
+	'vf/sxevf_filter.c',
+	'vf/sxevf_irq.c',
+	'vf/sxevf_msg.c',
+	'vf/sxevf_ethdev.c',
+	'vf/sxevf_stats.c',
+	'vf/sxevf_rx.c',
+	'vf/sxevf_tx.c',
+	'vf/sxevf_queue.c',
+	'vf/sxevf_offload.c',
+    'base/sxe_queue_common.c',
 	'base/sxe_rx_common.c',
 	'base/sxe_tx_common.c',
 	'base/sxe_offload_common.c',
-        'base/sxe_common.c',
-        'base/sxe_hw.c',
+    'base/sxe_common.c',
+    'base/sxe_hw.c',
+    'base/sxevf_hw.c',
 )
 
 testpmd_sources = files('sxe_testpmd.c')
@@ -43,5 +55,6 @@ endif
 
 includes += include_directories('base')
 includes += include_directories('pf')
+includes += include_directories('vf')
 includes += include_directories('include/sxe/')
-includes += include_directories('include/')
+includes += include_directories('include/')
\ No newline at end of file
drivers/net/sxe/pf/rte_pmd_sxe.h +3 -1
index 16406c6c26..69b0df2bd1 100644
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (C), 2022, Linkdata Technology Co., Ltd.
  */
-
 #ifndef __PMD_SXE_H__
 #define __PMD_SXE_H__
 
@@ -13,4 +12,7 @@ typedef int32_t		s32;
 s32 rte_pmd_sxe_tx_loopback_set(u16 port, u8 on);
 
 s32 rte_pmd_sxe_tc_bw_set(u8 port, u8 tc_num, u8 *bw_weight);
+
+int rte_pmd_sxe_set_vf_rxmode(u16 port, u16 vf,
+u16 rx_mask, u8 on);
 #endif
drivers/net/sxe/pf/sxe.h +4 -1
index 1b24a9b9e7..212929cf04 100644
@@ -11,8 +11,9 @@
 #include "sxe_types.h"
 #include "sxe_stats.h"
 #include "sxe_irq.h"
-#include "sxe_phy.h"
+#include "sxe_vf.h"
 #include "sxe_dcb.h"
+#include "sxe_phy.h"
 #include "sxe_hw.h"
 
 struct sxe_hw;
@@ -60,6 +61,8 @@ struct sxe_adapter {
 #endif
 	struct sxe_ptp_context ptp_ctxt;
 	struct sxe_phy_context phy_ctxt;
+	struct sxe_virtual_context vt_ctxt;
+
 	struct sxe_stats_info stats_info;
 	struct sxe_dcb_context dcb_ctxt;
 
drivers/net/sxe/pf/sxe_filter.c +177 -0

202 lines not on this page · raw message

drivers/net/sxe/pf/sxe_filter.h +15 -0
index da40c75d84..de6170a3f4 100644
@@ -73,6 +73,15 @@ void sxe_mac_addr_remove(struct rte_eth_dev *dev, u32 rar_idx);
 s32 sxe_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 
+s32 sxe_uc_hash_table_set(struct rte_eth_dev *dev,
+			struct rte_ether_addr *mac_addr, u8 on);
+
+s32 sxe_uc_all_hash_table_set(struct rte_eth_dev *dev, u8 on);
+
+s32 sxe_set_mc_addr_list(struct rte_eth_dev *dev,
+			  struct rte_ether_addr *mc_addr_list,
+			  u32 nb_mc_addr);
+
 s32 sxe_vlan_filter_set(struct rte_eth_dev *eth_dev, u16 vlan_id, s32 on);
 
 s32 sxe_vlan_tpid_set(struct rte_eth_dev *eth_dev,
@@ -92,4 +101,10 @@ void sxe_vlan_strip_switch_set(struct rte_eth_dev *dev);
 
 void sxe_fc_mac_addr_set(struct sxe_adapter *adapter);
 
+u8 sxe_sw_uc_entry_vf_add(struct sxe_adapter *adapter,
+				u8 vf_idx, u8 *mac_addr, bool macvlan);
+
+void sxe_sw_uc_entry_vf_del(struct sxe_adapter *adapter, u8 vf_idx,
+					bool macvlan);
+
 #endif
drivers/net/sxe/pf/sxe_main.c +2 -0
index 85bd87d495..49f9dd2f27 100644
@@ -20,10 +20,12 @@
 #include "sxe_ethdev.h"
 #include "sxe.h"
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_queue.h"
 #include "sxe_errno.h"
 #include "sxe_compat_platform.h"
 #include "sxe_pmd_hdc.h"
+#include "sxe_vf.h"
 #include "sxe_queue.h"
 
 static const struct rte_pci_id sxe_pci_tbl[] = {
drivers/net/sxe/pf/sxe_phy.h +1 -0
index 9fd2746ec8..d907b3c8f8 100644
@@ -6,6 +6,7 @@
 
 #include <rte_ethdev.h>
 #include "drv_msg.h"
+#include "sxe_cli.h"
 #include "sxe_msg.h"
 
 #define SXE_SFF_BASE_ADDR			0x0
drivers/net/sxe/pf/sxe_stats.c +4 -5
index 6b9e1beb3e..af3c0bf84c 100644
@@ -219,10 +219,9 @@ s32 sxe_xstats_get(struct rte_eth_dev *eth_dev,
 	u8 prio;
 
 	cnt = SXE_XSTAT_CNT;
-	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt:%u "
-			"fc xstat field cnt:%u ", cnt,
-			SXE_XSTAT_MAC_CNT,
-			SXE_XSTAT_FC_CNT);
+	PMD_LOG_INFO(DRV, "xstat size:%u. hw xstat field cnt: %" SXE_PRIU64
+			"fc xstat field cnt: %" SXE_PRIU64, cnt,
+			SXE_XSTAT_MAC_CNT, SXE_XSTAT_FC_CNT);
 
 	if (usr_cnt < cnt) {
 		ret = cnt;
@@ -333,7 +332,7 @@ s32 sxe_xstats_names_get(__rte_unused struct rte_eth_dev *dev,
 
 	if (usr_cnt < SXE_XSTAT_CNT) {
 		ret = -SXE_ERR_PARAM;
-		PMD_LOG_ERR(DRV, "max:%u usr_cnt:%u invalid.(err:%d)",
+		PMD_LOG_ERR(DRV, "max: %" SXE_PRIU64 " usr_cnt:%u invalid.(err:%d)",
 				SXE_XSTAT_CNT, usr_cnt, ret);
 		goto l_out;
 	}
drivers/net/sxe/pf/sxe_vf.c new file +1427 -0

1,210 lines not on this page · raw message

drivers/net/sxe/pf/sxe_vf.h new file +219 -0

219 lines not on this page · raw message

drivers/net/sxe/sxe_testpmd.c +130 -0

130 lines not on this page · raw message

drivers/net/sxe/vf/sxevf.h new file +43 -0

43 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.c new file +768 -0

768 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_ethdev.h new file +16 -0
new file mode 100644
index 0000000000..57dfeea2e6

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_filter.c new file +493 -0

493 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_filter.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.c new file +434 -0

434 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_irq.h new file +35 -0
new file mode 100644
index 0000000000..def1167af7

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_main.c new file +83 -0

83 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.c new file +624 -0

624 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_msg.h new file +201 -0

201 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_offload.c new file +31 -0
new file mode 100644
index 0000000000..4b0eacf7f0

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_offload.h new file +16 -0
new file mode 100644
index 0000000000..ae4bf87f30

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_queue.c new file +210 -0

210 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_queue.h new file +70 -0

70 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.c new file +163 -0

163 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_rx.h new file +18 -0
new file mode 100644
index 0000000000..55ca2705c1

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_stats.c new file +162 -0

162 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_stats.h new file +31 -0
new file mode 100644
index 0000000000..ddf56c39df

Lines of this file are not shown. View the raw message.

drivers/net/sxe/vf/sxevf_tx.c new file +46 -0

46 lines not on this page · raw message

drivers/net/sxe/vf/sxevf_tx.h new file +14 -0
new file mode 100644
index 0000000000..c8ad400bca

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.4

Part of the diff is not shown here. View the raw message.