Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:08:48 +0100
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:09:57 +0100
commitd9fe35a7183fdbac8668f6675408432f01556cb5 (patch)
tree16c792f295aab27c92078f4eb1144f5cccacedda
parent02fa8eb79cdc5d11b2c728d8b912b4b129869f8f (diff)
igb: Enable media autosense for the i350 (jsc#SLE-7967
jsc#SLE-8010).
-rw-r--r--patches.suse/igb-Enable-media-autosense-for-the-i350.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.suse/igb-Enable-media-autosense-for-the-i350.patch b/patches.suse/igb-Enable-media-autosense-for-the-i350.patch
new file mode 100644
index 0000000000..dc96673b1e
--- /dev/null
+++ b/patches.suse/igb-Enable-media-autosense-for-the-i350.patch
@@ -0,0 +1,43 @@
+From: Manfred Rudigier <manfred.rudigier@omicronenergy.com>
+Date: Thu, 15 Aug 2019 13:55:19 -0700
+Subject: igb: Enable media autosense for the i350.
+Patch-mainline: v5.4-rc6
+Git-commit: fb2308ba16bf1fd2cc3635172381e265fbfcb76d
+References: jsc#SLE-7967 jsc#SLE-8010
+
+This patch enables the hardware feature "Media Auto Sense" also on the
+i350. It works in the same way as on the 82850 devices. Hardware designs
+using dual PHYs (fiber/copper) can enable this feature by setting the MAS
+enable bits in the NVM_COMPAT register (0x03) in the EEPROM.
+
+Signed-off-by: Manfred Rudigier <manfred.rudigier@omicronenergy.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
++++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
+@@ -466,7 +466,7 @@ static s32 igb_init_mac_params_82575(str
+ ? igb_setup_copper_link_82575
+ : igb_setup_serdes_link_82575;
+
+- if (mac->type == e1000_82580) {
++ if (mac->type == e1000_82580 || mac->type == e1000_i350) {
+ switch (hw->device_id) {
+ /* feature not supported on these id's */
+ case E1000_DEV_ID_DH89XXCC_SGMII:
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -2371,7 +2371,7 @@ void igb_reset(struct igb_adapter *adapt
+ adapter->ei.get_invariants(hw);
+ adapter->flags &= ~IGB_FLAG_MEDIA_RESET;
+ }
+- if ((mac->type == e1000_82575) &&
++ if ((mac->type == e1000_82575 || mac->type == e1000_i350) &&
+ (adapter->flags & IGB_FLAG_MAS_ENABLE)) {
+ igb_enable_mas(adapter);
+ }
diff --git a/series.conf b/series.conf
index 2a4909522c..8d801caa3e 100644
--- a/series.conf
+++ b/series.conf
@@ -2891,6 +2891,7 @@
patches.suse/netdevsim-Fix-use-after-free-during-device-dismantle.patch
patches.suse/tcp-increase-tcp_max_syn_backlog-max-value.patch
patches.suse/igb-igc-Don-t-warn-on-fatal-read-failures-when-the-d.patch
+ patches.suse/igb-Enable-media-autosense-for-the-i350.patch
patches.suse/powerpc-powernv-Fix-CPU-idle-to-be-called-with-IRQs-.patch
patches.suse/scsi-qla2xxx-fixup-incorrect-usage-of-host_byte.patch
patches.suse/scsi-lpfc-Check-queue-pointer-before-use.patch