[dpdk-stable] patch 'net/bnxt: refactor init/uninit' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/b3d3810bbb71f3891bfa83177d9f2ccfb01a8882

Thanks.

Luca Boccassi

---
>From b3d3810bbb71f3891bfa83177d9f2ccfb01a8882 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur at broadcom.com>
Date: Wed, 13 Jan 2021 18:19:14 -0800
Subject: [PATCH] net/bnxt: refactor init/uninit

[ upstream commit 3127f99274b679124658afdbfc49210730c50617 ]

Move all the individual driver fields allocation routines to one
routine - bnxt_drv_init(). This houses all such routines where
memory needs to be allocated once during the driver's lifetime
and does not need to be torn down during error recovery.

Rename some function names in accordance with their functionality.
bnxt_init_board() is doing nothing more than mapping the PCI bars,
so rename it as such.

Given that there is a bnxt_shutdown_nic that is called in dev_stop_op,
rename it's counterpart - bnxt_init_chip() that is called in
dev_start_op, to bnxt_start_nic. Also helps avoid confusion with some of
the other bnxt_init_xxx routines.
Rename bnxt_init_fw() to bnxt_get_config() as that is what that routine
is doing mostly functionality wise.

Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 150 +++++++++++++++++++--------------
 1 file changed, 88 insertions(+), 62 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 9a6eb19bf2..a4a31f224f 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -689,7 +689,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
 	return rc;
 }
 
-static int bnxt_init_chip(struct bnxt *bp)
+static int bnxt_start_nic(struct bnxt *bp)
 {
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
@@ -1395,7 +1395,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
 	bnxt_enable_int(bp);
 
-	rc = bnxt_init_chip(bp);
+	rc = bnxt_start_nic(bp);
 	if (rc)
 		goto error;
 
@@ -1441,26 +1441,9 @@ bnxt_uninit_locks(struct bnxt *bp)
 	}
 }
 
-static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+static void bnxt_drv_uninit(struct bnxt *bp)
 {
-	struct bnxt *bp = eth_dev->data->dev_private;
-	int ret = 0;
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	/* cancel the recovery handler before remove dev */
-	rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
-	rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
-	bnxt_cancel_fc_thread(bp);
-
-	if (eth_dev->data->dev_started)
-		ret = bnxt_dev_stop_op(eth_dev);
-
 	bnxt_free_switch_domain(bp);
-
-	bnxt_uninit_resources(bp, false);
-
 	bnxt_free_leds_info(bp);
 	bnxt_free_cos_queues(bp);
 	bnxt_free_link_info(bp);
@@ -1477,6 +1460,27 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 
 	rte_free(bp->grp_info);
 	bp->grp_info = NULL;
+}
+
+static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+{
+	struct bnxt *bp = eth_dev->data->dev_private;
+	int ret = 0;
+
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	/* cancel the recovery handler before remove dev */
+	rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
+	rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
+	bnxt_cancel_fc_thread(bp);
+
+	if (eth_dev->data->dev_started)
+		ret = bnxt_dev_stop_op(eth_dev);
+
+	bnxt_uninit_resources(bp, false);
+
+	bnxt_drv_uninit(bp);
 
 	return ret;
 }
@@ -4045,7 +4049,7 @@ bool bnxt_stratus_device(struct bnxt *bp)
 	}
 }
 
-static int bnxt_init_board(struct rte_eth_dev *eth_dev)
+static int bnxt_map_pci_bars(struct rte_eth_dev *eth_dev)
 {
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 	struct bnxt *bp = eth_dev->data->dev_private;
@@ -4670,7 +4674,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
 	return 0;
 }
 
-static int bnxt_init_fw(struct bnxt *bp)
+/* This function gets the FW version along with the
+ * capabilities(MAX and current) of the function, vnic,
+ * error recovery, phy and other chip related info
+ */
+static int bnxt_get_config(struct bnxt *bp)
 {
 	uint16_t mtu;
 	int rc = 0;
@@ -4755,7 +4763,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
 {
 	int rc = 0;
 
-	rc = bnxt_init_fw(bp);
+	rc = bnxt_get_config(bp);
 	if (rc)
 		return rc;
 
@@ -5202,38 +5210,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp)
 	return rc;
 }
 
-static int
-bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+/* Allocate and initialize various fields in bnxt struct that
+ * need to be allocated/destroyed only once in the lifetime of the driver
+ */
+static int bnxt_drv_init(struct rte_eth_dev *eth_dev)
 {
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	static int version_printed;
-	struct bnxt *bp;
-	int rc;
-
-	if (version_printed++ == 0)
-		PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
-
-	eth_dev->dev_ops = &bnxt_dev_ops;
-	eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
-	eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
-	eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
-	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
-	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
-
-	/*
-	 * For secondary processes, we don't initialise any further
-	 * as primary has already done this work.
-	 */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	rte_eth_copy_pci_info(eth_dev, pci_dev);
-	eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
-
-	bp = eth_dev->data->dev_private;
-
-	/* Parse dev arguments passed on when starting the DPDK application. */
-	bnxt_parse_dev_args(bp, pci_dev->device.devargs);
+	struct bnxt *bp = eth_dev->data->dev_private;
+	int rc = 0;
 
 	bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
 
@@ -5265,7 +5249,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 		}
 	}
 
