From: Greg Kroah-Hartman Date: Tue, 28 Nov 2017 09:28:12 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v3.18.85~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81cfed33351b4c9fb71a924672c23c01f92e9e49;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: e1000e-fix-error-path-in-link-detection.patch e1000e-fix-return-value-test.patch e1000e-separate-signaling-for-link-check-link-up.patch --- diff --git a/queue-4.4/e1000e-fix-error-path-in-link-detection.patch b/queue-4.4/e1000e-fix-error-path-in-link-detection.patch new file mode 100644 index 00000000000..153f762c8fa --- /dev/null +++ b/queue-4.4/e1000e-fix-error-path-in-link-detection.patch @@ -0,0 +1,52 @@ +From c4c40e51f9c32c6dd8adf606624c930a1c4d9bbb Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:23 -0700 +Subject: e1000e: Fix error path in link detection + +From: Benjamin Poirier + +commit c4c40e51f9c32c6dd8adf606624c930a1c4d9bbb upstream. + +In case of error from e1e_rphy(), the loop will exit early and "success" +will be set to true erroneously. + +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/phy.c ++++ b/drivers/net/ethernet/intel/e1000e/phy.c +@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e + s32 ret_val = 0; + u16 i, phy_status; + ++ *success = false; + for (i = 0; i < iterations; i++) { + /* Some PHYs require the MII_BMSR register to be read + * twice due to the link bit being sticky. No harm doing +@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e + ret_val = e1e_rphy(hw, MII_BMSR, &phy_status); + if (ret_val) + break; +- if (phy_status & BMSR_LSTATUS) ++ if (phy_status & BMSR_LSTATUS) { ++ *success = true; + break; ++ } + if (usec_interval >= 1000) + msleep(usec_interval / 1000); + else + udelay(usec_interval); + } + +- *success = (i < iterations); +- + return ret_val; + } + diff --git a/queue-4.4/e1000e-fix-return-value-test.patch b/queue-4.4/e1000e-fix-return-value-test.patch new file mode 100644 index 00000000000..a5d0bdad711 --- /dev/null +++ b/queue-4.4/e1000e-fix-return-value-test.patch @@ -0,0 +1,32 @@ +From d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:25 -0700 +Subject: e1000e: Fix return value test + +From: Benjamin Poirier + +commit d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 upstream. + +All the helpers return -E1000_ERR_PHY. + +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -5035,7 +5035,7 @@ static bool e1000e_has_link(struct e1000 + break; + } + +- if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) && ++ if ((ret_val == -E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) && + (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) { + /* See e1000_kmrn_lock_loss_workaround_ich8lan() */ + e_info("Gigabit has been disabled, downgrading speed\n"); diff --git a/queue-4.4/e1000e-separate-signaling-for-link-check-link-up.patch b/queue-4.4/e1000e-separate-signaling-for-link-check-link-up.patch new file mode 100644 index 00000000000..9d378c49fdb --- /dev/null +++ b/queue-4.4/e1000e-separate-signaling-for-link-check-link-up.patch @@ -0,0 +1,90 @@ +From 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:26 -0700 +Subject: e1000e: Separate signaling for link check/link up + +From: Benjamin Poirier + +commit 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 upstream. + +Lennart reported the following race condition: + +\ e1000_watchdog_task + \ e1000e_has_link + \ hw->mac.ops.check_for_link() === e1000e_check_for_copper_link + /* link is up */ + mac->get_link_status = false; + + /* interrupt */ + \ e1000_msix_other + hw->mac.get_link_status = true; + + link_active = !hw->mac.get_link_status + /* link_active is false, wrongly */ + +This problem arises because the single flag get_link_status is used to +signal two different states: link status needs checking and link status is +down. + +Avoid the problem by using the return value of .check_for_link to signal +the link status to e1000e_has_link(). + +Reported-by: Lennart Sorensen +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/mac.c | 11 ++++++++--- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + 2 files changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/mac.c ++++ b/drivers/net/ethernet/intel/e1000e/mac.c +@@ -410,6 +410,9 @@ void e1000e_clear_hw_cntrs_base(struct e + * 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). + **/ + s32 e1000e_check_for_copper_link(struct e1000_hw *hw) + { +@@ -423,7 +426,7 @@ s32 e1000e_check_for_copper_link(struct + * 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 +@@ -461,10 +464,12 @@ s32 e1000e_check_for_copper_link(struct + * 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; + } + + /** +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -5017,7 +5017,7 @@ static bool e1000e_has_link(struct e1000 + case e1000_media_type_copper: + if (hw->mac.get_link_status) { + ret_val = hw->mac.ops.check_for_link(hw); +- link_active = !hw->mac.get_link_status; ++ link_active = ret_val > 0; + } else { + link_active = true; + } diff --git a/queue-4.4/series b/queue-4.4/series index f213b98bc50..3eca2ae455f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -66,3 +66,6 @@ sched-rt-simplify-the-ipi-based-rt-balancing-logic.patch fscrypt-lock-mutex-before-checking-for-bounce-page-pool.patch net-9p-switch-to-wait_event_killable.patch pm-opp-add-missing-of_node_put-np.patch +e1000e-fix-error-path-in-link-detection.patch +e1000e-fix-return-value-test.patch +e1000e-separate-signaling-for-link-check-link-up.patch