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