-	rc = bnxt_init_board(eth_dev);
+	rc = bnxt_map_pci_bars(eth_dev);
 	if (rc) {
 		PMD_DRV_LOG(ERR,
 			    "Failed to initialize board rc: %x\n", rc);
@@ -5274,31 +5258,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 
 	rc = bnxt_alloc_pf_info(bp);
 	if (rc)
-		goto error_free;
+		return rc;
 
 	rc = bnxt_alloc_link_info(bp);
 	if (rc)
-		goto error_free;
+		return rc;
 
 	rc = bnxt_alloc_parent_info(bp);
 	if (rc)
-		goto error_free;
+		return rc;
 
 	rc = bnxt_alloc_hwrm_resources(bp);
 	if (rc) {
 		PMD_DRV_LOG(ERR,
 			    "Failed to allocate hwrm resource rc: %x\n", rc);
-		goto error_free;
+		return rc;
 	}
 	rc = bnxt_alloc_leds_info(bp);
 	if (rc)
-		goto error_free;
+		return rc;
 
 	rc = bnxt_alloc_cos_queues(bp);
 	if (rc)
-		goto error_free;
+		return rc;
 
 	rc = bnxt_init_locks(bp);
+	if (rc)
+		return rc;
+
+	rc = bnxt_alloc_switch_domain(bp);
+	if (rc)
+		return rc;
+
+	return rc;
+}
+
+static int
+bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+{
+	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+	static int version_printed;
+	struct bnxt *bp;
+	int rc;
+
+	if (version_printed++ == 0)
+		PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
+
+	eth_dev->dev_ops = &bnxt_dev_ops;
+	eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
+	eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
+	eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
+	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
+	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
+
+	/*
+	 * For secondary processes, we don't initialise any further
+	 * as primary has already done this work.
+	 */
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	rte_eth_copy_pci_info(eth_dev, pci_dev);
+	eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
+	bp = eth_dev->data->dev_private;
+
+	/* Parse dev arguments passed on when starting the DPDK application. */
+	bnxt_parse_dev_args(bp, pci_dev->device.devargs);
+
+	rc = bnxt_drv_init(eth_dev);
 	if (rc)
 		goto error_free;
 
@@ -5310,8 +5338,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
 	if (rc)
 		goto error_free;
 
-	bnxt_alloc_switch_domain(bp);
-
 	PMD_DRV_LOG(INFO,
 		    DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
 		    pci_dev->mem_resource[0].phys_addr,
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:39.358556506 +0000
+++ 0231-net-bnxt-refactor-init-uninit.patch	2021-02-05 11:18:29.210698804 +0000
@@ -1 +1 @@
-From 3127f99274b679124658afdbfc49210730c50617 Mon Sep 17 00:00:00 2001
+From b3d3810bbb71f3891bfa83177d9f2ccfb01a8882 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3127f99274b679124658afdbfc49210730c50617 ]
+
@@ -22,2 +23,0 @@
-Cc: stable at dpdk.org
-
@@ -27,2 +27,2 @@
- drivers/net/bnxt/bnxt_ethdev.c | 166 +++++++++++++++++++--------------
- 1 file changed, 96 insertions(+), 70 deletions(-)
+ drivers/net/bnxt/bnxt_ethdev.c | 150 +++++++++++++++++++--------------
+ 1 file changed, 88 insertions(+), 62 deletions(-)
@@ -31 +31 @@
-index e8a7a8ecd4..3ac3818305 100644
+index 9a6eb19bf2..a4a31f224f 100644
@@ -34 +34 @@
-@@ -679,7 +679,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
+@@ -689,7 +689,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
@@ -43 +43 @@
-@@ -1417,7 +1417,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
+@@ -1395,7 +1395,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
@@ -52 +52 @@
-@@ -1464,34 +1464,9 @@ bnxt_uninit_locks(struct bnxt *bp)
+@@ -1441,26 +1441,9 @@ bnxt_uninit_locks(struct bnxt *bp)
@@ -65,8 +64,0 @@
--	pthread_mutex_lock(&bp->err_recovery_lock);
--	if (bp->flags & BNXT_FLAG_FW_RESET) {
--		PMD_DRV_LOG(ERR,
--			    "Adapter recovering from error...Please retry\n");
--		return -EAGAIN;
--	}
--	pthread_mutex_unlock(&bp->err_recovery_lock);
--
@@ -79 +71 @@
--		ret = bnxt_dev_stop(eth_dev);
+-		ret = bnxt_dev_stop_op(eth_dev);
@@ -88 +80 @@
-@@ -1508,6 +1483,35 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
+@@ -1477,6 +1460,27 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
@@ -102,8 +93,0 @@
-+	pthread_mutex_lock(&bp->err_recovery_lock);
-+	if (bp->flags & BNXT_FLAG_FW_RESET) {
-+		PMD_DRV_LOG(ERR,
-+			    "Adapter recovering from error...Please retry\n");
-+		return -EAGAIN;
-+	}
-+	pthread_mutex_unlock(&bp->err_recovery_lock);
-+
@@ -116 +100 @@
-+		ret = bnxt_dev_stop(eth_dev);
++		ret = bnxt_dev_stop_op(eth_dev);
@@ -124 +108 @@
-@@ -4086,7 +4090,7 @@ bool bnxt_stratus_device(struct bnxt *bp)
+@@ -4045,7 +4049,7 @@ bool bnxt_stratus_device(struct bnxt *bp)
@@ -133 +117 @@
-@@ -4723,7 +4727,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
+@@ -4670,7 +4674,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
@@ -146 +130 @@
-@@ -4819,7 +4827,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
+@@ -4755,7 +4763,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
@@ -155 +139 @@
-@@ -5266,38 +5274,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp)
+@@ -5202,38 +5210,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp)
@@ -200 +184 @@
-@@ -5329,7 +5313,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+@@ -5265,7 +5249,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
@@ -209 +193 @@
-@@ -5338,31 +5322,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+@@ -5274,31 +5258,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
@@ -291 +275 @@
-@@ -5374,8 +5402,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
+@@ -5310,8 +5338,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)