[dpdk-stable] patch 'net/bnxt: remove redundant macro' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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/13/20. 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.

Thanks.

Luca Boccassi

---
>From ecfe7d061464cacff50951437dc09704ccfb52ea Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Tue, 28 Jan 2020 12:59:19 +0530
Subject: [PATCH] net/bnxt: remove redundant macro

[ upstream commit 925e3cbda68bf05274bbb428d871ce5ac1fb4957 ]

Use "dev->data->dev_started" state, instead of local BNXT_FLAG_INIT_DONE
to check whether device has been initialised or not.

Fixes: ed2ced6fe927 ("net/bnxt: check initialization before accessing stats")

Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
---
 drivers/net/bnxt/bnxt.h        | 1 -
 drivers/net/bnxt/bnxt_ethdev.c | 2 --
 drivers/net/bnxt/bnxt_stats.c  | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 46600e163a..265c63a3e7 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -523,7 +523,6 @@ struct bnxt {
 #define BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD	BIT(21)
 #define BNXT_FLAG_EXT_STATS_SUPPORTED		BIT(22)
 #define BNXT_FLAG_NEW_RM			BIT(23)
-#define BNXT_FLAG_INIT_DONE			BIT(24)
 #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS		BIT(25)
 #define BNXT_FLAG_ADV_FLOW_MGMT			BIT(26)
 #define BNXT_FLAG_FW_CAP_HOT_RESET		BIT(27)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 543ab2c7d4..c5fc43b918 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -872,7 +872,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 	eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
 	eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
 
-	bp->flags |= BNXT_FLAG_INIT_DONE;
 	eth_dev->data->dev_started = 1;
 	bp->dev_stopped = 0;
 	pthread_mutex_lock(&bp->def_cp_lock);
@@ -932,7 +931,6 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
 
 	bnxt_cancel_fw_health_check(bp);
 
-	bp->flags &= ~BNXT_FLAG_INIT_DONE;
 	bnxt_dev_set_link_down_op(eth_dev);
 
 	/* Wait for link to be reset and the async notification to process.
diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index 743f2ce94e..be5b514f49 100644
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -389,7 +389,7 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
 	if (rc)
 		return rc;
 
-	if (!(bp->flags & BNXT_FLAG_INIT_DONE))
+	if (!eth_dev->data->dev_started)
 		return -EIO;
 
 	num_q_stats = RTE_MIN(bp->rx_cp_nr_rings,
@@ -434,7 +434,7 @@ int bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
 	if (ret)
 		return ret;
 
-	if (!(bp->flags & BNXT_FLAG_INIT_DONE)) {
+	if (!eth_dev->data->dev_started) {
 		PMD_DRV_LOG(ERR, "Device Initialization not complete!\n");
 		return -EINVAL;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.281099237 +0000
+++ 0163-net-bnxt-remove-redundant-macro.patch	2020-02-11 11:17:38.776008378 +0000
@@ -1,13 +1,14 @@
-From 925e3cbda68bf05274bbb428d871ce5ac1fb4957 Mon Sep 17 00:00:00 2001
+From ecfe7d061464cacff50951437dc09704ccfb52ea Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Tue, 28 Jan 2020 12:59:19 +0530
 Subject: [PATCH] net/bnxt: remove redundant macro
 
+[ upstream commit 925e3cbda68bf05274bbb428d871ce5ac1fb4957 ]
+
 Use "dev->data->dev_started" state, instead of local BNXT_FLAG_INIT_DONE
 to check whether device has been initialised or not.
 
 Fixes: ed2ced6fe927 ("net/bnxt: check initialization before accessing stats")
-Cc: stable at dpdk.org
 
 Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
@@ -20,30 +21,30 @@
  3 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
-index bca9ad418b..95f1f1a20e 100644
+index 46600e163a..265c63a3e7 100644
 --- a/drivers/net/bnxt/bnxt.h
 +++ b/drivers/net/bnxt/bnxt.h
-@@ -520,7 +520,6 @@ struct bnxt {
- #define BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED	BIT(18)
- #define BNXT_FLAG_EXT_STATS_SUPPORTED		BIT(19)
- #define BNXT_FLAG_NEW_RM			BIT(20)
--#define BNXT_FLAG_INIT_DONE			BIT(21)
- #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS		BIT(22)
- #define BNXT_FLAG_ADV_FLOW_MGMT			BIT(23)
- #define BNXT_FLAG_RX_VECTOR_PKT_MODE		BIT(24)
+@@ -523,7 +523,6 @@ struct bnxt {
+ #define BNXT_FLAG_FW_CAP_ERR_RECOVER_RELOAD	BIT(21)
+ #define BNXT_FLAG_EXT_STATS_SUPPORTED		BIT(22)
+ #define BNXT_FLAG_NEW_RM			BIT(23)
+-#define BNXT_FLAG_INIT_DONE			BIT(24)
+ #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS		BIT(25)
+ #define BNXT_FLAG_ADV_FLOW_MGMT			BIT(26)
+ #define BNXT_FLAG_FW_CAP_HOT_RESET		BIT(27)
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 267a36148c..b04685cea6 100644
+index 543ab2c7d4..c5fc43b918 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -887,7 +887,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
+@@ -872,7 +872,6 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
  	eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
  	eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
  
 -	bp->flags |= BNXT_FLAG_INIT_DONE;
  	eth_dev->data->dev_started = 1;
+ 	bp->dev_stopped = 0;
  	pthread_mutex_lock(&bp->def_cp_lock);
- 	bnxt_schedule_fw_health_check(bp);
-@@ -947,7 +946,6 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
+@@ -932,7 +931,6 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
  
  	bnxt_cancel_fw_health_check(bp);
  
@@ -52,7 +53,7 @@
  
  	/* Wait for link to be reset and the async notification to process.
 diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
-index 32f112b5ba..466862995b 100644
+index 743f2ce94e..be5b514f49 100644
 --- a/drivers/net/bnxt/bnxt_stats.c
 +++ b/drivers/net/bnxt/bnxt_stats.c
 @@ -389,7 +389,7 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,