Received: by 10.223.176.5 with SMTP id f5csp699166wra; Fri, 9 Feb 2018 05:54:35 -0800 (PST) X-Google-Smtp-Source: AH8x227+5t3Nd7L8sXVOADwaZW2pcxvyCXAv5OGRV+q+LVcX3TFmt1qcuzVePufEEMO//IZ4RtqD X-Received: by 2002:a17:902:5517:: with SMTP id f23-v6mr2599804pli.163.1518184475774; Fri, 09 Feb 2018 05:54:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518184475; cv=none; d=google.com; s=arc-20160816; b=dpzwTwLiL1dwqsDIZ354/eohFOh3D6SCqezWxK62K+BLModoV74EEW3a7nfFwaJAOl qhuvb2zS531jQ+n7o8rklS57N9vdNBJJRT5vxGiHsMi87N7oJ/I2qah8SjzQorPdLb2L af8uL95nxKfZfAuoz7ZsbbZzTkvUN39UGNoEa3c6qnYX+23MiochhIypqbH3vf+SzA3a QHASFNVzOwJSYg4P2TGO6+KajKuYFSQ0CVPJ22SE8PRsFEIVUEDpvK9gq0tXtbflCeED IRYOgEIVykQuORAozt9yADAG213AUOctnbMllEExWurOZcMX0brH5JuVev3nVxgZyMq+ P4zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=abJHj47hnMpAn7G/owfdoYMwdiz6oj5yw5c/NASORtg=; b=Gm0MdF15TeHzusUMmJPVOqAcLAGmiXMUeVGYy0dPk6Aweg7LdcZ1W3J/25/ZjdOhKj +aLuE/cI6prBomsn6KzfnPbwLWrluhS+1evBYALeeUwYm9WXITrrnrQt1tLjqa/1d9HB D58Qey8oBHlnZZ8Tcf8MAwoD9x7u/ax8CKo6JO6AEZAkMVoaLAEvxHzpyUDC5gQa3NQU DlSzsHR7AXwidymXAxdsowDmbaUiUwrMW3DxBb2Tv+3KLqwCKjJPaDiErLwNiUjGcfPG hJvSj3ko8uYjzTR1EqA7+ufF0gVpvIYCuYtcyk548Va2Fs17be9tonaTb33yMKpiVVMO fH3A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p2-v6si1576720plo.798.2018.02.09.05.54.21; Fri, 09 Feb 2018 05:54:35 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753725AbeBINqC (ORCPT + 99 others); Fri, 9 Feb 2018 08:46:02 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:52272 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707AbeBINp6 (ORCPT ); Fri, 9 Feb 2018 08:45:58 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 0C7BC113F; Fri, 9 Feb 2018 13:45:56 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chunhao Lin , "David S. Miller" Subject: [PATCH 4.14 08/22] r8169: fix RTL8168EP take too long to complete driver initialization. Date: Fri, 9 Feb 2018 14:39:57 +0100 Message-Id: <20180209133934.661753199@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209133934.024795822@linuxfoundation.org> References: <20180209133934.024795822@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chunhao Lin [ Upstream commit 086ca23d03c0d2f4088f472386778d293e15c5f6 ] Driver check the wrong register bit in rtl_ocp_tx_cond() that keep driver waiting until timeout. Fix this by waiting for the right register bit. Signed-off-by: Chunhao Lin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1388,7 +1388,7 @@ DECLARE_RTL_COND(rtl_ocp_tx_cond) { void __iomem *ioaddr = tp->mmio_addr; - return RTL_R8(IBISR0) & 0x02; + return RTL_R8(IBISR0) & 0x20; } static void rtl8168ep_stop_cmac(struct rtl8169_private *tp) @@ -1396,7 +1396,7 @@ static void rtl8168ep_stop_cmac(struct r void __iomem *ioaddr = tp->mmio_addr; RTL_W8(IBCR2, RTL_R8(IBCR2) & ~0x01); - rtl_msleep_loop_wait_low(tp, &rtl_ocp_tx_cond, 50, 2000); + rtl_msleep_loop_wait_high(tp, &rtl_ocp_tx_cond, 50, 2000); RTL_W8(IBISR0, RTL_R8(IBISR0) | 0x20); RTL_W8(IBCR0, RTL_R8(IBCR0) & ~0x01); }