* [PATCH net-next 0/2] r8169: enable more devices ASPM, LTR support @ 2025-03-14 7:50 ChunHao Lin 2025-03-14 7:50 ` [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support ChunHao Lin 2025-03-14 7:50 ` [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout ChunHao Lin 0 siblings, 2 replies; 6+ messages in thread From: ChunHao Lin @ 2025-03-14 7:50 UTC (permalink / raw) To: hkallweit1, nic_swsd, andrew+netdev, davem, edumazet, kuba, pabeni Cc: netdev, linux-kernel, ChunHao Lin This series of patches will enable more devices ASPM support and fix a RTL8126 cannot enter L1 substate issue when ASPM is enabled. ChunHao Lin (2): r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support r8169: disable RTL8126 ZRX-DC timeout drivers/net/ethernet/realtek/r8169_main.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -- 2.43.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support 2025-03-14 7:50 [PATCH net-next 0/2] r8169: enable more devices ASPM, LTR support ChunHao Lin @ 2025-03-14 7:50 ` ChunHao Lin 2025-03-21 17:16 ` Paolo Abeni 2025-03-14 7:50 ` [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout ChunHao Lin 1 sibling, 1 reply; 6+ messages in thread From: ChunHao Lin @ 2025-03-14 7:50 UTC (permalink / raw) To: hkallweit1, nic_swsd, andrew+netdev, davem, edumazet, kuba, pabeni Cc: netdev, linux-kernel, ChunHao Lin This patch will enable RTL8168H/RTL8168EP/RTL8168FP ASPM support on the platforms that have tested with ASPM enabled. Signed-off-by: ChunHao Lin <hau@realtek.com> --- 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 b18daeeda40d..3c663fca07d3 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5398,7 +5398,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; -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support 2025-03-14 7:50 ` [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support ChunHao Lin @ 2025-03-21 17:16 ` Paolo Abeni 0 siblings, 0 replies; 6+ messages in thread From: Paolo Abeni @ 2025-03-21 17:16 UTC (permalink / raw) To: ChunHao Lin, hkallweit1, nic_swsd, andrew+netdev, davem, edumazet, kuba Cc: netdev, linux-kernel On 3/14/25 8:50 AM, ChunHao Lin wrote: > This patch will enable RTL8168H/RTL8168EP/RTL8168FP ASPM support on > the platforms that have tested with ASPM enabled. > > Signed-off-by: ChunHao Lin <hau@realtek.com> > --- > 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 b18daeeda40d..3c663fca07d3 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -5398,7 +5398,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; > FTR 2 copies of this patch and the cover letter landed on the ML confusing patchwork. Please avoid duplicate messages in future submissions. Thanks, Paolo ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout 2025-03-14 7:50 [PATCH net-next 0/2] r8169: enable more devices ASPM, LTR support ChunHao Lin 2025-03-14 7:50 ` [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support ChunHao Lin @ 2025-03-14 7:50 ` ChunHao Lin 2025-03-14 11:33 ` Heiner Kallweit 1 sibling, 1 reply; 6+ messages in thread From: ChunHao Lin @ 2025-03-14 7:50 UTC (permalink / raw) To: hkallweit1, nic_swsd, andrew+netdev, davem, edumazet, kuba, pabeni Cc: netdev, linux-kernel, ChunHao Lin Disable it due to it dose not meet ZRX-DC specification. If it is enabled, device will exit L1 substate every 100ms. Disable it for saving more power in L1 substate. Signed-off-by: ChunHao Lin <hau@realtek.com> --- drivers/net/ethernet/realtek/r8169_main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 3c663fca07d3..dfc96b09b85e 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2852,6 +2852,21 @@ 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; + u8 val; + + if (pdev->cfg_size > 0x0890 && + pci_read_config_byte(pdev, 0x0890, &val) == PCIBIOS_SUCCESSFUL && + pci_write_config_byte(pdev, 0x0890, val & ~BIT(0)) == PCIBIOS_SUCCESSFUL) + return; + + netdev_notice_once(tp->dev, + "No native access to PCI extended config space, falling back to CSI\n"); + rtl_csi_write(tp, 0x0890, rtl_csi_read(tp, 0x0890) & ~BIT(0)); +} + static void rtl_set_aspm_entry_latency(struct rtl8169_private *tp, u8 val) { struct pci_dev *pdev = tp->pci_dev; @@ -3824,6 +3839,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); } -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout 2025-03-14 7:50 ` [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout ChunHao Lin @ 2025-03-14 11:33 ` Heiner Kallweit 2025-03-14 13:46 ` Hau 0 siblings, 1 reply; 6+ messages in thread From: Heiner Kallweit @ 2025-03-14 11:33 UTC (permalink / raw) To: ChunHao Lin, nic_swsd, andrew+netdev, davem, edumazet, kuba, pabeni Cc: netdev, linux-kernel On 14.03.2025 08:50, ChunHao Lin wrote: > Disable it due to it dose not meet ZRX-DC specification. If it is enabled, dose -> does > device will exit L1 substate every 100ms. Disable it for saving more power > in L1 substate. > > Signed-off-by: ChunHao Lin <hau@realtek.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c > index 3c663fca07d3..dfc96b09b85e 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -2852,6 +2852,21 @@ 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; > + u8 val; > + > + if (pdev->cfg_size > 0x0890 && > + pci_read_config_byte(pdev, 0x0890, &val) == PCIBIOS_SUCCESSFUL && > + pci_write_config_byte(pdev, 0x0890, val & ~BIT(0)) == PCIBIOS_SUCCESSFUL) > + return; > + > + netdev_notice_once(tp->dev, > + "No native access to PCI extended config space, falling back to CSI\n"); > + rtl_csi_write(tp, 0x0890, rtl_csi_read(tp, 0x0890) & ~BIT(0)); > +} > + Does the datasheet have a name for this extended config space register and bit 0? This would be better than using magic numbers. I think we can factor out the extended config space access to a helper. The same code we have in another place already. But this can be done as a follow-up. > static void rtl_set_aspm_entry_latency(struct rtl8169_private *tp, u8 val) > { > struct pci_dev *pdev = tp->pci_dev; > @@ -3824,6 +3839,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); > } ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout 2025-03-14 11:33 ` Heiner Kallweit @ 2025-03-14 13:46 ` Hau 0 siblings, 0 replies; 6+ messages in thread From: Hau @ 2025-03-14 13:46 UTC (permalink / raw) To: Heiner Kallweit, nic_swsd, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org > External mail : This email originated from outside the organization. Do not > reply, click links, or open attachments unless you recognize the sender and > know the content is safe. > > > > On 14.03.2025 08:50, ChunHao Lin wrote: > > Disable it due to it dose not meet ZRX-DC specification. If it is > > enabled, > > dose -> does > > > device will exit L1 substate every 100ms. Disable it for saving more > > power in L1 substate. > > > > Signed-off-by: ChunHao Lin <hau@realtek.com> > > --- > > drivers/net/ethernet/realtek/r8169_main.c | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c > > b/drivers/net/ethernet/realtek/r8169_main.c > > index 3c663fca07d3..dfc96b09b85e 100644 > > --- a/drivers/net/ethernet/realtek/r8169_main.c > > +++ b/drivers/net/ethernet/realtek/r8169_main.c > > @@ -2852,6 +2852,21 @@ 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; > > + u8 val; > > + > > + if (pdev->cfg_size > 0x0890 && > > + pci_read_config_byte(pdev, 0x0890, &val) == PCIBIOS_SUCCESSFUL > && > > + pci_write_config_byte(pdev, 0x0890, val & ~BIT(0)) == > PCIBIOS_SUCCESSFUL) > > + return; > > + > > + netdev_notice_once(tp->dev, > > + "No native access to PCI extended config space, falling back to > CSI\n"); > > + rtl_csi_write(tp, 0x0890, rtl_csi_read(tp, 0x0890) & ~BIT(0)); } > > + > > Does the datasheet have a name for this extended config space register and > bit 0? > This would be better than using magic numbers. I will try to get the name of this bit. > I think we can factor out the extended config space access to a helper. The > same code we have in another place already. But this can be done as a > follow-up. > > > static void rtl_set_aspm_entry_latency(struct rtl8169_private *tp, u8 > > val) { > > struct pci_dev *pdev = tp->pci_dev; @@ -3824,6 +3839,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); > > } ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-21 17:17 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-03-14 7:50 [PATCH net-next 0/2] r8169: enable more devices ASPM, LTR support ChunHao Lin 2025-03-14 7:50 ` [PATCH net-next 1/2] r8169: enable RTL8168H/RTL8168EP/RTL8168FP ASPM support ChunHao Lin 2025-03-21 17:16 ` Paolo Abeni 2025-03-14 7:50 ` [PATCH net-next 2/2] r8169: disable RTL8126 ZRX-DC timeout ChunHao Lin 2025-03-14 11:33 ` Heiner Kallweit 2025-03-14 13:46 ` Hau
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox