From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 959DB138206 for ; Mon, 15 Jan 2018 14:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0B07E07FA; Mon, 15 Jan 2018 14:58:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8EE8BE07FA for ; Mon, 15 Jan 2018 14:58:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9A4A335C3E for ; Mon, 15 Jan 2018 14:57:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22597192 for ; Mon, 15 Jan 2018 14:57:57 +0000 (UTC) From: "Alice Ferrazzi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alice Ferrazzi" Message-ID: <1516027618.e050cc9e3b1806d268bc05fdecb1fbfc81fb03fb.alicef@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.9 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch X-VCS-Directories: / X-VCS-Committer: alicef X-VCS-Committer-Name: Alice Ferrazzi X-VCS-Revision: e050cc9e3b1806d268bc05fdecb1fbfc81fb03fb X-VCS-Branch: 4.9 Date: Mon, 15 Jan 2018 14:57:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b34d72e4-8d19-418c-8484-0588396e439c X-Archives-Hash: 199bf13a66a3da0e668cf91abe38bbed commit: e050cc9e3b1806d268bc05fdecb1fbfc81fb03fb Author: Alice Ferrazzi gentoo org> AuthorDate: Mon Jan 15 14:46:02 2018 +0000 Commit: Alice Ferrazzi gentoo org> CommitDate: Mon Jan 15 14:46:58 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e050cc9e Fix link is not ready / does not come up on e1000e ICH8 network interfaces 0000_README | 4 ++ ...heck_for_copper_link_ich8lan-return-value.patch | 66 ++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/0000_README b/0000_README index f7c3cd9..ef7f71e 100644 --- a/0000_README +++ b/0000_README @@ -371,6 +371,10 @@ Patch: 2300_enable-poweroff-on-Mac-Pro-11.patch From: http://kernel.ubuntu.com/git/ubuntu/ubuntu-xenial.git/patch/drivers/pci/quirks.c?id=5080ff61a438f3dd80b88b423e1a20791d8a774c Desc: Workaround to enable poweroff on Mac Pro 11. See bug #601964. +Patch: 2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch +From: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-4.9/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch +Desc: Fix link is not ready / does not come up on e1000e ICH8 network interfaces. See bug #641818. + Patch: 2900_dev-root-proc-mount-fix.patch From: https://bugs.gentoo.org/show_bug.cgi?id=438380 Desc: Ensure that /dev/root doesn't appear in /proc/mounts when bootint without an initramfs. diff --git a/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch b/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch new file mode 100644 index 0000000..95ab72d --- /dev/null +++ b/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch @@ -0,0 +1,66 @@ +From 4110e02eb45ea447ec6f5459c9934de0a273fb91 Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Mon, 11 Dec 2017 16:26:40 +0900 +Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value. + +From: Benjamin Poirier + +commit 4110e02eb45ea447ec6f5459c9934de0a273fb91 upstream. + +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") +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Tested-by: Christian Hesse +Signed-off-by: Jeff Kirsher +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1364,6 +1364,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) + { +@@ -1379,7 +1382,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 +@@ -1611,10 +1614,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)