[dpdk-stable] patch 'net/dpaa: fix link speed based on MAC type' has been queued to stable release 18.08.1
Kevin Traynor
ktraynor at redhat.com
Wed Nov 21 17:04:18 CET 2018
Hi,
FYI, your patch has been queued to stable release 18.08.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 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Kevin Traynor
---
>From df7ff506c66e78c704263f807a15b92d2edd8eb3 Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena at nxp.com>
Date: Fri, 21 Sep 2018 16:35:53 +0530
Subject: [PATCH] net/dpaa: fix link speed based on MAC type
[ upstream commit c1752a36b008ae91e427f89c5776727b7d7e4313 ]
The link speed shall be on the basis of mac type.
Fixes: 799db4568c76 ("net/dpaa: support device info and speed capability")
Cc: shreyansh.jain at nxp.com
Signed-off-by: Sachin Saxena <sachin.saxena at nxp.com>
---
drivers/net/dpaa/dpaa_ethdev.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 2a380f024..b32527424 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -318,6 +318,13 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
dev_info->max_vmdq_pools = ETH_16_POOLS;
dev_info->flow_type_rss_offloads = DPAA_RSS_OFFLOAD_ALL;
- dev_info->speed_capa = (ETH_LINK_SPEED_1G |
- ETH_LINK_SPEED_10G);
+
+ if (dpaa_intf->fif->mac_type == fman_mac_1g)
+ dev_info->speed_capa = ETH_LINK_SPEED_1G;
+ else if (dpaa_intf->fif->mac_type == fman_mac_10g)
+ dev_info->speed_capa = (ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G);
+ else
+ DPAA_PMD_ERR("invalid link_speed: %s, %d",
+ dpaa_intf->name, dpaa_intf->fif->mac_type);
+
dev_info->rx_offload_capa = dev_rx_offloads_sup |
dev_rx_offloads_nodis;
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-21 15:59:14.343724941 +0000
+++ 0028-net-dpaa-fix-link-speed-based-on-MAC-type.patch 2018-11-21 15:59:13.000000000 +0000
@@ -1,13 +1,14 @@
-From c1752a36b008ae91e427f89c5776727b7d7e4313 Mon Sep 17 00:00:00 2001
+From df7ff506c66e78c704263f807a15b92d2edd8eb3 Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena at nxp.com>
Date: Fri, 21 Sep 2018 16:35:53 +0530
Subject: [PATCH] net/dpaa: fix link speed based on MAC type
+[ upstream commit c1752a36b008ae91e427f89c5776727b7d7e4313 ]
+
The link speed shall be on the basis of mac type.
Fixes: 799db4568c76 ("net/dpaa: support device info and speed capability")
Cc: shreyansh.jain at nxp.com
-Cc: stable at dpdk.org
Signed-off-by: Sachin Saxena <sachin.saxena at nxp.com>
---
@@ -15,10 +16,10 @@
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
-index ff961e8b7..c3546f990 100644
+index 2a380f024..b32527424 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
-@@ -342,6 +342,13 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
+@@ -318,6 +318,13 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
dev_info->max_vmdq_pools = ETH_16_POOLS;
dev_info->flow_type_rss_offloads = DPAA_RSS_OFFLOAD_ALL;
- dev_info->speed_capa = (ETH_LINK_SPEED_1G |
More information about the stable
mailing list