Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3141888ybj; Mon, 23 Sep 2019 15:38:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXt2fdSNO6Lw1moF2NuCn06b4AuLf2YLI7aPV6bbwHC6LzYP3th8TKin6ZLo/QRB2t9f1O X-Received: by 2002:a17:906:3281:: with SMTP id 1mr1834533ejw.181.1569278319354; Mon, 23 Sep 2019 15:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569278319; cv=none; d=google.com; s=arc-20160816; b=dU6LqO67/KUNmMRhSwkTcHM67+tKt8Ghr4eEMQ+pLieAhNh6ZmGdGoGp+k8Btd0J7E qcApP/20zaOvFxboYHSA9wI1IQOiY9sqhdxdL84ND4dXXrC2oVHKOn4SynpEoj/O6vKf NOX+Hp81csstZGJxxJbBrfMSnC8XHk9BQ/0bJnBfFpdvlkLiu44oTrO+bFGm0xqzfgd+ ND0ajDyEB8ywC9n6y6dAqiqVDW/05xMaPkfl17dAkFdL/7CzuenVecaIsux7X0hX8zKF jSwsrkFsYFvnEIQVDspkIlXx86ZwW4PlvAu2P17TxLFSxnPCqZAVRMEFup/VobXrm062 iQQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LPmTppGLxGifsnEwtQlOmhIce1jvmDW42OTyoOtQeTo=; b=vJlFfOQ+xUxCJH6sd6VHcJAGBLDoPgblYC4v0tQldq5zoZGXmilM1LcKpWuPBFJ6Qt nAtn0K/GfRXNrn4Zu/77J2eCkajL35kBsROrsOy0N7LE5w/xW8kbjkNTowJQxCBiiaod c2WIIXdtQ5wjvCZSVM2RtX0xswSoG1fOztYR/Qb9baD3Gh8zCAHUyKttQmgXNqX1VS1g y6bp8UOwonWueo1Ys0Qkack5yD9MyDpZ6y0/5uN4HtAnr21NjrmLxIS8WwxDkux1T+Pt pZ38z8pGZ8pxi8u5ztcER0BGTAw83vc45XFwYrNwkOs1+f88D2FmzdLnZOIzzhRC0ebh o6WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xOcbHgyN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d48si7361884eda.383.2019.09.23.15.38.15; Mon, 23 Sep 2019 15:38:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xOcbHgyN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392268AbfIVStW (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:46000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388633AbfIVStB (ORCPT ); Sun, 22 Sep 2019 14:49:01 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C58F021479; Sun, 22 Sep 2019 18:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178140; bh=Q08OWC47QjTSZ3AcIhY2hiw8/byQe913VO0iicauhN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xOcbHgyNG8WIFHS8fjeYUkaFexQFSMO3+WndQmoXEmtTqxq6Vmzuc4RmmcxFb2iMj J2cpzUDkcw3q6qUCYfG1c+5/nZhHp5tscRQ+8TQ4r5nwbJ3d/IHefvQmMqwRFSloYf 76lf3/4NpN+MHga+3i/IyrM18GINhnhE8raZAVqM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai-Heng Feng , Aaron Brown , Jeff Kirsher , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 190/203] e1000e: add workaround for possible stalled packet Date: Sun, 22 Sep 2019 14:43:36 -0400 Message-Id: <20190922184350.30563-190-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai-Heng Feng [ Upstream commit e5e9a2ecfe780975820e157b922edee715710b66 ] This works around a possible stalled packet issue, which may occur due to clock recovery from the PCH being too slow, when the LAN is transitioning from K1 at 1G link speed. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204057 Signed-off-by: Kai-Heng Feng Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 ++++++++++ drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 395b057014809..a1fab77b2096a 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1429,6 +1429,16 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) else phy_reg |= 0xFA; e1e_wphy_locked(hw, I217_PLL_CLOCK_GATE_REG, phy_reg); + + if (speed == SPEED_1000) { + hw->phy.ops.read_reg_locked(hw, HV_PM_CTRL, + &phy_reg); + + phy_reg |= HV_PM_CTRL_K1_CLK_REQ; + + hw->phy.ops.write_reg_locked(hw, HV_PM_CTRL, + phy_reg); + } } hw->phy.ops.release(hw); diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h index eb09c755fa172..1502895eb45dd 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.h +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h @@ -210,7 +210,7 @@ /* PHY Power Management Control */ #define HV_PM_CTRL PHY_REG(770, 17) -#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA 0x100 +#define HV_PM_CTRL_K1_CLK_REQ 0x200 #define HV_PM_CTRL_K1_ENABLE 0x4000 #define I217_PLL_CLOCK_GATE_REG PHY_REG(772, 28) -- 2.20.1