diff mbox series

[5/5] net/nfp: use ctrl extend to check the mode of features

Message ID 20231213032416.1988817-6-chaoyong.he@corigine.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series unify the usage of capacity and control |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS

Commit Message

Chaoyong He Dec. 13, 2023, 3:24 a.m. UTC 
  Use the 'ctrl_extend' rather than 'cap_extend' to check the switch mode
of features.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
 drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 4 +---
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 4 +---
 drivers/net/nfp/nfp_ethdev.c       | 5 +++--
 drivers/net/nfp/nfp_net_common.c   | 2 +-
 drivers/net/nfp/nfp_rxtx.c         | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 56e57abacb..fbc2dbedf4 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -145,13 +145,11 @@  nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,
 	char *meta;
 	uint8_t layer = 0;
 	uint32_t meta_info;
-	uint32_t cap_extend;
 	struct nfp_net_hw *hw;
 	uint8_t vlan_layer = 0;
 	uint8_t ipsec_layer = 0;
 
 	hw = txq->hw;
-	cap_extend = hw->super.cap_ext;
 
 	if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
 			(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -162,7 +160,7 @@  nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,
 	}
 
 	if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&
-			(cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {
+			(hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) {
 		uint32_t ipsec_type = NFP_NET_META_IPSEC |
 				NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |
 				NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE);
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index fbf132347d..72efbffb42 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -175,7 +175,6 @@  nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
 	char *meta;
 	uint8_t layer = 0;
 	uint32_t meta_type;
-	uint32_t cap_extend;
 	struct nfp_net_hw *hw;
 	uint32_t header_offset;
 	uint8_t vlan_layer = 0;
@@ -184,7 +183,6 @@  nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
 
 	memset(&meta_data, 0, sizeof(meta_data));
 	hw = txq->hw;
-	cap_extend = hw->super.cap_ext;
 
 	if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
 			(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -195,7 +193,7 @@  nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
 	}
 
 	if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&
-			(cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {
+			(hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) {
 		uint32_t ipsec_type = NFP_NET_META_IPSEC |
 				NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |
 				NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE);
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 185b570892..886b568d96 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -303,8 +303,9 @@  nfp_net_start(struct rte_eth_dev *dev)
 		ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE;
 
 	if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0)
-		ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP
-				| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
+		ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC |
+				NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP |
+				NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
 
 	/* Enable flow steer by extend ctrl word1. */
 	if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index fed36dac53..a438eb5871 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1371,7 +1371,7 @@  nfp_net_supported_ptypes_get(struct rte_eth_dev *dev)
 		return NULL;
 
 	net_hw = dev->data->dev_private;
-	if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
+	if ((net_hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
 		return NULL;
 
 	return ptypes;
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index f775f25cb2..cbcf57d769 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -617,7 +617,7 @@  nfp_net_parse_ptype(struct nfp_net_rxq *rxq,
 	struct nfp_ptype_parsed nfp_ptype;
 	uint16_t rxd_ptype = rxds->rxd.offload_info;
 
-	if ((hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
+	if ((hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
 		return;
 
 	if (rxd_ptype == 0 || (rxds->rxd.flags & PCIE_DESC_RX_VLAN) != 0)