rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport fix e1000_check_for_copper_link_ich8lan return value

This commit is contained in:
Jeremy Cline 2017-12-20 10:42:15 -05:00
parent 93e24a13f9
commit d0caa1a154
No known key found for this signature in database
GPG Key ID: 9223308FA9B246DB
2 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch Normal file
View File

@ -0,0 +1,70 @@
From patchwork Mon Dec 11 07:26:40 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
From: Benjamin Poirier <bpoirier@suse.com>
X-Patchwork-Id: 10104349
Message-Id: <20171211072640.7935-1-bpoirier@suse.com>
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>,
Christian Hesse <list@eworm.de>, Gabriel C <nix.or.die@gmail.com>,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Date: Mon, 11 Dec 2017 16:26:40 +0900
e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan()
are the two functions that may be assigned to mac.ops.check_for_link when
phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e:
Separate signaling for link check/link up") changed the meaning of the
return value of check_for_link for copper media but only adjusted the first
function. This patch adjusts the second function likewise.
Reported-by: Christian Hesse <list@eworm.de>
Reported-by: Gabriel C <nix.or.die@gmail.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047
Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up")
Tested-by: Christian Hesse <list@eworm.de>
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index d6d4ed7acf03..31277d3bb7dc 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1367,6 +1367,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
* Checks to see of the link status of the hardware has changed. If a
* change in link status has been detected, then we read the PHY registers
* to get the current speed/duplex if link exists.
+ *
+ * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link
+ * up).
**/
static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
{
@@ -1382,7 +1385,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
* Change or Rx Sequence Error interrupt.
*/
if (!mac->get_link_status)
- return 0;
+ return 1;
/* First we want to see if the MII Status Register reports
* link. If so, then we want to get the current speed/duplex
@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
* different link partner.
*/
ret_val = e1000e_config_fc_after_link_up(hw);
- if (ret_val)
+ if (ret_val) {
e_dbg("Error configuring flow control\n");
+ return ret_val;
+ }
- return ret_val;
+ return 1;
}
static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)

8
kernel.spec
View File

@ -609,8 +609,9 @@ Patch332: arm64-socionext-96b-enablement.patch
# 500 - Temp fixes/CVEs etc
# rhbz 1498016 1498017
#Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch
# rhbz 1525523
# https://patchwork.kernel.org/patch/10104349/
Patch500: e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch
# 600 - Patches for improved Bay and Cherry Trail device support
# Below patches are submitted upstream, awaiting review / merging
@ -2190,6 +2191,9 @@ fi
#
#
%changelog
* Wed Dec 20 2017 Jeremy Cline <jeremy@jcline.org>
- Backport fix e1000_check_for_copper_link_ich8lan return value
* Tue Dec 19 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc4.git1.1
- Linux v4.15-rc4-41-gace52288edf0