[PATCH 3/5] net/nfp: standardize the logic for nfp reconfig function

[Chaoyong He]

From: Qin Ke <qin...@corigine.com>

There are some issues about return value and code style related with
nfp_net_reconfig(), standardizes them.

The line of code nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl) only needs
to be executed once, deletes the redundant line in nfp_net_start() which
has called nfp_net_reconfig() including the line.

Signed-off-by: Qin Ke <qin...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
---
 drivers/net/nfp/nfp_common.c | 32 ++++++++++++++++++--------------
 drivers/net/nfp/nfp_ethdev.c |  1 -
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index c9fea765a4..0644f6f1a8 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -256,22 +256,27 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update)
        return 0;
 }
 
-/*
- * Reconfigure the NIC
- * @nn:    device to reconfigure
- * @ctrl:    The value for the ctrl field in the BAR config
- * @update:  The value for the update field in the BAR config
+/**
+ * Reconfigure the NIC.
  *
  * Write the update word to the BAR and ping the reconfig queue. Then poll
  * until the firmware has acknowledged the update by zeroing the update word.
+ *
+ * @param hw
+ *   Device to reconfigure.
+ * @param ctrl
+ *   The value for the ctrl field in the BAR config.
+ * @param update
+ *   The value for the update field in the BAR config.
+ *
+ * @return
+ *   - (0) if OK to reconfigure the device.
+ *   - (EIO) if I/O err and fail to reconfigure the device.
  */
 int
 nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update)
 {
-       uint32_t err;
-
-       PMD_DRV_LOG(DEBUG, "nfp_net_reconfig: ctrl=%08x update=%08x",
-                   ctrl, update);
+       int ret;
 
        if (hw->pf_dev != NULL && hw->pf_dev->app_fw_id == NFP_APP_FW_CORE_NIC)
                nfp_net_notify_port_speed(hw->eth_dev);
@@ -283,18 +288,17 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, 
uint32_t update)
 
        rte_wmb();
 
-       err = __nfp_net_reconfig(hw, update);
+       ret = __nfp_net_reconfig(hw, update);
 
        rte_spinlock_unlock(&hw->reconfig_lock);
 
-       if (err != 0) {
-               PMD_INIT_LOG(ERR, "Error nfp_net reconfig for ctrl: %x update: 
%x",
-                            ctrl, update);
+       if (ret != 0) {
+               PMD_DRV_LOG(ERR, "Error nfp net reconfig: ctrl=%#08x 
update=%#08x",
+                               ctrl, update);
                return -EIO;
        }
 
        return 0;
-
 }
 
 /*
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 722ec17dce..1ddb7a92ee 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -144,7 +144,6 @@ nfp_net_start(struct rte_eth_dev *dev)
        if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
                new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
 
-       nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
        if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
                return -EIO;
 
-- 
2.39.1