[AMD Official Use Only - General]

Hi Mario,

Yes, this problem is on amd-staging-drm-next and I checked the adeucher/amd-staging-drm-next, this patch is not in there.

Best Regards, Ma,Li

-----Original Message----- From: Limonciello, Mario Mario.Limonciello@amd.com Sent: Wednesday, November 8, 2023 2:17 AM To: Ma, Li Li.Ma@amd.com; amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander Alexander.Deucher@amd.com; Zhang, Yifan Yifan1.Zhang@amd.com; Heiner Kallweit hkallweit1@gmail.com; stable@vger.kernel.org; David S . Miller davem@davemloft.net Subject: Re: [PATCH] r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h

On 11/7/2023 02:52, Li Ma wrote:

From: Heiner Kallweit hkallweit1@gmail.com

[Backport: commit 90ca51e8c654699b672ba61aeaa418dfb3252e5e] This backport to avoid the bug caused by r8169.

This effectively reverts 4b5f82f6aaef. On a number of systems ASPM L1 causes tx timeouts with RTL8168h, see referenced bug report.

Fixes: 4b5f82f6aaef ("r8169: enable ASPM L1/L1.1 from RTL8168h") Cc: stable@vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217814 Signed-off-by: Heiner Kallweit hkallweit1@gmail.com Signed-off-by: David S. Miller davem@davemloft.net

---

drivers/net/ethernet/realtek/r8169_main.c | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 45147a1016be..27efd07f09ef 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5224,13 +5224,9 @@ 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.
   */
  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);
  else
          rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);
  tp->aspm_manageable = !rc;
  

This is a backport from 6.6-rc1, I suppose you're sending the backport out because missing it is causing problems testing either amd-staging-drm-next or drm-next, right?

If the problems are amd-staging-drm-next I think you can: # git cherry-pick -x 90ca51e8c654699b672ba61aeaa418dfb3252e5e and commit there. Alex will just skip it when he builds the next PR or rebases to a newer release.

If the problem is on drm-next, we'll need to wait for drm-next to move up rather than cherry-picking it there.