[dpdk-stable] patch 'drivers/net: fix port id size' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/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 41d5a9c17c01719d96a145910767584a12bc8fe6 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia at intel.com>
Date: Wed, 30 Sep 2020 12:23:26 +0800
Subject: [PATCH] drivers/net: fix port id size

[ upstream commit fac8177a3669ff63d9ecb04372539e93e1f96ebf ]

The ethdev port id should be 16 bits now. This patch changes the
variable size of port id in some net drivers from 8 bits to 16
bits.

Fixes: 09b23f8b9df6 ("net/bnxt: fix port stop process and cleanup resources")
Fixes: 769de16872ab ("net/bnxt: fix port default rule create/destroy")
Fixes: 50370662b727 ("net/ice: support device and queue ops")
Fixes: a50d7cbbdad7 ("net/qede: support registers dump")

Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
Acked-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/ice/ice_rxtx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index 9e3d2cd076..041f00970d 100644
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -66,7 +66,7 @@ struct ice_rx_queue {
 	uint16_t rxrearm_start;	/**< the idx we start the re-arming from */
 	uint64_t mbuf_initializer; /**< value to init mbufs */
 
-	uint8_t port_id; /* device port ID */
+	uint16_t port_id; /* device port ID */
 	uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */
 	uint16_t queue_id; /* RX queue index */
 	uint16_t reg_idx; /* RX queue register index */
@@ -109,7 +109,7 @@ struct ice_tx_queue {
 	uint8_t pthresh; /**< Prefetch threshold register. */
 	uint8_t hthresh; /**< Host threshold register. */
 	uint8_t wthresh; /**< Write-back threshold reg. */
-	uint8_t port_id; /* Device port identifier. */
+	uint16_t port_id; /* Device port identifier. */
 	uint16_t queue_id; /* TX queue index. */
 	uint32_t q_teid; /* TX schedule node id. */
 	uint16_t reg_idx;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:14.708075078 +0000
+++ 0094-drivers-net-fix-port-id-size.patch	2020-10-28 10:35:11.644832085 +0000
@@ -1,8 +1,10 @@
-From fac8177a3669ff63d9ecb04372539e93e1f96ebf Mon Sep 17 00:00:00 2001
+From 41d5a9c17c01719d96a145910767584a12bc8fe6 Mon Sep 17 00:00:00 2001
 From: Chenbo Xia <chenbo.xia at intel.com>
 Date: Wed, 30 Sep 2020 12:23:26 +0800
 Subject: [PATCH] drivers/net: fix port id size
 
+[ upstream commit fac8177a3669ff63d9ecb04372539e93e1f96ebf ]
+
 The ethdev port id should be 16 bits now. This patch changes the
 variable size of port id in some net drivers from 8 bits to 16
 bits.
@@ -11,77 +13,28 @@
 Fixes: 769de16872ab ("net/bnxt: fix port default rule create/destroy")
 Fixes: 50370662b727 ("net/ice: support device and queue ops")
 Fixes: a50d7cbbdad7 ("net/qede: support registers dump")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
 Acked-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- drivers/net/bnxt/tf_ulp/bnxt_ulp.c      | 2 +-
- drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 6 +++---
- drivers/net/ice/ice_rxtx.h              | 4 ++--
- drivers/net/qede/base/bcm_osal.h        | 2 +-
- drivers/net/qede/qede_regs.c            | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
-index 93a79592d6..289619411f 100644
---- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
-+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
-@@ -646,7 +646,7 @@ static void
- bnxt_ulp_destroy_vfr_default_rules(struct bnxt *bp, bool global)
- {
- 	struct bnxt_ulp_vfr_rule_info *info;
--	uint8_t port_id;
-+	uint16_t port_id;
- 	struct rte_eth_dev *vfr_eth_dev;
- 	struct bnxt_representor *vfr_bp;
- 
-diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
-index f421e2ed6e..8dea235f0b 100644
---- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
-+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
-@@ -402,7 +402,7 @@ void
- bnxt_ulp_destroy_df_rules(struct bnxt *bp, bool global)
- {
- 	struct bnxt_ulp_df_rule_info *info;
--	uint8_t port_id;
-+	uint16_t port_id;
- 
- 	if (!BNXT_TRUFLOW_EN(bp) ||
- 	    BNXT_ETH_DEV_IS_REPRESENTOR(bp->eth_dev))
-@@ -466,7 +466,7 @@ int32_t
- bnxt_ulp_create_df_rules(struct bnxt *bp)
- {
- 	struct bnxt_ulp_df_rule_info *info;
--	uint8_t port_id;
-+	uint16_t port_id;
- 	int rc;
- 
- 	if (!BNXT_TRUFLOW_EN(bp) ||
-@@ -540,7 +540,7 @@ bnxt_ulp_create_vfr_default_rules(struct rte_eth_dev *vfr_ethdev)
- 	struct rte_eth_dev *parent_dev = vfr->parent_dev;
- 	struct bnxt *bp = parent_dev->data->dev_private;
- 	uint16_t vfr_port_id = vfr_ethdev->data->port_id;
--	uint8_t port_id;
-+	uint16_t port_id;
- 	int rc;
- 
- 	if (!bp || !BNXT_TRUFLOW_EN(bp))
+ drivers/net/ice/ice_rxtx.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
-index 6937faec3e..1c23c7541e 100644
+index 9e3d2cd076..041f00970d 100644
 --- a/drivers/net/ice/ice_rxtx.h
 +++ b/drivers/net/ice/ice_rxtx.h
-@@ -71,7 +71,7 @@ struct ice_rx_queue {
+@@ -66,7 +66,7 @@ struct ice_rx_queue {
  	uint16_t rxrearm_start;	/**< the idx we start the re-arming from */
  	uint64_t mbuf_initializer; /**< value to init mbufs */
  
 -	uint8_t port_id; /* device port ID */
 +	uint16_t port_id; /* device port ID */
  	uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */
- 	uint8_t fdir_enabled; /* 0 if FDIR disabled, 1 when enabled */
  	uint16_t queue_id; /* RX queue index */
-@@ -117,7 +117,7 @@ struct ice_tx_queue {
+ 	uint16_t reg_idx; /* RX queue register index */
+@@ -109,7 +109,7 @@ struct ice_tx_queue {
  	uint8_t pthresh; /**< Prefetch threshold register. */
  	uint8_t hthresh; /**< Host threshold register. */
  	uint8_t wthresh; /**< Write-back threshold reg. */
@@ -90,32 +43,6 @@
  	uint16_t queue_id; /* TX queue index. */
  	uint32_t q_teid; /* TX schedule node id. */
  	uint16_t reg_idx;
-diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
-index 575d4d0998..c5b5399282 100644
---- a/drivers/net/qede/base/bcm_osal.h
-+++ b/drivers/net/qede/base/bcm_osal.h
-@@ -382,7 +382,7 @@ void qede_hw_err_notify(struct ecore_hwfn *p_hwfn,
- /* TODO: */
- #define OSAL_SCHEDULE_RECOVERY_HANDLER(hwfn) nothing
- 
--int qede_save_fw_dump(uint8_t port_id);
-+int qede_save_fw_dump(uint16_t port_id);
- 
- #define OSAL_SAVE_FW_DUMP(port_id) qede_save_fw_dump(port_id)
- 
-diff --git a/drivers/net/qede/qede_regs.c b/drivers/net/qede/qede_regs.c
-index 1f2dbc6e7b..d2ea1c9108 100644
---- a/drivers/net/qede/qede_regs.c
-+++ b/drivers/net/qede/qede_regs.c
-@@ -242,7 +242,7 @@ qede_write_fwdump(const char *dump_file, void *dump, size_t len)
- }
- 
- int
--qede_save_fw_dump(uint8_t port_id)
-+qede_save_fw_dump(uint16_t port_id)
- {
- 	struct rte_eth_dev *eth_dev = &rte_eth_devices[port_id];
- 	struct rte_dev_reg_info regs;
 -- 
 2.20.1