[dpdk-stable] patch 'net/bnxt: cleanup comments' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ff20bd33b868212daf014c66a37d275e12ac5189

Thanks.

Kevin.

---
>From ff20bd33b868212daf014c66a37d275e12ac5189 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Thu, 10 Oct 2019 14:14:23 +0530
Subject: [PATCH] net/bnxt: cleanup comments

[ upstream commit aa1fbf6bf74f26c2946909a0ab453d7de28a8e41 ]

- updated one comment for more readability and understanding
- fixed typo in comments
- moved a comment to right place
- removed one out-of-date comment
- removed few commented code

Fixes: f2a768d4d186 ("net/bnxt: add completion ring")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_cpr.c    |  2 --
 drivers/net/bnxt/bnxt_filter.c |  1 -
 drivers/net/bnxt/bnxt_hwrm.c   | 27 +++++++++------------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 0fd6e51e5..ff8fa04b4 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -22,6 +22,4 @@ void bnxt_handle_async_event(struct bnxt *bp,
 	uint16_t event_id = rte_le_to_cpu_16(async_cmp->event_id);
 
-	/* TODO: HWRM async events are not defined yet */
-	/* Needs to handle: link events, error events, etc. */
 	switch (event_id) {
 	case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE:
diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
index f43fe0db0..ca0070852 100644
--- a/drivers/net/bnxt/bnxt_filter.c
+++ b/drivers/net/bnxt/bnxt_filter.c
@@ -83,5 +83,4 @@ void bnxt_free_all_filters(struct bnxt *bp)
 	unsigned int i;
 
-//	for (i = 0; i < MAX_FF_POOLS; i++) {
 	for (i = 0; i < bp->nr_vnics; i++) {
 		vnic = &bp->vnic_info[i];
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 1bd8d3d9f..74f046c29 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -65,7 +65,7 @@ static int page_roundup(size_t size)
 /*
  * HWRM Functions (sent to HWRM)
- * These are named bnxt_hwrm_*() and return -1 if bnxt_hwrm_send_message()
- * fails (ie: a timeout), and a positive non-zero HWRM error code if the HWRM
- * command was failed by the ChiMP.
+ * These are named bnxt_hwrm_*() and return 0 on success or -110 if the
+ * HWRM command times out, or a negative error code if the HWRM
+ * command was failed by the FW.
  */
 
@@ -151,9 +151,9 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
 
 /*
- * HWRM_PREP() should be used to prepare *ALL* HWRM commands.  It grabs the
+ * HWRM_PREP() should be used to prepare *ALL* HWRM commands. It grabs the
  * spinlock, and does initial processing.
  *
  * HWRM_CHECK_RESULT() returns errors on failure and may not be used.  It
- * releases the spinlock only if it returns.  If the regular int return codes
+ * releases the spinlock only if it returns. If the regular int return codes
  * are not used by the function, HWRM_CHECK_RESULT() should not be used
  * directly, rather it should be copied and modified to suit the function.
@@ -465,5 +465,4 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
 	struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
 
-/*	if (bp->hwrm_spec_code < 0x10801 || ptp)  TBD  */
 	if (ptp)
 		return 0;
@@ -1800,8 +1799,4 @@ int bnxt_hwrm_func_clr_stats(struct bnxt *bp, uint16_t fid)
 }
 
-/*
- * HWRM utility functions
- */
-
 int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp)
 {
@@ -1995,4 +1990,8 @@ int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp)
 }
 
+/*
+ * HWRM utility functions
+ */
+
 void bnxt_free_hwrm_resources(struct bnxt *bp)
 {
@@ -2043,6 +2042,4 @@ int bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 			rc = bnxt_hwrm_clear_l2_filter(bp, filter);
 		STAILQ_REMOVE(&vnic->filter, filter, bnxt_filter_info, next);
-		//if (rc)
-			//break;
 	}
 	return rc;
@@ -2068,6 +2065,4 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 		STAILQ_REMOVE(&vnic->flow_list, flow, rte_flow, next);
 		rte_free(flow);
-		//if (rc)
-			//break;
 	}
 	return rc;
@@ -3809,8 +3804,4 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
 		memcpy(req.src_macaddr, filter->src_macaddr,
 		       ETHER_ADDR_LEN);
