Commit b0378321 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'r8169-enable-more-devices-aspm-support' 

ChunHao Lin says:

====================
r8169: enable more devices ASPM support

This series of patches will enable more devices ASPM support.
It also fix a RTL8126 cannot enter L1 substate issue when ASPM is
enabled.
====================

Link: https://patch.msgid.link/20250318083721.4127-1-hau@realtek.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6d192947 b48688ea

drivers/net/ethernet/realtek/r8169_main.c

+28 −1
Original line number Diff line number Diff line
@@ -2852,6 +2852,32 @@ static u32 rtl_csi_read(struct rtl8169_private *tp, int addr) 
		RTL_R32(tp, CSIDR) : ~0;

}



static void rtl_disable_zrxdc_timeout(struct rtl8169_private *tp)

{

	struct pci_dev *pdev = tp->pci_dev;

	u32 csi;

	int rc;

	u8 val;



#define RTL_GEN3_RELATED_OFF	0x0890

#define RTL_GEN3_ZRXDC_NONCOMPL	0x1

	if (pdev->cfg_size > RTL_GEN3_RELATED_OFF) {

		rc = pci_read_config_byte(pdev, RTL_GEN3_RELATED_OFF, &val);

		if (rc == PCIBIOS_SUCCESSFUL) {

			val &= ~RTL_GEN3_ZRXDC_NONCOMPL;

			rc = pci_write_config_byte(pdev, RTL_GEN3_RELATED_OFF,

						   val);

			if (rc == PCIBIOS_SUCCESSFUL)

				return;

		}

	}



	netdev_notice_once(tp->dev,

		"No native access to PCI extended config space, falling back to CSI\n");

	csi = rtl_csi_read(tp, RTL_GEN3_RELATED_OFF);

	rtl_csi_write(tp, RTL_GEN3_RELATED_OFF, csi & ~RTL_GEN3_ZRXDC_NONCOMPL);

}



static void rtl_set_aspm_entry_latency(struct rtl8169_private *tp, u8 val)

{

	struct pci_dev *pdev = tp->pci_dev;
@@ -3824,6 +3850,7 @@ static void rtl_hw_start_8125d(struct rtl8169_private *tp) 


static void rtl_hw_start_8126a(struct rtl8169_private *tp)

{

	rtl_disable_zrxdc_timeout(tp);

	rtl_set_def_aspm_entry_latency(tp);

	rtl_hw_start_8125_common(tp);

}
@@ -5398,7 +5425,7 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) 
/* register is set if system vendor successfully tested ASPM 1.2 */

static bool rtl_aspm_is_safe(struct rtl8169_private *tp)

{

	if (tp->mac_version >= RTL_GIGA_MAC_VER_61 &&

	if (tp->mac_version >= RTL_GIGA_MAC_VER_46 &&

	    r8168_mac_ocp_read(tp, 0xc0b2) & 0xf)

		return true;