Extract the 'reconfig_lock' data field into the super class, also change
the parameter of the related APIs, prepare 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 | 50 +++++----
drivers/net/nfp/nfp_ethdev.c | 32 +++---
drivers/net/nfp/nfp_ethdev_vf.c | 20 ++--
drivers/net/nfp/nfp_net_common.c | 155 +++++++++++++++-------------
drivers/net/nfp/nfp_net_common.h | 5 +-
5 files changed, 144 insertions(+), 118 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index 0fc1342740..a68b63f4ee 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -52,27 +52,29 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)
{
uint32_t update;
uint32_t new_ctrl;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
struct nfp_flower_representor *repr;
repr = dev->data->dev_private;
- hw = repr->app_fw_flower->pf_hw;
+ net_hw = repr->app_fw_flower->pf_hw;
+ hw = &net_hw->super;
- nn_cfg_writeq(&hw->super, NFP_NET_CFG_TXRS_ENABLE, 0);
- nn_cfg_writeq(&hw->super, NFP_NET_CFG_RXRS_ENABLE, 0);
+ nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0);
+ nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0);
- new_ctrl = hw->super.ctrl & ~NFP_NET_CFG_CTRL_ENABLE;
+ new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE;
update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |
NFP_NET_CFG_UPDATE_MSIX;
- if (hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG)
+ if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;
/* If an error when reconfig we avoid to change hw state */
- if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
+ if (nfp_reconfig(hw, new_ctrl, update) < 0)
return;
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
}
int
@@ -80,13 +82,15 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
{
int ret;
uint16_t i;
+ struct nfp_hw *hw;
uint32_t new_ctrl;
uint32_t update = 0;
- struct nfp_net_hw *hw;
+ struct nfp_net_hw *net_hw;
struct nfp_flower_representor *repr;
repr = dev->data->dev_private;
- hw = repr->app_fw_flower->pf_hw;
+ net_hw = repr->app_fw_flower->pf_hw;
+ hw = &net_hw->super;
/* Disabling queues just in case... */
nfp_pf_repr_disable_queues(dev);
@@ -97,11 +101,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
new_ctrl = nfp_check_offloads(dev);
/* Writing configuration parameters in the device */
- nfp_net_params_setup(hw);
+ nfp_net_params_setup(net_hw);
update |= NFP_NET_CFG_UPDATE_RSS;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_RSS2) != 0)
+ if ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RSS2;
else
new_ctrl |= NFP_NET_CFG_CTRL_RSS;
@@ -111,19 +115,19 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
- nn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, new_ctrl);
+ nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
/* If an error when reconfig we avoid to change hw state */
- ret = nfp_net_reconfig(hw, new_ctrl, update);
+ ret = nfp_reconfig(hw, new_ctrl, update);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to reconfig PF vnic");
return -EIO;
}
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
/* Setup the freelist ring */
ret = nfp_net_rx_freelist_setup(dev);
@@ -376,7 +380,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw *hw,
vnic_type, hw->max_rx_queues, hw->max_tx_queues);
/* Initializing spinlock for reconfigs */
- rte_spinlock_init(&hw->reconfig_lock);
+ rte_spinlock_init(&hw->super.reconfig_lock);
return 0;
}
@@ -692,14 +696,16 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw)
}
static int
-nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)
+nfp_flower_start_ctrl_vnic(struct nfp_net_hw *net_hw)
{
int ret;
uint32_t update;
uint32_t new_ctrl;
+ struct nfp_hw *hw;
struct rte_eth_dev *dev;
- dev = hw->eth_dev;
+ dev = net_hw->eth_dev;
+ hw = &net_hw->super;
/* Disabling queues just in case... */
nfp_net_disable_queues(dev);
@@ -708,7 +714,7 @@ nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)
nfp_net_enable_queues(dev);
/* Writing configuration parameters in the device */
- nfp_net_params_setup(hw);
+ nfp_net_params_setup(net_hw);
new_ctrl = NFP_NET_CFG_CTRL_ENABLE;
update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |
@@ -717,13 +723,13 @@ nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)
rte_wmb();
/* If an error when reconfig we avoid to change hw state */
- ret = nfp_net_reconfig(hw, new_ctrl, update);
+ ret = nfp_reconfig(hw, new_ctrl, update);
if (ret != 0) {
PMD_INIT_LOG(ERR, "Failed to reconfig ctrl vnic");
return -EIO;
}
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
/* Setup the freelist ring */
ret = nfp_net_rx_freelist_setup(dev);
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 6a4455e50f..2f8df1c936 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -45,12 +45,13 @@ nfp_net_start(struct rte_eth_dev *dev)
{
int ret;
uint16_t i;
+ struct nfp_hw *hw;
uint32_t new_ctrl;
uint32_t update = 0;
uint32_t cap_extend;
uint32_t intr_vector;
- struct nfp_net_hw *hw;
uint32_t ctrl_extend = 0;
+ struct nfp_net_hw *net_hw;
struct nfp_pf_dev *pf_dev;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
@@ -58,9 +59,10 @@ nfp_net_start(struct rte_eth_dev *dev)
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);
app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);
+ hw = &net_hw->super;
/* Disabling queues just in case... */
nfp_net_disable_queues(dev);
@@ -100,9 +102,9 @@ nfp_net_start(struct rte_eth_dev *dev)
}
/* Checking MTU set */
- if (dev->data->mtu > hw->flbufsz) {
+ if (dev->data->mtu > net_hw->flbufsz) {
PMD_INIT_LOG(ERR, "MTU (%u) can't be larger than the current
NFP_FRAME_SIZE (%u)",
- dev->data->mtu, hw->flbufsz);
+ dev->data->mtu, net_hw->flbufsz);
return -ERANGE;
}
@@ -111,7 +113,7 @@ nfp_net_start(struct rte_eth_dev *dev)
new_ctrl = nfp_check_offloads(dev);
/* Writing configuration parameters in the device */
- nfp_net_params_setup(hw);
+ nfp_net_params_setup(net_hw);
dev_conf = &dev->data->dev_conf;
rxmode = &dev_conf->rxmode;
@@ -119,7 +121,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->super.cap);
+ new_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);
}
/* Enable device */
@@ -128,19 +130,19 @@ nfp_net_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
/* Enable vxlan */
- if ((hw->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {
+ if ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {
new_ctrl |= NFP_NET_CFG_CTRL_VXLAN;
update |= NFP_NET_CFG_UPDATE_VXLAN;
}
- if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
- if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
+ if (nfp_reconfig(hw, new_ctrl, update) != 0)
return -EIO;
/* Enable packet type offload by extend ctrl word1. */
- cap_extend = hw->cap_ext;
+ cap_extend = net_hw->cap_ext;
if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0)
ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE;
@@ -149,7 +151,7 @@ nfp_net_start(struct rte_eth_dev *dev)
| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
update = NFP_NET_CFG_UPDATE_GEN;
- if (nfp_net_ext_reconfig(hw, ctrl_extend, update) != 0)
+ if (nfp_net_ext_reconfig(net_hw, ctrl_extend, update) != 0)
return -EIO;
/*
@@ -163,11 +165,11 @@ nfp_net_start(struct rte_eth_dev *dev)
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
/* Configure the physical port up */
- nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+ nfp_eth_set_configured(net_hw->cpp, net_hw->nfp_idx, 1);
else
- nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1);
+ nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx,
1);
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
@@ -586,7 +588,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
nfp_net_log_device_information(hw);
/* Initializing spinlock for reconfigs */
- rte_spinlock_init(&hw->reconfig_lock);
+ rte_spinlock_init(&hw->super.reconfig_lock);
/* Allocating memory for mac addr */
eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN,
0);
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 7fb2a3d378..6ead7e02b8 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -32,10 +32,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)
{
int ret;
uint16_t i;
+ struct nfp_hw *hw;
uint32_t new_ctrl;
uint32_t update = 0;
uint32_t intr_vector;
- struct nfp_net_hw *hw;
+ struct nfp_net_hw *net_hw;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
@@ -77,8 +78,9 @@ nfp_netvf_start(struct rte_eth_dev *dev)
new_ctrl = nfp_check_offloads(dev);
/* Writing configuration parameters in the device */
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- nfp_net_params_setup(hw);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
+ nfp_net_params_setup(net_hw);
dev_conf = &dev->data->dev_conf;
rxmode = &dev_conf->rxmode;
@@ -86,7 +88,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->super.cap);
+ new_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);
}
/* Enable device */
@@ -94,11 +96,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)
update |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
- nn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, new_ctrl);
- if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
+ nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
+ if (nfp_reconfig(hw, new_ctrl, update) != 0)
return -EIO;
/*
@@ -110,7 +112,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)
goto error;
}
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
@@ -320,7 +322,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
nfp_net_log_device_information(hw);
/* Initializing spinlock for reconfigs */
- rte_spinlock_init(&hw->reconfig_lock);
+ rte_spinlock_init(&hw->super.reconfig_lock);
/* Allocating memory for mac addr */
eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN,
0);
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 4f830f2a2a..94d9072740 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -199,7 +199,7 @@ nfp_net_notify_port_speed(struct nfp_net_hw *hw,
#define FW_VER_LEN 32
static int
-__nfp_net_reconfig(struct nfp_net_hw *hw,
+nfp_reconfig_real(struct nfp_hw *hw,
uint32_t update)
{
uint32_t cnt;
@@ -207,14 +207,14 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
struct timespec wait;
PMD_DRV_LOG(DEBUG, "Writing to the configuration queue (%p)...",
- hw->super.qcp_cfg);
+ hw->qcp_cfg);
- if (hw->super.qcp_cfg == NULL) {
+ if (hw->qcp_cfg == NULL) {
PMD_DRV_LOG(ERR, "Bad configuration queue pointer");
return -ENXIO;
}
- nfp_qcp_ptr_add(hw->super.qcp_cfg, NFP_QCP_WRITE_PTR, 1);
+ nfp_qcp_ptr_add(hw->qcp_cfg, NFP_QCP_WRITE_PTR, 1);
wait.tv_sec = 0;
wait.tv_nsec = 1000000; /* 1ms */
@@ -223,7 +223,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
/* Poll update field, waiting for NFP to ack the config */
for (cnt = 0; ; cnt++) {
- new = nn_cfg_readl(&hw->super, NFP_NET_CFG_UPDATE);
+ new = nn_cfg_readl(hw, NFP_NET_CFG_UPDATE);
if (new == 0)
break;
@@ -263,7 +263,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,
* - (-EIO) if I/O err and fail to reconfigure the device.
*/
int
-nfp_net_reconfig(struct nfp_net_hw *hw,
+nfp_reconfig(struct nfp_hw *hw,
uint32_t ctrl,
uint32_t update)
{
@@ -271,12 +271,12 @@ nfp_net_reconfig(struct nfp_net_hw *hw,
rte_spinlock_lock(&hw->reconfig_lock);
- nn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, ctrl);
- nn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, update);
+ nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl);
+ nn_cfg_writel(hw, NFP_NET_CFG_UPDATE, update);
rte_wmb();
- ret = __nfp_net_reconfig(hw, update);
+ ret = nfp_reconfig_real(hw, update);
rte_spinlock_unlock(&hw->reconfig_lock);
@@ -313,16 +313,16 @@ nfp_net_ext_reconfig(struct nfp_net_hw *hw,
{
int ret;
- rte_spinlock_lock(&hw->reconfig_lock);
+ rte_spinlock_lock(&hw->super.reconfig_lock);
nn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL_WORD1, ctrl_ext);
nn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, update);
rte_wmb();
- ret = __nfp_net_reconfig(hw, update);
+ ret = nfp_reconfig_real(&hw->super, update);
- rte_spinlock_unlock(&hw->reconfig_lock);
+ rte_spinlock_unlock(&hw->super.reconfig_lock);
if (ret != 0) {
PMD_DRV_LOG(ERR, "Error nft net ext reconfig: ctrl_ext=%#08x
update=%#08x",
@@ -354,16 +354,16 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *hw,
mbox = hw->tlv_caps.mbox_off;
- rte_spinlock_lock(&hw->reconfig_lock);
+ rte_spinlock_lock(&hw->super.reconfig_lock);
nn_cfg_writeq(&hw->super, mbox + NFP_NET_CFG_MBOX_SIMPLE_CMD, mbox_cmd);
nn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_MBOX);
rte_wmb();
- ret = __nfp_net_reconfig(hw, NFP_NET_CFG_UPDATE_MBOX);
+ ret = nfp_reconfig_real(&hw->super, NFP_NET_CFG_UPDATE_MBOX);
- rte_spinlock_unlock(&hw->reconfig_lock);
+ rte_spinlock_unlock(&hw->super.reconfig_lock);
if (ret != 0) {
PMD_DRV_LOG(ERR, "Error nft net mailbox reconfig: mbox=%#08x
update=%#08x",
@@ -494,26 +494,28 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)
{
uint32_t update;
uint32_t new_ctrl;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
- nn_cfg_writeq(&hw->super, NFP_NET_CFG_TXRS_ENABLE, 0);
- nn_cfg_writeq(&hw->super, NFP_NET_CFG_RXRS_ENABLE, 0);
+ nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0);
+ nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0);
- new_ctrl = hw->super.ctrl & ~NFP_NET_CFG_CTRL_ENABLE;
+ new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE;
update = NFP_NET_CFG_UPDATE_GEN |
NFP_NET_CFG_UPDATE_RING |
NFP_NET_CFG_UPDATE_MSIX;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)
+ if ((hw->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 */
- if (nfp_net_reconfig(hw, new_ctrl, update) != 0)
+ if (nfp_reconfig(hw, new_ctrl, update) != 0)
return;
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
}
void
@@ -551,26 +553,28 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,
{
uint32_t ctrl;
uint32_t update;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
- (hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
+ (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {
PMD_DRV_LOG(ERR, "MAC address unable to change when port
enabled");
return -EBUSY;
}
/* Writing new MAC to the specific port BAR address */
- nfp_net_write_mac(hw, (uint8_t *)mac_addr);
+ nfp_net_write_mac(net_hw, (uint8_t *)mac_addr);
update = NFP_NET_CFG_UPDATE_MACADDR;
- ctrl = hw->super.ctrl;
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
- (hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)
+ ctrl = hw->ctrl;
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&
+ (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)
ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;
/* Signal the NIC about the change */
- if (nfp_net_reconfig(hw, ctrl, update) != 0) {
+ if (nfp_reconfig(hw, ctrl, update) != 0) {
PMD_DRV_LOG(ERR, "MAC address update failed");
return -EIO;
}
@@ -689,36 +693,38 @@ int
nfp_net_promisc_enable(struct rte_eth_dev *dev)
{
int ret;
+ uint32_t update;
uint32_t new_ctrl;
- uint32_t update = 0;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
struct nfp_flower_representor *repr;
if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) {
repr = dev->data->dev_private;
- hw = repr->app_fw_flower->pf_hw;
+ net_hw = repr->app_fw_flower->pf_hw;
} else {
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
}
- if ((hw->super.cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {
+ hw = &net_hw->super;
+ if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {
PMD_DRV_LOG(ERR, "Promiscuous mode not supported");
return -ENOTSUP;
}
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {
PMD_DRV_LOG(INFO, "Promiscuous mode already enabled");
return 0;
}
- new_ctrl = hw->super.ctrl | NFP_NET_CFG_CTRL_PROMISC;
+ new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_PROMISC;
update = NFP_NET_CFG_UPDATE_GEN;
- ret = nfp_net_reconfig(hw, new_ctrl, update);
+ ret = nfp_reconfig(hw, new_ctrl, update);
if (ret != 0)
return ret;
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
return 0;
}
@@ -727,25 +733,27 @@ int
nfp_net_promisc_disable(struct rte_eth_dev *dev)
{
int ret;
+ uint32_t update;
uint32_t new_ctrl;
- uint32_t update = 0;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {
PMD_DRV_LOG(INFO, "Promiscuous mode already disabled");
return 0;
}
- new_ctrl = hw->super.ctrl & ~NFP_NET_CFG_CTRL_PROMISC;
+ new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_PROMISC;
update = NFP_NET_CFG_UPDATE_GEN;
- ret = nfp_net_reconfig(hw, new_ctrl, update);
+ ret = nfp_reconfig(hw, new_ctrl, update);
if (ret != 0)
return ret;
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
return 0;
}
@@ -1554,17 +1562,20 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,
int ret;
uint32_t update;
uint32_t new_ctrl;
+ struct nfp_hw *hw;
uint64_t rx_offload;
- struct nfp_net_hw *hw;
+ struct nfp_net_hw *net_hw;
uint32_t rxvlan_ctrl = 0;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
+
rx_offload = dev->data->dev_conf.rxmode.offloads;
- new_ctrl = hw->super.ctrl;
+ new_ctrl = hw->ctrl;
/* VLAN stripping setting */
if ((mask & RTE_ETH_VLAN_STRIP_MASK) != 0) {
- nfp_net_enable_rxvlan_cap(hw, &rxvlan_ctrl);
+ nfp_net_enable_rxvlan_cap(net_hw, &rxvlan_ctrl);
if ((rx_offload & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)
new_ctrl |= rxvlan_ctrl;
else
@@ -1579,16 +1590,16 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,
new_ctrl &= ~NFP_NET_CFG_CTRL_RXQINQ;
}
- if (new_ctrl == hw->super.ctrl)
+ if (new_ctrl == hw->ctrl)
return 0;
update = NFP_NET_CFG_UPDATE_GEN;
- ret = nfp_net_reconfig(hw, new_ctrl, update);
+ ret = nfp_reconfig(hw, new_ctrl, update);
if (ret != 0)
return ret;
- hw->super.ctrl = new_ctrl;
+ hw->ctrl = new_ctrl;
return 0;
}
@@ -1658,10 +1669,13 @@ nfp_net_reta_update(struct rte_eth_dev *dev,
{
int ret;
uint32_t update;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
+
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)
return -EINVAL;
ret = nfp_net_rss_reta_write(dev, reta_conf, reta_size);
@@ -1670,7 +1684,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,
update = NFP_NET_CFG_UPDATE_RSS;
- if (nfp_net_reconfig(hw, hw->super.ctrl, update) != 0)
+ if (nfp_reconfig(hw, hw->ctrl, update) != 0)
return -EIO;
return 0;
@@ -1789,14 +1803,16 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,
{
uint32_t update;
uint64_t rss_hf;
- struct nfp_net_hw *hw;
+ struct nfp_hw *hw;
+ struct nfp_net_hw *net_hw;
- hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ hw = &net_hw->super;
rss_hf = rss_conf->rss_hf;
/* Checking if RSS is enabled */
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
+ if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
if (rss_hf != 0) {
PMD_DRV_LOG(ERR, "RSS unsupported");
return -EINVAL;
@@ -1814,7 +1830,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,
update = NFP_NET_CFG_UPDATE_RSS;
- if (nfp_net_reconfig(hw, hw->super.ctrl, update) != 0)
+ if (nfp_reconfig(hw, hw->ctrl, update) != 0)
return -EIO;
return 0;
@@ -1969,31 +1985,32 @@ nfp_net_close_tx_queue(struct rte_eth_dev *dev)
}
int
-nfp_net_set_vxlan_port(struct nfp_net_hw *hw,
+nfp_net_set_vxlan_port(struct nfp_net_hw *net_hw,
size_t idx,
uint16_t port)
{
int ret;
uint32_t i;
+ struct nfp_hw *hw = &net_hw->super;
if (idx >= NFP_NET_N_VXLAN_PORTS) {
PMD_DRV_LOG(ERR, "The idx value is out of range.");
return -ERANGE;
}
- hw->vxlan_ports[idx] = port;
+ net_hw->vxlan_ports[idx] = port;
for (i = 0; i < NFP_NET_N_VXLAN_PORTS; i += 2) {
- nn_cfg_writel(&hw->super, NFP_NET_CFG_VXLAN_PORT + i *
sizeof(port),
- (hw->vxlan_ports[i + 1] << 16) |
hw->vxlan_ports[i]);
+ nn_cfg_writel(hw, NFP_NET_CFG_VXLAN_PORT + i * sizeof(port),
+ (net_hw->vxlan_ports[i + 1] << 16) |
net_hw->vxlan_ports[i]);
}
rte_spinlock_lock(&hw->reconfig_lock);
- nn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_VXLAN);
+ nn_cfg_writel(hw, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_VXLAN);
rte_wmb();
- ret = __nfp_net_reconfig(hw, NFP_NET_CFG_UPDATE_VXLAN);
+ ret = nfp_reconfig_real(hw, NFP_NET_CFG_UPDATE_VXLAN);
rte_spinlock_unlock(&hw->reconfig_lock);
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 6576769214..02ec854498 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -117,6 +117,7 @@ struct nfp_hw {
uint8_t *qcp_cfg;
uint32_t cap;
uint32_t ctrl; /**< Current values for control */
+ rte_spinlock_t reconfig_lock;
};
struct nfp_net_hw {
@@ -149,8 +150,6 @@ struct nfp_net_hw {
uint16_t vxlan_ports[NFP_NET_N_VXLAN_PORTS];
uint8_t vxlan_usecnt[NFP_NET_N_VXLAN_PORTS];
- rte_spinlock_t reconfig_lock;
-
uint32_t max_tx_queues;
uint32_t max_rx_queues;
uint16_t flbufsz;
@@ -367,7 +366,7 @@ nfp_qcp_queue_offset(const struct nfp_dev_info *dev_info,
}
/* Prototypes for common NFP functions */
-int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update);
+int nfp_reconfig(struct nfp_hw *hw, uint32_t ctrl, uint32_t update);
int nfp_net_ext_reconfig(struct nfp_net_hw *hw, uint32_t ctrl_ext, uint32_t
update);
int nfp_net_mbox_reconfig(struct nfp_net_hw *hw, uint32_t mbox_cmd);
int nfp_net_configure(struct rte_eth_dev *dev);
--
2.39.1