-	//if (enables &
-	    //HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_MACADDR)
-		//memcpy(req.dst_macaddr, filter->dst_macaddr,
-		       //ETHER_ADDR_LEN);
 	if (enables &
 	    HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_ETHERTYPE)
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:55.499988921 +0000
+++ 0065-net-bnxt-cleanup-comments.patch	2019-12-03 17:29:51.803748849 +0000
@@ -1 +1 @@
-From aa1fbf6bf74f26c2946909a0ab453d7de28a8e41 Mon Sep 17 00:00:00 2001
+From ff20bd33b868212daf014c66a37d275e12ac5189 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aa1fbf6bf74f26c2946909a0ab453d7de28a8e41 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -21,3 +22,2 @@
- drivers/net/bnxt/bnxt_flow.c   |  7 -------
- drivers/net/bnxt/bnxt_hwrm.c   | 28 +++++++++-------------------
- 4 files changed, 9 insertions(+), 29 deletions(-)
+ drivers/net/bnxt/bnxt_hwrm.c   | 27 +++++++++------------------
+ 3 files changed, 9 insertions(+), 21 deletions(-)
@@ -26 +26 @@
-index 118cf034d..e6f30fecb 100644
+index 0fd6e51e5..ff8fa04b4 100644
@@ -29,2 +29,2 @@
-@@ -59,6 +59,4 @@ void bnxt_handle_async_event(struct bnxt *bp,
- 	uint32_t event_data;
+@@ -22,6 +22,4 @@ void bnxt_handle_async_event(struct bnxt *bp,
+ 	uint16_t event_id = rte_le_to_cpu_16(async_cmp->event_id);
@@ -37 +37 @@
-index e95d47d29..8120b3916 100644
+index f43fe0db0..ca0070852 100644
@@ -46,21 +45,0 @@
-diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index 5aeb00140..85d23540f 100644
---- a/drivers/net/bnxt/bnxt_flow.c
-+++ b/drivers/net/bnxt/bnxt_flow.c
-@@ -1088,8 +1088,4 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
- 			goto use_vnic;
- 
--		//if (!rxq ||
--		    //bp->vnic_info[0].fw_grp_ids[act_q->index] !=
--		    //INVALID_HW_RING_ID ||
--		    //!rxq->rx_deferred_start) {
- 		if (!rxq ||
- 		    bp->vnic_info[0].fw_grp_ids[act_q->index] !=
-@@ -1321,7 +1317,4 @@ use_vnic:
- 			rxq = bp->rx_queues[rss->queue[i]];
- 
--			//if (bp->vnic_info[0].fw_grp_ids[rss->queue[i]] !=
--			    //INVALID_HW_RING_ID ||
--			    //!rxq->rx_deferred_start) {
- 			if (bp->vnic_info[0].fw_grp_ids[rss->queue[i]] !=
- 			    INVALID_HW_RING_ID) {
@@ -68 +47 @@
-index 5b430b941..1a1ea1bde 100644
+index 1bd8d3d9f..74f046c29 100644
@@ -71 +50 @@
-@@ -75,7 +75,7 @@ static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info *rmem,
+@@ -65,7 +65,7 @@ static int page_roundup(size_t size)
@@ -82 +61 @@
-@@ -177,9 +177,9 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
+@@ -151,9 +151,9 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
@@ -94 +73 @@
-@@ -519,5 +519,4 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
+@@ -465,5 +465,4 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
@@ -100 +79 @@
-@@ -2162,8 +2161,4 @@ int bnxt_hwrm_func_clr_stats(struct bnxt *bp, uint16_t fid)
+@@ -1800,8 +1799,4 @@ int bnxt_hwrm_func_clr_stats(struct bnxt *bp, uint16_t fid)
@@ -109 +88 @@
-@@ -2384,4 +2379,8 @@ int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp)
+@@ -1995,4 +1990,8 @@ int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp)
@@ -118 +97,2 @@
-@@ -2433,6 +2432,4 @@ int bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+@@ -2043,6 +2042,4 @@ int bnxt_clear_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+ 			rc = bnxt_hwrm_clear_l2_filter(bp, filter);
@@ -120 +99,0 @@
- 		bnxt_free_filter(bp, filter);
@@ -125 +104 @@
-@@ -2459,6 +2456,4 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+@@ -2068,6 +2065,4 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct bnxt_vnic_info *vnic)
@@ -132,7 +111 @@
-@@ -2515,5 +2510,4 @@ void bnxt_free_all_hwrm_resources(struct bnxt *bp)
- 		struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
- 
--		// If the VNIC ID is invalid we are not currently using the VNIC
- 		if (vnic->fw_vnic_id == INVALID_HW_RING_ID)
- 			continue;
-@@ -4227,8 +4221,4 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
+@@ -3809,8 +3804,4 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
@@ -140 +113 @@
- 		       RTE_ETHER_ADDR_LEN);
+ 		       ETHER_ADDR_LEN);
@@ -144 +117 @@
--		       //RTE_ETHER_ADDR_LEN);
+-		       //ETHER_ADDR_LEN);