[dpdk-stable] patch 'net/dpaa: fix port ID type in API' 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 f93ade8e2e3a0454f62fbbbf8e15872857a87232 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Tue, 25 Aug 2020 18:51:06 +0100
Subject: [PATCH] net/dpaa: fix port ID type in API

[ upstream commit ae8f4cf3283e4036b56709cee74ddfa386de5f6b ]

Updating the type for 'port' variable from 'uint8_t' to 'uint16_t'.

Fixes: 8c3495f5d2dd ("net/dpaa: support loopback API")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_ethdev.c  | 2 +-
 drivers/net/dpaa/rte_pmd_dpaa.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 5f81968d80..a54ec0deb6 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1120,7 +1120,7 @@ is_dpaa_supported(struct rte_eth_dev *dev)
 }
 
 int
-rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on)
+rte_pmd_dpaa_set_tx_loopback(uint16_t port, uint8_t on)
 {
 	struct rte_eth_dev *dev;
 	struct dpaa_if *dpaa_intf;
diff --git a/drivers/net/dpaa/rte_pmd_dpaa.h b/drivers/net/dpaa/rte_pmd_dpaa.h
index 8d244bb491..ec45633ba2 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa.h
+++ b/drivers/net/dpaa/rte_pmd_dpaa.h
@@ -29,6 +29,6 @@
  *   - (-EINVAL) if bad parameter.
  */
 int
-rte_pmd_dpaa_set_tx_loopback(uint8_t port, uint8_t on);
+rte_pmd_dpaa_set_tx_loopback(uint16_t port, uint8_t on);
 
 #endif /* _PMD_DPAA_H_ */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.853715367 +0000
+++ 0034-net-dpaa-fix-port-ID-type-in-API.patch	2020-10-28 10:35:11.476829611 +0000
@@ -1,40 +1,26 @@
-From ae8f4cf3283e4036b56709cee74ddfa386de5f6b Mon Sep 17 00:00:00 2001
+From f93ade8e2e3a0454f62fbbbf8e15872857a87232 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Tue, 25 Aug 2020 18:51:06 +0100
 Subject: [PATCH] net/dpaa: fix port ID type in API
 
+[ upstream commit ae8f4cf3283e4036b56709cee74ddfa386de5f6b ]
+
 Updating the type for 'port' variable from 'uint8_t' to 'uint16_t'.
 
 Fixes: 8c3495f5d2dd ("net/dpaa: support loopback API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 ---
- doc/guides/rel_notes/deprecation.rst | 3 ---
- drivers/net/dpaa/dpaa_ethdev.c       | 2 +-
- drivers/net/dpaa/rte_pmd_dpaa.h      | 2 +-
- 3 files changed, 2 insertions(+), 5 deletions(-)
+ drivers/net/dpaa/dpaa_ethdev.c  | 2 +-
+ drivers/net/dpaa/rte_pmd_dpaa.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
-index 09646b29fb..5f568f4b72 100644
---- a/doc/guides/rel_notes/deprecation.rst
-+++ b/doc/guides/rel_notes/deprecation.rst
-@@ -193,9 +193,6 @@ Deprecation Notices
-   following the IPv6 header, as proposed in RFC
-   https://mails.dpdk.org/archives/dev/2020-August/177257.html.
- 
--* pmd_dpaa: The API ``rte_pmd_dpaa_set_tx_loopback`` will have extended
--  ``port_id`` definition from ``uint8_t`` to ``uint16_t``.
--
- * vhost: Vhost-user dequeue zero-copy support will be removed in 20.11.
-   The only known user is OVS where the feature is still experimental,
-   and has not received any update for 2.5 years.
 diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
-index a077b98c3e..8a6b19b5ce 100644
+index 5f81968d80..a54ec0deb6 100644
 --- a/drivers/net/dpaa/dpaa_ethdev.c
 +++ b/drivers/net/dpaa/dpaa_ethdev.c
-@@ -1473,7 +1473,7 @@ is_dpaa_supported(struct rte_eth_dev *dev)
+@@ -1120,7 +1120,7 @@ is_dpaa_supported(struct rte_eth_dev *dev)
  }
  
  int
@@ -42,7 +28,7 @@
 +rte_pmd_dpaa_set_tx_loopback(uint16_t port, uint8_t on)
  {
  	struct rte_eth_dev *dev;
- 
+ 	struct dpaa_if *dpaa_intf;
 diff --git a/drivers/net/dpaa/rte_pmd_dpaa.h b/drivers/net/dpaa/rte_pmd_dpaa.h
 index 8d244bb491..ec45633ba2 100644
 --- a/drivers/net/dpaa/rte_pmd_dpaa.h