Message ID | 20231221052510.443674-1-kai.heng.feng@canonical.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp198693dyi; Wed, 20 Dec 2023 21:26:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IGAHiF1lY/bQ5R+4UQe+yO6iEbuDTLGkJe37eWhikP6/rS8Dy15Gebklgy208xkRqUHmF4q X-Received: by 2002:a05:6358:261c:b0:170:b07b:8352 with SMTP id l28-20020a056358261c00b00170b07b8352mr907691rwc.4.1703136397755; Wed, 20 Dec 2023 21:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703136397; cv=none; d=google.com; s=arc-20160816; b=pU2XtptPnnUtXJkhS4VGieQMR0YtLAiSY0hApGHYA4b6auDCniBkqfR3mN5nI68yls 4hmrkWjg/Rni4vmkttLgyuEARPNOfFB5DFU2AWw05GcZ3DgnocXjB19lnsUu5QkCigZf 19g3tjirtycDActK+bmjL8QK7KBuqKb0JkcrKaT5L7F6S12Zd7p/3qKQiUpV6cDAdcgu lbAXQANaRIs9O/p7p9M5SVTdg0RnlC1g1SxldjVBshIDMmV1FF+ybKBxZ7M8AZM2gD6R JDTd8KlKyVeTMaVQNOo34k/clxJGFOntOr1VhFHUIlVQObPq4dzXn4XnqsdSzBuK/0Q0 +mzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=k5+SIK5H7uUjKHZKy6p8fuly9LFUOLMpMXnhcGKCNrY=; fh=N+rrpmQ6QSrfmpEHABQJxlUuiLftgK+oTui9WzpRyXM=; b=hu7wV6IktCDNiEvw3CvjyNfMxywtjeBVWG931PY7TiLnV9XC7cotLifVZD/bcOJUYc dWhZ0rNunKG3H0Fe+6WIW0njadL4HVVlbWOv7Dl0f/Bm6h0lR3LFlceGowsVzISqvSI6 mFvOAFPLw7Lxb2MpGG1PWZAHYCyVe+41SZ8E1r1nv6wFxVFLstTD164Rsb3K+5QoClcF 0DniYvBElY6QXf6wjAq16Bi+dc5ho+AslyYSyJiERJ8yoPAIIvlas0H4er/bUP4u4zB0 pk/VnX7ztL5UnXZTF6LeCtn3YFwN88Q8H6R7b7/EMt5OsODdM7XGTamml/rGx25Z4BcW wzbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=iraqdgt1; spf=pass (google.com: domain of linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id mt17-20020a17090b231100b0028bd63492a8si2313826pjb.48.2023.12.20.21.26.37 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 21:26:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=iraqdgt1; spf=pass (google.com: domain of linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7858-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id F2373286A20 for <ouuuleilei@gmail.com>; Thu, 21 Dec 2023 05:26:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23AC3BE4B; Thu, 21 Dec 2023 05:26:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="iraqdgt1" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1737AB678; Thu, 21 Dec 2023 05:26:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Received: from localhost.localdomain (1.general.khfeng.us.vpn [10.172.68.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id E3D2B421F1; Thu, 21 Dec 2023 05:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1703136366; bh=k5+SIK5H7uUjKHZKy6p8fuly9LFUOLMpMXnhcGKCNrY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=iraqdgt1oQXN4WRngqJ8sdZmx4mFyCAOr+A6ZIMHEwa90P9+q8aMmYZZdzq32L43l n64lAHvrgh2t4jmeATTaMFEz0xiPS0JKcqmV4sof/CRC+LTN+Bm0yH9UWfQfhFcnd/ mKNOSbXbq4khCA2F4+QoWyUYmgikKu2u0/Q9/SK9iBkQz/pwjLh0/FvgDW04LzNUY1 s0D4ydC61KGkrQBPqOYn9uh1DPwZXZMghva0btNNv0J4aO2LUfeUlTGPCgfqqom7kD ujttD5tA2SIwB8UxvA/vxKyr6G2Et9c16hblYyNV0/o+p5tCZTktApHTtIXj9C+lw3 o/RLJsSXGl0Og== From: Kai-Heng Feng <kai.heng.feng@canonical.com> To: hkallweit1@gmail.com, nic_swsd@realtek.com Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] r8169: Fix PCI error on system resume Date: Thu, 21 Dec 2023 13:25:10 +0800 Message-Id: <20231221052510.443674-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785865437341886553 X-GMAIL-MSGID: 1785867951065694609 |
Series |
[v2] r8169: Fix PCI error on system resume
|
|
Commit Message
Kai-Heng Feng
Dec. 21, 2023, 5:25 a.m. UTC
Some r8168 NICs stop working upon system resume:
[ 688.051096] r8169 0000:02:00.1 enp2s0f1: rtl_ep_ocp_read_cond == 0 (loop: 10, delay: 10000).
[ 688.175131] r8169 0000:02:00.1 enp2s0f1: Link is Down
...
[ 691.534611] r8169 0000:02:00.1 enp2s0f1: PCI error (cmd = 0x0407, status_errs = 0x0000)
Not sure if it's related, but those NICs have a BMC device at function
0:
02:00.0 Unassigned class [ff00]: Realtek Semiconductor Co., Ltd. Realtek RealManage BMC [10ec:816e] (rev 1a)
Since increase the loop wait on rtl_ep_ocp_read_cond can eliminate the
issue, so let rtl8168ep_driver_start() to wait a bit longer.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
v2:
- Wording
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 21.12.2023 06:25, Kai-Heng Feng wrote: > Some r8168 NICs stop working upon system resume: > > [ 688.051096] r8169 0000:02:00.1 enp2s0f1: rtl_ep_ocp_read_cond == 0 (loop: 10, delay: 10000). > [ 688.175131] r8169 0000:02:00.1 enp2s0f1: Link is Down > ... > [ 691.534611] r8169 0000:02:00.1 enp2s0f1: PCI error (cmd = 0x0407, status_errs = 0x0000) > > Not sure if it's related, but those NICs have a BMC device at function > 0: > 02:00.0 Unassigned class [ff00]: Realtek Semiconductor Co., Ltd. Realtek RealManage BMC [10ec:816e] (rev 1a) > > Since increase the loop wait on rtl_ep_ocp_read_cond can eliminate the > issue, so let rtl8168ep_driver_start() to wait a bit longer. > As this fixes an actual issue, the patch should target net and have a Fixes tag. > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > v2: > - Wording > > drivers/net/ethernet/realtek/r8169_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c > index bb787a52bc75..81fd31f6fac4 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -1211,7 +1211,7 @@ static void rtl8168ep_driver_start(struct rtl8169_private *tp) > { > r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START); > r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01); > - rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 10); > + rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30); > } > > static void rtl8168_driver_start(struct rtl8169_private *tp)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index bb787a52bc75..81fd31f6fac4 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1211,7 +1211,7 @@ static void rtl8168ep_driver_start(struct rtl8169_private *tp) { r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START); r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01); - rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 10); + rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30); } static void rtl8168_driver_start(struct rtl8169_private *tp)