FAILED: patch "[PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions" failed to apply to 6.4-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y
git checkout FETCH_HEAD
git cherry-pick -x cf2ffdea0839398cb0551762af7f5efb0a6e0fea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023072337-dreamlike-rewrite-a12e@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From cf2ffdea0839398cb0551762af7f5efb0a6e0fea Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <[email protected]>
Date: Tue, 18 Jul 2023 13:11:31 +0200
Subject: [PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions
now that ASPM is disabled during NAPI poll")
There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS.
Due to later changes we can't do a direct revert.
drivers/net/ethernet/realtek/r8169_main.c +26 -1
@@ -623,6 +623,7 @@ struct rtl8169_private {int cfg9346_usage_count; unsigned supports_gmii:1; + unsigned aspm_manageable:1;dma_addr_t counters_phys_addr;struct rtl8169_counters *counters;struct rtl8169_tc_offsets tc_offset;
@@ -2746,7 +2747,8 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)if (tp->mac_version <RTL_GIGA_MAC_VER_32 )return ; -if (enable) { +/* Don't enable ASPM in the chip if OS can't control ASPM */ +if (enable && tp->aspm_manageable) {/* On these chip versions ASPM can even harm * bus communication of other PCI devices. */
@@ -5165,6 +5167,16 @@ static void rtl_init_mac_address(struct rtl8169_private *tp)rtl_rar_set (tp, mac_addr); } +/* 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 && +r8168_mac_ocp_read (tp,0xc0b2 ) &0xf ) +return true; + +return false; +} +static int rtl_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {struct rtl8169_private *tp;
@@ -5234,6 +5246,19 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) xid); tp->mac_version = chipset; +/* 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; + tp->dash_type =rtl_check_dash (tp); tp->cp_cmd =RTL_R16 (tp, CPlusCmd) &CPCMD_MASK ;
Heiner Kallweit
maintainerPATCH 1/1 r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")
There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS.
Due to later changes we can't do a direct revert.
--- drivers/net/ethernet/realtek/r8169_main.c | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +26 -1
@@ -623,6 +623,7 @@ struct rtl8169_private {int cfg9346_usage_count; unsigned supports_gmii:1; + unsigned aspm_manageable:1;dma_addr_t counters_phys_addr;struct rtl8169_counters *counters;struct rtl8169_tc_offsets tc_offset;
@@ -2746,7 +2747,8 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)if (tp->mac_version <RTL_GIGA_MAC_VER_32 )return ; -if (enable) { +/* Don't enable ASPM in the chip if OS can't control ASPM */ +if (enable && tp->aspm_manageable) {rtl_mod_config5 (tp,0 , ASPM_en);rtl_mod_config2 (tp,0 , ClkReqEn);
@@ -5149,6 +5151,16 @@ static void rtl_init_mac_address(struct rtl8169_private *tp)rtl_rar_set (tp, mac_addr); } +/* 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 && +r8168_mac_ocp_read (tp,0xc0b2 ) &0xf ) +return true; + +return false; +} +static int rtl_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {struct rtl8169_private *tp;
@@ -5220,6 +5232,19 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->mac_version = chipset; +/* 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; + tp->dash_type =rtl_check_dash (tp); tp->cp_cmd =RTL_R16 (tp, CPlusCmd) &CPCMD_MASK ;
Signature · 1 line
2.41.0
Greg KH
maintainerRe: [PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")
Quoted 12 lines · Heiner Kallweit
There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS.
Due to later changes we can't do a direct revert.Fixes 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")Cc [email protected] # v6.4.ySigned-off-by Heiner Kallweit <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>
Quoted 4 lines
--- drivers/net/ethernet/realtek/r8169_main.c | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
Heiner Kallweit
maintainerRe: [PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")
Quoted 18 lines · Greg KH
Quoted 12 lines · Heiner Kallweit
There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS.
Due to later changes we can't do a direct revert.Fixes 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")Cc [email protected] # v6.4.ySigned-off-by Heiner Kallweit <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Quoted 4 lines
--- drivers/net/ethernet/realtek/r8169_main.c | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
Quoted 8 lines
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.</formletter>
The conflict notification email mentioned the following, therefore I replied with the backported patch. Which part is wrong or what is missing?
The patch below does not apply to the 6.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y
git checkout FETCH_HEAD
git cherry-pick -x cf2ffdea0839398cb0551762af7f5efb0a6e0fea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023072337-dreamlike-rewrite-a12e@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
Greg KH
maintainerRe: [PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")
Quoted 26 lines · Heiner Kallweit
Quoted 25 lines · Greg KH
Quoted 12 lines · Heiner Kallweit
There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS.
Due to later changes we can't do a direct revert.Fixes 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll")Cc [email protected] # v6.4.ySigned-off-by Heiner Kallweit <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Quoted 4 lines
--- drivers/net/ethernet/realtek/r8169_main.c | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
Quoted 4 lines
Quoted 1 line
</formletter>
The conflict notification email mentioned the following, therefore I replied with the backported patch. Which part is wrong or what is missing?
No hint that it was a backported patch, what the git id was, or what branch to apply it to :(
Quoted 5 lines
The patch below does not apply to the 6.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Quoted 8 lines
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y
git checkoutFETCH_HEAD
git cherry-pick -xcf2ffdea0839398cb0551762af7f5efb0a6e0fea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023072337-dreamlike-rewrite-a12e@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
The instructions above, if followed, will give the git id, and the branch to apply it to, in the email in a form which it can be properly deduced.
Otherwise this looks like a mis-directed patch that we don't know what to do with :(
thanks,
greg k-h