patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'net/ixgbe/base: add LHA ID' has been queued to stable release 18.08.1
@ 2018-12-14 17:51 Kevin Traynor
  2018-12-14 17:51 ` [dpdk-stable] patch 'net/bnx2x: cleanup info logs' " Kevin Traynor
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: Kevin Traynor @ 2018-12-14 17:51 UTC (permalink / raw)
  To: Luca Boccassi; +Cc: Qi Zhang, dpdk stable

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 12/18/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 c9359b0191d7c6bb9d4fab4ec938d8d7314d3be5 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Tue, 20 Nov 2018 11:27:12 +0000
Subject: [PATCH] net/ixgbe/base: add LHA ID

[ upstream commit 8eb9f9f025a04a37a678c9dfa1921dec87543f5e ]

ixgbe is able to recognize 1G SX and LX id, but it is missing the LHA.
Add it, so that it can handle LHA SFP plugin.

Fixes: d2e72774e58c ("ixgbe/base: support X550")

Signed-off-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_82599.c |  2 ++
 drivers/net/ixgbe/base/ixgbe_phy.c   | 13 +++++++++++++
 drivers/net/ixgbe/base/ixgbe_phy.h   |  1 +
 drivers/net/ixgbe/base/ixgbe_type.h  |  2 ++
 drivers/net/ixgbe/base/ixgbe_x550.c  |  4 ++++
 5 files changed, 22 insertions(+)

diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c
index 26217212a..007540476 100644
--- a/drivers/net/ixgbe/base/ixgbe_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_82599.c
@@ -425,4 +425,6 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
 	if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
 	    hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
+	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
 	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
 	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index 2df068ee3..e1e7a184c 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -1432,4 +1432,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 					hw->phy.sfp_type =
 						ixgbe_sfp_type_1g_lx_core1;
+			} else if (comp_codes_1g & IXGBE_SFF_1GBASELHA_CAPABLE) {
+				if (hw->bus.lan_id == 0)
+					hw->phy.sfp_type =
+						ixgbe_sfp_type_1g_lha_core0;
+				else
+					hw->phy.sfp_type =
+						ixgbe_sfp_type_1g_lha_core1;
 			} else {
 				hw->phy.sfp_type = ixgbe_sfp_type_unknown;
@@ -1519,4 +1526,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
+		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
@@ -1538,4 +1547,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
+		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
 		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
@@ -1865,4 +1876,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
 	if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
 	    sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+	    sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
 	    sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
 	    sfp_type == ixgbe_sfp_type_1g_sx_core0)
@@ -1870,4 +1882,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
 	else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
 		 sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
+		 sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
 		 sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
 		 sfp_type == ixgbe_sfp_type_1g_sx_core1)
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h
index cf8cadd96..5a5f99500 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -71,4 +71,5 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IXGBE_SFF_1GBASELX_CAPABLE	0x2
 #define IXGBE_SFF_1GBASET_CAPABLE	0x8
+#define IXGBE_SFF_1GBASELHA_CAPABLE	0x10
 #define IXGBE_SFF_10GBASESR_CAPABLE	0x10
 #define IXGBE_SFF_10GBASELR_CAPABLE	0x20
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index 6e03089eb..2a384b71c 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3749,4 +3749,6 @@ enum ixgbe_sfp_type {
 	ixgbe_sfp_type_1g_lx_core0 = 13,
 	ixgbe_sfp_type_1g_lx_core1 = 14,
+	ixgbe_sfp_type_1g_lha_core0 = 15,
+	ixgbe_sfp_type_1g_lha_core1 = 16,
 	ixgbe_sfp_type_not_present = 0xFFFE,
 	ixgbe_sfp_type_unknown = 0xFFFF
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index f66f54076..329eb1ab8 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1563,4 +1563,6 @@ STATIC s32 ixgbe_supported_sfp_modules_X550em(struct ixgbe_hw *hw, bool *linear)
 	case ixgbe_sfp_type_1g_lx_core0:
 	case ixgbe_sfp_type_1g_lx_core1:
+	case ixgbe_sfp_type_1g_lha_core0:
+	case ixgbe_sfp_type_1g_lha_core1:
 		*linear = false;
 		break;
@@ -1903,4 +1905,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 		if (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
 		    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1
+		    || hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
+		    hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1
 		    || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
 		    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1) {
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 17:49:47.701525332 +0000
+++ 0001-net-ixgbe-base-add-LHA-ID.patch	2018-12-14 17:49:47.000000000 +0000
@@ -1,13 +1,14 @@
-From 8eb9f9f025a04a37a678c9dfa1921dec87543f5e Mon Sep 17 00:00:00 2001
+From c9359b0191d7c6bb9d4fab4ec938d8d7314d3be5 Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca@debian.org>
 Date: Tue, 20 Nov 2018 11:27:12 +0000
 Subject: [PATCH] net/ixgbe/base: add LHA ID
 
+[ upstream commit 8eb9f9f025a04a37a678c9dfa1921dec87543f5e ]
+
 ixgbe is able to recognize 1G SX and LX id, but it is missing the LHA.
 Add it, so that it can handle LHA SFP plugin.
 
 Fixes: d2e72774e58c ("ixgbe/base: support X550")
-Cc: stable@dpdk.org
 
 Signed-off-by: Luca Boccassi <bluca@debian.org>
 Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
@@ -20,10 +21,10 @@
  5 files changed, 22 insertions(+)
 
 diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c
-index 7de753fd3..96bdde62c 100644
+index 26217212a..007540476 100644
 --- a/drivers/net/ixgbe/base/ixgbe_82599.c
 +++ b/drivers/net/ixgbe/base/ixgbe_82599.c
-@@ -393,4 +393,6 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
+@@ -425,4 +425,6 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
  	if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
  	    hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
 +	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
@@ -31,10 +32,10 @@
  	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
  	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
 diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
-index 6cdd8fbab..dd118f917 100644
+index 2df068ee3..e1e7a184c 100644
 --- a/drivers/net/ixgbe/base/ixgbe_phy.c
 +++ b/drivers/net/ixgbe/base/ixgbe_phy.c
-@@ -1403,4 +1403,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
+@@ -1432,4 +1432,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
  					hw->phy.sfp_type =
  						ixgbe_sfp_type_1g_lx_core1;
 +			} else if (comp_codes_1g & IXGBE_SFF_1GBASELHA_CAPABLE) {
@@ -46,47 +47,47 @@
 +						ixgbe_sfp_type_1g_lha_core1;
  			} else {
  				hw->phy.sfp_type = ixgbe_sfp_type_unknown;
-@@ -1490,4 +1497,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
+@@ -1519,4 +1526,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
  		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
 +		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
 +		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
-@@ -1509,4 +1518,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
+@@ -1538,4 +1547,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
  		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
 +		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
 +		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
  		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
-@@ -1836,4 +1847,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
+@@ -1865,4 +1876,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
  	if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
  	    sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
 +	    sfp_type == ixgbe_sfp_type_1g_lha_core0 ||
  	    sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
  	    sfp_type == ixgbe_sfp_type_1g_sx_core0)
-@@ -1841,4 +1853,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
+@@ -1870,4 +1882,5 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
  	else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
  		 sfp_type == ixgbe_sfp_type_1g_lx_core1 ||
 +		 sfp_type == ixgbe_sfp_type_1g_lha_core1 ||
  		 sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
  		 sfp_type == ixgbe_sfp_type_1g_sx_core1)
 diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h
-index 132fa542b..f1605f2cc 100644
+index cf8cadd96..5a5f99500 100644
 --- a/drivers/net/ixgbe/base/ixgbe_phy.h
 +++ b/drivers/net/ixgbe/base/ixgbe_phy.h
-@@ -42,4 +42,5 @@
+@@ -71,4 +71,5 @@ POSSIBILITY OF SUCH DAMAGE.
  #define IXGBE_SFF_1GBASELX_CAPABLE	0x2
  #define IXGBE_SFF_1GBASET_CAPABLE	0x8
 +#define IXGBE_SFF_1GBASELHA_CAPABLE	0x10
  #define IXGBE_SFF_10GBASESR_CAPABLE	0x10
  #define IXGBE_SFF_10GBASELR_CAPABLE	0x20
 diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
-index cee6ba2e0..077b8f01c 100644
+index 6e03089eb..2a384b71c 100644
 --- a/drivers/net/ixgbe/base/ixgbe_type.h
 +++ b/drivers/net/ixgbe/base/ixgbe_type.h
-@@ -3725,4 +3725,6 @@ enum ixgbe_sfp_type {
+@@ -3749,4 +3749,6 @@ enum ixgbe_sfp_type {
  	ixgbe_sfp_type_1g_lx_core0 = 13,
  	ixgbe_sfp_type_1g_lx_core1 = 14,
 +	ixgbe_sfp_type_1g_lha_core0 = 15,
@@ -94,17 +95,17 @@
  	ixgbe_sfp_type_not_present = 0xFFFE,
  	ixgbe_sfp_type_unknown = 0xFFFF
 diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
-index f7b98af52..a920a146e 100644
+index f66f54076..329eb1ab8 100644
 --- a/drivers/net/ixgbe/base/ixgbe_x550.c
 +++ b/drivers/net/ixgbe/base/ixgbe_x550.c
-@@ -1535,4 +1535,6 @@ STATIC s32 ixgbe_supported_sfp_modules_X550em(struct ixgbe_hw *hw, bool *linear)
+@@ -1563,4 +1563,6 @@ STATIC s32 ixgbe_supported_sfp_modules_X550em(struct ixgbe_hw *hw, bool *linear)
  	case ixgbe_sfp_type_1g_lx_core0:
  	case ixgbe_sfp_type_1g_lx_core1:
 +	case ixgbe_sfp_type_1g_lha_core0:
 +	case ixgbe_sfp_type_1g_lha_core1:
  		*linear = false;
  		break;
-@@ -1875,4 +1877,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
+@@ -1903,4 +1905,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
  		if (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
  		    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1
 +		    || hw->phy.sfp_type == ixgbe_sfp_type_1g_lha_core0 ||

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2018-12-14 17:53 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-14 17:51 [dpdk-stable] patch 'net/ixgbe/base: add LHA ID' has been queued to stable release 18.08.1 Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/bnx2x: cleanup info logs' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'examples/bond: fix crash when there is no active slave' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix function documentation' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ifcvf: fix typo on struct name' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix getting RSS configuration' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ixgbe: fix Rx LRO capability offload for x550' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix overwriting RSS RETA' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ixgbe: " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix port close' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix validation of Rx queue number' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'ethdev: fix typo in queue setup error log' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'doc: fix a typo in testpmd guide' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/cxgbe: fix control queue mbuf pool naming convention' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'drivers/net: fix several Tx prepare functions' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'vhost: fix crash after mmap failure' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'vhost: fix double read of descriptor flags' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: revert fix offload not supported mask' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: remove redundant reset of queue number' " Kevin Traynor

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).