Extract the 'cap' and 'cap_ext' data field into the super class, ready
for the upcoming common library.
Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
---
drivers/net/nfp/flower/nfp_flower.c | 6 +-
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 12 ++--
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 14 ++---
drivers/net/nfp/nfp_ethdev.c | 14 ++---
drivers/net/nfp/nfp_ethdev_vf.c | 10 +--
drivers/net/nfp/nfp_ipsec.c | 4 +-
drivers/net/nfp/nfp_net_common.c | 98 +++++++++++++++--------------
drivers/net/nfp/nfp_net_common.h | 10 ++-
drivers/net/nfp/nfp_rxtx.c | 2 +-
9 files changed, 89 insertions(+), 81 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 60d843451e..453080f521 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -65,7 +65,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)
update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |
NFP_NET_CFG_UPDATE_MSIX;
- if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
+ if (hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG)
new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;
/* If an error when reconfig we avoid to change hw state */
@@ -101,7 +101,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_RSS;
- if ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RSS2) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RSS2;
else
new_ctrl |= NFP_NET_CFG_CTRL_RSS;
@@ -111,7 +111,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
- if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index b64dbaca0d..bbf4530ae9 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -30,7 +30,7 @@ nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
goto clean_txd;
ol_flags = mb->ol_flags;
@@ -69,7 +69,7 @@ nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
return;
ol_flags = mb->ol_flags;
@@ -127,8 +127,8 @@ nfp_net_nfd3_tx_vlan(struct nfp_net_txq *txq,
{
struct nfp_net_hw *hw = txq->hw;
- if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||
- (hw->cap & NFP_NET_CFG_CTRL_TXVLAN) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||
+ (hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) == 0)
return;
if ((mb->ol_flags & RTE_MBUF_F_TX_VLAN) != 0) {
@@ -151,7 +151,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw
*meta_data,
uint8_t ipsec_layer = 0;
hw = txq->hw;
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -278,7 +278,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,
}
if (unlikely(pkt->nb_segs > 1 &&
- (hw->cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {
+ (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
PMD_TX_LOG(ERR, "Multisegment packet not supported");
goto xmit_end;
}
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 259039964a..807666686f 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -23,7 +23,7 @@ nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
return flags;
ol_flags = mb->ol_flags;
@@ -57,7 +57,7 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,
txd.raw = 0;
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
return txd.raw;
ol_flags = mb->ol_flags;
@@ -146,7 +146,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
return -EINVAL;
/* Count TSO descriptor */
- if ((txq->hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((txq->hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)
n_descs++;
@@ -184,7 +184,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
memset(&meta_data, 0, sizeof(meta_data));
hw = txq->hw;
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -322,7 +322,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
nfp_net_nfdk_set_meta_data(pkt, txq, &metadata);
if (unlikely(pkt->nb_segs > 1 &&
- (hw->cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {
+ (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
PMD_TX_LOG(ERR, "Multisegment packet not supported");
goto xmit_end;
}
@@ -332,7 +332,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
* multisegment packet, but TSO info needs to be in all of them.
*/
dma_len = pkt->data_len;
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) {
type = NFDK_DESC_TX_TYPE_TSO;
} else if (pkt->next == NULL && dma_len <=
NFDK_TX_MAX_DATA_PER_HEAD) {
@@ -405,7 +405,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_cksum(txq,
temp_pkt, metadata));
ktxds++;
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(temp_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) !=
0) {
ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_tso(txq,
temp_pkt));
ktxds++;
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index d32a82210c..8ac2acea7b 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -119,7 +119,7 @@ nfp_net_start(struct rte_eth_dev *dev)
if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {
nfp_net_rss_config_default(dev);
update |= NFP_NET_CFG_UPDATE_RSS;
- new_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);
+ new_ctrl |= nfp_net_cfg_ctrl_rss(hw->super.cap);
}
/* Enable device */
@@ -128,19 +128,19 @@ nfp_net_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
/* Enable vxlan */
- if ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {
new_ctrl |= NFP_NET_CFG_CTRL_VXLAN;
update |= NFP_NET_CFG_UPDATE_VXLAN;
}
- if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
return -EIO;
/* Enable packet type offload by extend ctrl word1. */
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0)
ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE;
@@ -579,8 +579,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
hw->mtu = RTE_ETHER_MTU;
/* VLAN insertion is incompatible with LSOv2 */
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)
- hw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO2) != 0)
+ hw->super.cap &= ~NFP_NET_CFG_CTRL_TXVLAN;
nfp_net_log_device_information(hw);
@@ -608,7 +608,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
/* Copying mac address to DPDK eth_dev struct */
rte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);
- if ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)
eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;
eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 51c474275e..293d1ed53c 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -86,7 +86,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {
nfp_net_rss_config_default(dev);
update |= NFP_NET_CFG_UPDATE_RSS;
- new_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);
+ new_ctrl |= nfp_net_cfg_ctrl_rss(hw->super.cap);
}
/* Enable device */
@@ -94,7 +94,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
- if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
@@ -314,8 +314,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
hw->mtu = RTE_ETHER_MTU;
/* VLAN insertion is incompatible with LSOv2 */
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)
- hw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO2) != 0)
+ hw->super.cap &= ~NFP_NET_CFG_CTRL_TXVLAN;
nfp_net_log_device_information(hw);
@@ -341,7 +341,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
/* Copying mac address to DPDK eth_dev struct */
rte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);
- if ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)
eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;
eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c
index af85e8575c..e080e71db2 100644
--- a/drivers/net/nfp/nfp_ipsec.c
+++ b/drivers/net/nfp/nfp_ipsec.c
@@ -1382,7 +1382,7 @@ nfp_ipsec_init(struct rte_eth_dev *dev)
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) {
PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability");
return 0;
@@ -1429,7 +1429,7 @@ nfp_ipsec_uninit(struct rte_eth_dev *dev)
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) {
PMD_INIT_LOG(INFO, "Unsupported IPsec extend capability");
return;
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 189f81bbb6..77c0652642 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -408,7 +408,7 @@ nfp_net_configure(struct rte_eth_dev *dev)
/* Checking RX mode */
if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 &&
- (hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
+ (hw->super.cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
PMD_DRV_LOG(ERR, "RSS not supported");
return -EINVAL;
}
@@ -426,27 +426,29 @@ nfp_net_configure(struct rte_eth_dev *dev)
void
nfp_net_log_device_information(const struct nfp_net_hw *hw)
{
+ uint32_t cap = hw->super.cap;
+
PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d",
hw->ver.major, hw->ver.minor, hw->max_mtu);
- PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
hw->cap,
- hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " :
"",
- hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " :
"",
- hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " :
"",
- hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " :
"",
- hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " :
"",
- hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RXQINQ ? "RXQINQ " :
"",
- hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " :
"",
- hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " :
"",
- hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " :
"",
- hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " :
"",
- hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " :
"",
- hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " :
"");
+ PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", cap,
+ cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "",
+ cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "",
+ cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "",
+ cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "",
+ cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "",
+ cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "",
+ cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "",
+ cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " : "",
+ cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 " : "",
+ cap & NFP_NET_CFG_CTRL_RXQINQ ? "RXQINQ " : "",
+ cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "",
+ cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "",
+ cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "",
+ cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "",
+ cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "",
+ cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "",
+ cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : "");
PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u",
hw->max_rx_queues, hw->max_tx_queues);
@@ -456,9 +458,9 @@ static inline void
nfp_net_enable_rxvlan_cap(struct nfp_net_hw *hw,
uint32_t *ctrl)
{
- if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0)
*ctrl |= NFP_NET_CFG_CTRL_RXVLAN_V2;
- else if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN) != 0)
+ else if ((hw->super.cap & NFP_NET_CFG_CTRL_RXVLAN) != 0)
*ctrl |= NFP_NET_CFG_CTRL_RXVLAN;
}
@@ -503,7 +505,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)
NFP_NET_CFG_UPDATE_RING |
NFP_NET_CFG_UPDATE_MSIX;
- if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;
/* If an error when reconfig we avoid to change hw state */
@@ -552,7 +554,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
- (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {
+ (hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {
PMD_DRV_LOG(ERR, "MAC address unable to change when port
enabled");
return -EBUSY;
}
@@ -563,7 +565,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,
update = NFP_NET_CFG_UPDATE_MACADDR;
ctrl = hw->ctrl;
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
- (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)
+ (hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)
ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;
/* Signal the NIC about the change */
@@ -631,7 +633,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)
tx_offload = dev_conf->txmode.offloads;
if ((rx_offload & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) != 0) {
- if ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)
ctrl |= NFP_NET_CFG_CTRL_RXCSUM;
}
@@ -639,25 +641,25 @@ nfp_check_offloads(struct rte_eth_dev *dev)
nfp_net_enable_rxvlan_cap(hw, &ctrl);
if ((rx_offload & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0) {
- if ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)
ctrl |= NFP_NET_CFG_CTRL_RXQINQ;
}
hw->mtu = dev->data->mtu;
if ((tx_offload & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) != 0) {
- if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)
ctrl |= NFP_NET_CFG_CTRL_TXVLAN_V2;
- else if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)
+ else if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)
ctrl |= NFP_NET_CFG_CTRL_TXVLAN;
}
/* L2 broadcast */
- if ((hw->cap & NFP_NET_CFG_CTRL_L2BC) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_L2BC) != 0)
ctrl |= NFP_NET_CFG_CTRL_L2BC;
/* L2 multicast */
- if ((hw->cap & NFP_NET_CFG_CTRL_L2MC) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_L2MC) != 0)
ctrl |= NFP_NET_CFG_CTRL_L2MC;
/* TX checksum offload */
@@ -669,7 +671,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)
/* LSO offload */
if ((tx_offload & RTE_ETH_TX_OFFLOAD_TCP_TSO) != 0 ||
(tx_offload & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) != 0) {
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO) != 0)
ctrl |= NFP_NET_CFG_CTRL_LSO;
else
ctrl |= NFP_NET_CFG_CTRL_LSO2;
@@ -698,7 +700,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
}
- if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {
PMD_DRV_LOG(ERR, "Promiscuous mode not supported");
return -ENOTSUP;
}
@@ -1213,35 +1215,35 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
/* Next should change when PF support is implemented */
dev_info->max_mac_addrs = 1;
- if ((hw->cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2))
!= 0)
+ if ((hw->super.cap & (NFP_NET_CFG_CTRL_RXVLAN |
NFP_NET_CFG_CTRL_RXVLAN_V2)) != 0)
dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
- if ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_QINQ_STRIP;
- if ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
RTE_ETH_RX_OFFLOAD_TCP_CKSUM;
- if ((hw->cap & (NFP_NET_CFG_CTRL_TXVLAN | NFP_NET_CFG_CTRL_TXVLAN_V2))
!= 0)
+ if ((hw->super.cap & (NFP_NET_CFG_CTRL_TXVLAN |
NFP_NET_CFG_CTRL_TXVLAN_V2)) != 0)
dev_info->tx_offload_capa = RTE_ETH_TX_OFFLOAD_VLAN_INSERT;
- if ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) != 0)
dev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
RTE_ETH_TX_OFFLOAD_TCP_CKSUM;
- if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0) {
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0) {
dev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_TCP_TSO;
- if ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0)
dev_info->tx_offload_capa |=
RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO;
}
- if ((hw->cap & NFP_NET_CFG_CTRL_GATHER) != 0)
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_GATHER) != 0)
dev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_MULTI_SEGS;
- cap_extend = hw->cap_ext;
+ cap_extend = hw->super.cap_ext;
if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {
dev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_SECURITY;
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_SECURITY;
@@ -1281,7 +1283,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
.nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,
};
- if ((hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) != 0) {
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_RSS_ANY) != 0) {
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
dev_info->flow_type_rss_offloads = RTE_ETH_RSS_IPV4 |
@@ -1334,8 +1336,8 @@ nfp_net_common_init(struct rte_pci_device *pci_dev,
return -ENODEV;
/* Get some of the read-only fields from the config BAR */
- hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);
- hw->cap_ext = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);
+ hw->super.cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);
+ hw->super.cap_ext = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);
hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);
hw->flbufsz = DEFAULT_FLBUF_SIZE;
@@ -2025,14 +2027,14 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw)
*/
if (hw->ver.major == 4) {
hw->meta_format = NFP_NET_METAFORMAT_CHAINED;
- } else if ((hw->cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) {
+ } else if ((hw->super.cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) {
hw->meta_format = NFP_NET_METAFORMAT_CHAINED;
/*
- * RSS is incompatible with chained metadata. hw->cap just
represents
+ * RSS is incompatible with chained metadata. hw->super.cap
just represents
* firmware's ability rather than the firmware's configuration.
We decide
- * to reduce the confusion to allow us can use hw->cap to
identify RSS later.
+ * to reduce the confusion to allow us can use hw->super.cap to
identify RSS later.
*/
- hw->cap &= ~NFP_NET_CFG_CTRL_RSS;
+ hw->super.cap &= ~NFP_NET_CFG_CTRL_RSS;
} else {
hw->meta_format = NFP_NET_METAFORMAT_SINGLE;
}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 8a02911c45..7bcdd9295f 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -112,7 +112,15 @@ struct nfp_app_fw_nic {
uint8_t total_phyports;
};
+struct nfp_hw {
+ uint32_t cap;
+ uint32_t cap_ext;
+};
+
struct nfp_net_hw {
+ /** The parent class */
+ struct nfp_hw super;
+
/** Backpointer to the PF this port belongs to */
struct nfp_pf_dev *pf_dev;
@@ -120,9 +128,7 @@ struct nfp_net_hw {
struct rte_eth_dev *eth_dev;
/** Info from the firmware */
- uint32_t cap_ext;
struct nfp_net_fw_ver ver;
- uint32_t cap;
uint32_t max_mtu;
uint32_t mtu;
uint32_t rx_offset;
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index efdca7fccf..a0c7e0e9b5 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -386,7 +386,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta,
struct nfp_net_hw *hw = rxq->hw;
if ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 ||
- (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0)
+ (hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) == 0)
return;
if (meta->vlan_layer < NFP_META_MAX_VLANS)
--
2.39.1
