From 6a221d27b1ef3406e2dc4a822bb7fe9b4318590d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 28 Dec 2017 01:24:56 +0000 Subject: [PATCH] e1000e: Fix e1000_check_for_copper_link_ich8lan return value. Closes: #885348 --- debian/changelog | 7 +++ ...for_copper_link_ich8lan-return-value.patch | 60 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 68 insertions(+) create mode 100644 debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch diff --git a/debian/changelog b/debian/changelog index 9bdf8295e..4b4b42ef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.14.7-2) UNRELEASED; urgency=medium + + * e1000e: Fix e1000_check_for_copper_link_ich8lan return value. + (Closes: #885348) + + -- Ben Hutchings Thu, 28 Dec 2017 01:18:05 +0000 + linux (4.14.7-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch b/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch new file mode 100644 index 000000000..bedfd0282 --- /dev/null +++ b/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch @@ -0,0 +1,60 @@ +From: Benjamin Poirier +Date: Mon, 11 Dec 2017 16:26:40 +0900 +Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value. +Origin: https://marc.info/?l=linux-kernel&m=151297726823919&w=2 +Bug: https://bugzilla.kernel.org/show_bug.cgi?id=198047 +Bug-Debian: https://bugs.debian.org/885348 + +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 +Reported-by: Gabriel C +Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047 +Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up") +Tested-by: Christian Hesse +Signed-off-by: Benjamin Poirier +--- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c ++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c +@@ -1367,6 +1367,9 @@ out: + * 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_i + * 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_i + * 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) diff --git a/debian/patches/series b/debian/patches/series index de8d95f87..3927f4ea0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -81,6 +81,7 @@ bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch bugfix/all/i40e-i40evf-organize-and-re-number-feature-flags.patch bugfix/all/i40e-fix-flags-declaration.patch bugfix/all/xen-time-do-not-decrease-steal-time-after-live-migra.patch +bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch # Miscellaneous features