From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: hkallweit1@gmail.com, nic_swsd@realtek.com, bhelgaas@google.com
Cc: koba.ko@canonical.com, acelan.kao@canonical.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, sathyanarayanan.kuppuswamy@linux.intel.com,
vidyas@nvidia.com, rafael.j.wysocki@intel.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>
Subject: [PATCH v8 RESEND 1/6] r8169: Disable ASPM L1.1 on 8168h
Date: Tue, 21 Feb 2023 10:38:44 +0800 [thread overview]
Message-ID: <20230221023849.1906728-2-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20230221023849.1906728-1-kai.heng.feng@canonical.com>
ASPM L1/L1.1 gets enabled based on [0], but ASPM L1.1 was actually
disabled too [1].
So also disable L1.1 for better compatibility.
[0] https://bugs.launchpad.net/bugs/1942830
[1] https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-oem/+git/focal/commit/?id=c9b3736de48fd419d6699045d59a0dd1041da014
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
v8:
- New patch.
drivers/net/ethernet/realtek/r8169_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 45147a1016bec..1c949822661ae 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5224,13 +5224,13 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Disable ASPM L1 as that cause random device stop working
* problems as well as full system hangs for some PCIe devices users.
- * Chips from RTL8168h partially have issues with L1.2, but seem
- * to work fine with L1 and L1.1.
+ * Chips from RTL8168h partially have issues with L1.1 and L1.2, but
+ * seem to work fine with L1.
*/
if (rtl_aspm_is_safe(tp))
rc = 0;
else if (tp->mac_version >= RTL_GIGA_MAC_VER_46)
- rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2);
+ rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_1 | PCIE_LINK_STATE_L1_2);
else
rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);
tp->aspm_manageable = !rc;
--
2.34.1
next prev parent reply other threads:[~2023-02-21 2:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 2:38 [PATCH v8 RESEND 0/6] r8169: Enable ASPM for recent 1.0/2.5Gbps Realtek NICs Kai-Heng Feng
2023-02-21 2:38 ` Kai-Heng Feng [this message]
2023-02-21 10:52 ` [PATCH v8 RESEND 1/6] r8169: Disable ASPM L1.1 on 8168h Heiner Kallweit
2023-02-22 13:00 ` Kai-Heng Feng
2023-02-21 2:38 ` [PATCH v8 RESEND 2/6] Revert "PCI/ASPM: Unexport pcie_aspm_support_enabled()" Kai-Heng Feng
2023-02-21 2:38 ` [PATCH v8 RESEND 3/6] PCI/ASPM: Add pcie_aspm_capable() helper Kai-Heng Feng
2023-02-21 2:38 ` [PATCH v8 RESEND 4/6] r8169: Consider chip-specific ASPM can be enabled on more cases Kai-Heng Feng
2023-02-21 2:38 ` [PATCH v8 RESEND 5/6] r8169: Use mutex to guard config register locking Kai-Heng Feng
2023-02-21 2:38 ` [PATCH v8 RESEND 6/6] r8169: Disable ASPM while doing NAPI poll Kai-Heng Feng
2023-02-21 11:08 ` Heiner Kallweit
2023-02-22 13:03 ` Kai-Heng Feng
2023-02-24 3:38 ` Kai-Heng Feng
2023-02-21 10:48 ` [PATCH v8 RESEND 0/6] r8169: Enable ASPM for recent 1.0/2.5Gbps Realtek NICs Heiner Kallweit
2023-02-22 12:58 ` Kai-Heng Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230221023849.1906728-2-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=acelan.kao@canonical.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=koba.ko@canonical.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pabeni@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=vidyas@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).