rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to some Intel PCI bridge

PATCH Superseded Jian-Hong Pan 6 participants 10 messages Nov 10, 2023 – Nov 16, 2023

Subsystems (2)

PCI Realtek wireless driver (rtlwifi family)

lore

Share & tools

lore

Jian-Hong Pan

author

2023-11-10 18:11 UTC #0 lore raw

PATCH 1/1 rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to some Intel PCI bridge

Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:

pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5

Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127

Signed-off-by Jian-Hong Pan <[email protected]>

---
 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +19 -0

index 43b611d5288d..720c79e0781a 100644
@@ -25,10 +25,29 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+	struct pci_dev *bridge_pdev;
 
 	/*close ASPM for AMD defaultly */
 	rtlpci->const_amdpci_aspm = 0;
 
+	/* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+	 * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+	 */
+	bridge_pdev = rtlpci->pdev->bus->self;
+	if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch(bridge_pdev->device) {
+		case 0x9d15:
+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */
+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			rtlpriv->cfg->mod_params->aspm_support = 0;
+			break;
+		}
+	}
+
 	/* ASPM PS mode.
 	 * 0 - Disable ASPM,
 	 * 1 - Enable ASPM without Clock Req,

Signature · 1 line

2.42.1

Larry Finger

2023-11-10 20:04 UTC #1 lore raw

Quoted 44 lines · Jian-Hong Pan

Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127
Signed-off-by Jian-Hong Pan <[email protected]>
---
  .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +12 -0
index 43b611d5288d..720c79e0781a 100644
@@ -25,10 +25,29 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
  {
  	struct rtl_priv *rtlpriv = rtl_priv(hw);
  	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+	struct pci_dev *bridge_pdev;
 
  	/*close ASPM for AMD defaultly */
  	rtlpci->const_amdpci_aspm = 0;
 
+	/* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+	 * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+	 */
+	bridge_pdev = rtlpci->pdev->bus->self;
+	if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch(bridge_pdev->device) {
+		case 0x9d15:
+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) · line 53

Quoted 10 lines

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +7 -0

+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			rtlpriv->cfg->mod_params->aspm_support = 0;
+			break;
+		}
+	}
+
  	/* ASPM PS mode.
  	 * 0 - Disable ASPM,
  	 * 1 - Enable ASPM without Clock Req,

Does the switch statement need a default case in the event that Intel offers a compatible AP?

Larry

Jian-Hong Pan

author

2023-11-13 04:41 UTC #2 lore raw

PATCH v2 1/1 rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:

Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127

Signed-off-by Jian-Hong Pan <[email protected]>

---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."

 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +24 -0

index 43b611d5288d..b20c0b9d8393 100644
@@ -25,10 +25,34 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+	struct pci_dev *bridge_pdev;
 
 	/*close ASPM for AMD defaultly */
 	rtlpci->const_amdpci_aspm = 0;
 
+	/* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+	 * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+	 */
+	bridge_pdev = rtlpci->pdev->bus->self;
+	if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch(bridge_pdev->device) {
+		case 0x9d15:
+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */
+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			rtlpriv->cfg->mod_params->aspm_support = 0;
+			break;
+		default:
+			/* The ASPM has already been enabled by initializing
+			 * rtl8723be_mod_params' aspm_support as 1.
+			 */
+			break;
+		}
+	}
+
 	/* ASPM PS mode.
 	 * 0 - Disable ASPM,
 	 * 1 - Enable ASPM without Clock Req,

Signature · 1 line

2.42.1

Ping-Ke Shih

maintainer Acked-by on v2 1/1

2023-11-14 01:41 UTC #3 lore raw

RE: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Quoted 24 lines

-----Original Message-----
From: Jian-Hong Pan <[email protected]>
Sent: Monday, November 13, 2023 12:35 PM
To: Larry Finger <[email protected]>; Ping-Ke Shih <[email protected]>
Cc: Kalle Valo <[email protected]>; [email protected]; [email protected]; [email protected]; Jian-Hong Pan <[email protected]>
Subject: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge
Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5

Quoted 1 line

Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127

Seemingly, you can use "Link" or "Closes" tag.

Quoted 1 line

Signed-off-by Jian-Hong Pan <[email protected]>

Acked-by Ping-Ke Shih <[email protected]>

Quoted 25 lines

---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."

 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +4 -0

index 43b611d5288d..b20c0b9d8393 100644
@@ -25,10 +25,34 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+       struct pci_dev *bridge_pdev;
 
        /*close ASPM for AMD defaultly */
        rtlpci->const_amdpci_aspm = 0;
 
+       /* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+        * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+        */

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) · line 45

Quoted 10 lines

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +10 -0

+       bridge_pdev = rtlpci->pdev->bus->self;
+       if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+               switch(bridge_pdev->device) {
+               case 0x9d15:
+               /* PCI bridges on Skylake */
+               case 0xa110 ... 0xa11f:
+               case 0xa167 ... 0xa16a:
+               /* PCI bridges on Kabylake */
+               case 0xa290 ... 0xa29f:
+               case 0xa2e7 ... 0xa2ee:

Out of curiosity, do you have so many real platforms to test?

Jian-Hong Pan

author

2023-11-14 03:02 UTC #4 lore raw

Re: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Ping-Ke Shih <[email protected]> 於 2023年11月14日週二上午9:41寫道：

Quoted 56 lines

Quoted 25 lines
-----Original Message-----
From: Jian-Hong Pan <[email protected]>
Sent: Monday, November 13, 2023 12:35 PM
To: Larry Finger <[email protected]>; Ping-Ke Shih <[email protected]>
Cc: Kalle Valo <[email protected]>; [email protected]; [email protected]; [email protected]; Jian-Hong Pan <[email protected]>
Subject: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge
Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Quoted 1 line
Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127
Seemingly, you can use "Link" or "Closes" tag.
Quoted 1 line
Signed-off-by Jian-Hong Pan <[email protected]>
Acked-by Ping-Ke Shih <[email protected]>
Quoted 22 lines
---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."
 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +1 -0
index 43b611d5288d..b20c0b9d8393 100644
@@ -25,10 +25,34 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+       struct pci_dev *bridge_pdev;
 
        /*close ASPM for AMD defaultly */
        rtlpci->const_amdpci_aspm = 0;
 

Quoted 15 lines

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) · line 45

Quoted 13 lines

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +13 -0

+       /* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+        * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+        */
+       bridge_pdev = rtlpci->pdev->bus->self;
+       if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+               switch(bridge_pdev->device) {
+               case 0x9d15:
+               /* PCI bridges on Skylake */
+               case 0xa110 ... 0xa11f:
+               case 0xa167 ... 0xa16a:
+               /* PCI bridges on Kabylake */
+               case 0xa290 ... 0xa29f:
+               case 0xa2e7 ... 0xa2ee:

Out of curiosity, do you have so many real platforms to test?

We have tested those platforms before, because of the hardware enablement. They all have the same error, and the error bothers people many years.
https://groups.google.com/g/fa.linux.kernel/c/0uz8Nr_NVOI

However, most of them are returned back to the owner now. By accident, we keep the ASUS X555UQ equipped with Intel i7-6500U CPU and Realtek RTL8723BE PCIe Wireless adapter on hands for more test.

Jian-Hong Pan

Jonathan Bither

2023-11-14 15:01 UTC #5 lore raw

Re: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Quoted 68 lines · Jian-Hong Pan

Ping-Ke Shih <[email protected]> 於 2023年11月14日週二上午9:41寫道：
Quoted 53 lines
Quoted 24 lines
-----Original Message-----
From: Jian-Hong Pan <[email protected]>
Sent: Monday, November 13, 2023 12:35 PM
To: Larry Finger <[email protected]>; Ping-Ke Shih <[email protected]>
Cc: Kalle Valo <[email protected]>; [email protected]; [email protected]; [email protected]; Jian-Hong Pan <[email protected]>
Subject: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge
Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Quoted 1 line
Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127
Seemingly, you can use "Link" or "Closes" tag.
Quoted 1 line
Signed-off-by Jian-Hong Pan <[email protected]>
Acked-by Ping-Ke Shih <[email protected]>
Quoted 22 lines
---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."
  .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 24 +++++++++++++++++++
  1 file changed, 24 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +1 -0
index 43b611d5288d..b20c0b9d8393 100644
@@ -25,10 +25,34 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
  {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+       struct pci_dev *bridge_pdev;
 
         /*close ASPM for AMD defaultly */
         rtlpci->const_amdpci_aspm = 0;
 
Quoted 14 lines
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) · line 45
Quoted 13 lines
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +13 -0
+       /* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+        * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+        */
+       bridge_pdev = rtlpci->pdev->bus->self;
+       if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+               switch(bridge_pdev->device) {
+               case 0x9d15:
+               /* PCI bridges on Skylake */
+               case 0xa110 ... 0xa11f:
+               case 0xa167 ... 0xa16a:
+               /* PCI bridges on Kabylake */
+               case 0xa290 ... 0xa29f:
+               case 0xa2e7 ... 0xa2ee:
Out of curiosity, do you have so many real platforms to test?

Quoted 8 lines

We have tested those platforms before, because of the hardware enablement. They all have the same error, and the error bothers people many years.
https://groups.google.com/g/fa.linux.kernel/c/0uz8Nr_NVOI
However, most of them are returned back to the owner now. By accident, we keep the ASUS X555UQ equipped with Intel i7-6500U CPU and Realtek RTL8723BE PCIe Wireless adapter on hands for more test.

The device matching that you're doing follows what was also done in commit 7184f5b451cf3dc61de79091d235b5d2bba2782d for an ACS quirk on the same chipsets.

I'm just curious if the issue is a more universal Intel one and can/should be resolved with a pci quirk as opposed to inside an individual driver.

Quoted 2 lines

Jian-Hong Pan

Jian-Hong Pan

author

2023-11-15 10:40 UTC #6 lore raw

Re: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Jonathan Bither <[email protected]> 於 2023年11月14日週二下午11:01寫道：

Quoted 80 lines · Jian-Hong Pan

Quoted 68 lines
Ping-Ke Shih <[email protected]> 於 2023年11月14日週二上午9:41寫道：
Quoted 53 lines
Quoted 24 lines
-----Original Message-----
From: Jian-Hong Pan <[email protected]>
Sent: Monday, November 13, 2023 12:35 PM
To: Larry Finger <[email protected]>; Ping-Ke Shih <[email protected]>
Cc: Kalle Valo <[email protected]>; [email protected]; [email protected]; [email protected]; Jian-Hong Pan <[email protected]>
Subject: [PATCH v2] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge
Disable rtl8723be's ASPM if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Quoted 1 line
Buglink https://bugzilla.kernel.org/show_bug.cgi?id=218127
Seemingly, you can use "Link" or "Closes" tag.
Quoted 1 line
Signed-off-by Jian-Hong Pan <[email protected]>
Acked-by Ping-Ke Shih <[email protected]>
Quoted 22 lines
---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."
  .../wireless/realtek/rtlwifi/rtl8723be/sw.c   | 24 +++++++++++++++++++
  1 file changed, 24 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +1 -0
index 43b611d5288d..b20c0b9d8393 100644
@@ -25,10 +25,34 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
  {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+       struct pci_dev *bridge_pdev;
 
         /*close ASPM for AMD defaultly */
         rtlpci->const_amdpci_aspm = 0;
 
Quoted 14 lines
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw) · line 45
Quoted 13 lines
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +13 -0
+       /* Disable ASPM if RTL8723BE connects to some Intel PCI bridges, such as
+        * Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+        */
+       bridge_pdev = rtlpci->pdev->bus->self;
+       if (bridge_pdev->vendor == PCI_VENDOR_ID_INTEL) {
+               switch(bridge_pdev->device) {
+               case 0x9d15:
+               /* PCI bridges on Skylake */
+               case 0xa110 ... 0xa11f:
+               case 0xa167 ... 0xa16a:
+               /* PCI bridges on Kabylake */
+               case 0xa290 ... 0xa29f:
+               case 0xa2e7 ... 0xa2ee:
Out of curiosity, do you have so many real platforms to test?
Quoted 8 lines
We have tested those platforms before, because of the hardware enablement. They all have the same error, and the error bothers people many years.
https://groups.google.com/g/fa.linux.kernel/c/0uz8Nr_NVOI
However, most of them are returned back to the owner now. By accident, we keep the ASUS X555UQ equipped with Intel i7-6500U CPU and Realtek RTL8723BE PCIe Wireless adapter on hands for more test.

Quoted 7 lines

The device matching that you're doing follows what was also done in commit 7184f5b451cf3dc61de79091d235b5d2bba2782d for an ACS quirk on the same chipsets.
I'm just curious if the issue is a more universal Intel one and can/should be resolved with a pci quirk as opposed to inside an individual driver.

Interesting idea. I did some test like:

(quoted diff) +0 -0

b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c index 43b611d5288d..edb08247760c 100644

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +4 -0

@@ -26,6 +26,10 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+       /* Disable ASPM if the link control disables it */
+       if (!pcie_aspm_enabled(rtlpci->pdev))
+               rtlpriv->cfg->mod_params->aspm_support = 0;
+
        /*close ASPM for AMD defaultly */
        rtlpci->const_amdpci_aspm = 0;

drivers/pci/quirks.c +0 -0

index eeec1d6f9023..239ae945df00 100644
@@ -3606,6 +3606,37 @@ DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /*

Ceton InfiniTV4 */
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169,

                        quirk_broken_intx_masking);

+
+static void quirk_disable_rtl_aspm(struct pci_dev *dev) +{
+ struct pci_dev *pdev;
+ u16 val;
+
+ if (dev->bus && dev->bus->self)
+ pdev = dev->bus->self;
+ else
+ return;
+
+ if (pdev->vendor == PCI_VENDOR_ID_INTEL) {

+               switch (pdev->device) {
+               case 0x9d15:
+               /* PCI bridges on Skylake */
+               case 0xa110 ... 0xa11f:
+               case 0xa167 ... 0xa16a:
+               /* PCI bridges on Kabylake */
+               case 0xa290 ... 0xa29f:
+               case 0xa2e7 ... 0xa2ee:
+                       pci_info(dev, "quirk: disable the device's ASPM\n");
+                       pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &val);
+                       val &= ~PCI_EXP_LNKCTL_ASPMC;
+                       pcie_capability_write_word(dev, PCI_EXP_LNKCTL, val);
+                       break;

+ }
+ }
+}
+
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_REALTEK, 0xb723, quirk_disable_rtl_aspm); +
/*
* Intel i40e (XL710/X710) 10/20/40GbE NICs all have broken INTx masking,
* DisINTx can be set but the interrupt status bit is non-functional.

Even quirk_disable_rtl_aspm() disables the PCIe's ASPM in Link Control and Status Register, we still have to clear the aspm_support in rtl8723be module. Otherwise, the PCIe's ASPM will be enabled again, then the AER flood comes again.
If the rtl8723be module should check the PCIe's ASPM feature first generally, then using the PCI quirk way is feasible.

Ping-Ke Shih, any suggestion? If this is a better approach, I can prepare a new version patch.

Jian-Hong Pan

author

2023-11-16 04:23 UTC #7 lore raw

PATCH v3 1/1 rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

In reply to Jonathan Bither

Disable RTL8723BE's ASPM in a PCI quirk and rtl8723be module if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:

Link https://bugzilla.kernel.org/show_bug.cgi?id=218127

Signed-off-by Jian-Hong Pan <[email protected]>

---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."

v3: Rework with a PCI qurik which disables RTL8723BE PCIE's ASPM, if it
connects to some Intel bridges, such as Skylake and Kabylake. Then, rtl8723be checks the PCIE ASPM is enabled, or not. If it is not, disables rtl8723be's aspm_support parameter.

 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   |  6 ++++
 drivers/pci/quirks.c                          | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+)

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +6 -0

index 43b611d5288d..fe9acbaa879b 100644
@@ -26,6 +26,12 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+	/* Disable ASPM if the link control disables it */
+	if (!pcie_aspm_enabled(rtlpci->pdev)) {
+		pci_info(rtlpci->pdev, "PCIE ASPM is disabled\n");
+		rtlpriv->cfg->mod_params->aspm_support = 0;
+	}
+
 	/*close ASPM for AMD defaultly */
 	rtlpci->const_amdpci_aspm = 0;

drivers/pci/quirks.c +36 -0

index eeec1d6f9023..170321f4b23b 100644
@@ -3606,6 +3606,42 @@ DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169,
 			quirk_broken_intx_masking);
 
+
+static void quirk_disable_int_bridge_sub_pci_aspm(struct pci_dev *dev)
+{
+	struct pci_dev *pdev;
+	u16 val;
+
+	if (dev->bus && dev->bus->self)
+		pdev = dev->bus->self;
+	else
+		return;
+
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch (pdev->device) {
+		case 0x9d15:
+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */
+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			pci_info(dev, "quirk: disable the device's ASPM\n");
+			pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &val);
+			val &= ~PCI_EXP_LNKCTL_ASPMC;
+			pcie_capability_write_word(dev, PCI_EXP_LNKCTL, val);
+			break;
+		}
+	}
+}
+
+/*
+ * Disable Realtek RTL8723BE PCIE's ASPM, if it connects to some Intel bridges,
+ * such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+ */
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_REALTEK, 0xb723,
+			quirk_disable_int_bridge_sub_pci_aspm);
+
 /*
  * Intel i40e (XL710/X710) 10/20/40GbE NICs all have broken INTx masking,
  * DisINTx can be set but the interrupt status bit is non-functional.

Signature · 1 line

2.42.1

Ilpo Järvinen

2023-11-16 16:41 UTC #8 lore raw

Re: [PATCH v3] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

Quoted 53 lines · Jian-Hong Pan

Disable RTL8723BE's ASPM in a PCI quirk and rtl8723be module if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:
pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Link https://bugzilla.kernel.org/show_bug.cgi?id=218127
Signed-off-by Jian-Hong Pan <[email protected]>
---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."
v3: Rework with a PCI qurik which disables RTL8723BE PCIE's ASPM, if it
connects to some Intel bridges, such as Skylake and Kabylake. Then, rtl8723be checks the PCIE ASPM is enabled, or not. If it is not, disables rtl8723be's aspm_support parameter.
 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   |  6 ++++
 drivers/pci/quirks.c                          | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +6 -0
index 43b611d5288d..fe9acbaa879b 100644
@@ -26,6 +26,12 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+	/* Disable ASPM if the link control disables it */
+	if (!pcie_aspm_enabled(rtlpci->pdev)) {
+		pci_info(rtlpci->pdev, "PCIE ASPM is disabled\n");
+		rtlpriv->cfg->mod_params->aspm_support = 0;
+	}
+
 	/*close ASPM for AMD defaultly */
 	rtlpci->const_amdpci_aspm = 0;
 
drivers/pci/quirks.c +0 -0
index eeec1d6f9023..170321f4b23b 100644

drivers/pci/quirks.c DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */ · line 3609

Quoted 4 lines

drivers/pci/quirks.c +1 -0

@@ -3606,6 +3606,42 @@ DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169,
 			quirk_broken_intx_masking);
 
+

Remove extra new line.

Quoted 13 lines

drivers/pci/quirks.c +13 -0

+static void quirk_disable_int_bridge_sub_pci_aspm(struct pci_dev *dev)
+{
+	struct pci_dev *pdev;
+	u16 val;
+
+	if (dev->bus && dev->bus->self)
+		pdev = dev->bus->self;
+	else
+		return;
+
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch (pdev->device) {
+		case 0x9d15:

drivers/pci/quirks.c DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */ · line 3632

Quoted 10 lines

drivers/pci/quirks.c +10 -0

+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */
+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			pci_info(dev, "quirk: disable the device's ASPM\n");
+			pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &val);
+			val &= ~PCI_EXP_LNKCTL_ASPMC;
+			pcie_capability_write_word(dev, PCI_EXP_LNKCTL, val);

Never do RMW ops on LNKCTL like that but use a RMW-safe accessor:

			pcie_capability_clear_word(dev, PCI_EXP_LNKCTL,
						   PCI_EXP_LNKCTL_ASPMC);

However, isn't there quirk_disable_aspm_l0s_l1() already which this function could call? Why not use it?

Signature · 1 line

i.

Bjorn Helgaas

2023-11-16 17:52 UTC #9 lore raw

Re: [PATCH v3] rtlwifi: rtl8723be: Disable ASPM if RTL8723BE connects to Intel PCI bridge

In reply to Jian-Hong Pan

Quoted 4 lines · Jian-Hong Pan

Disable RTL8723BE's ASPM in a PCI quirk and rtl8723be module if the Realtek RTL8723BE PCIe Wireless adapter connects to some Intel PCI bridges, such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system:

"Kaby Lake". Annoying but seems to be the case that "Skylake" has no space while "Kaby Lake" does.

I don't feel good about this fix because we don't have a root cause for the issue, we don't know if Skylake and Kaby Lake are the only affected bridges, and we're giving up some power savings on a lot of systems.

I *assume* ASPM probably works OK under Windows on these platforms? Can anybody confirm/deny that?

Do we know whether Realtek parts other than rtl8723be have the same issue? There are about a dozen rtlwifi drivers that look basically identical so I assume there's a lot of shared IP there.

The flood seems to start when rtl8723be probes the device, and I assume it fiddles with the ASPM config then. My guess is it's doing something wrong then, and if we could figure it out, we could fix it.

Theoretically, drivers shouldn't need to deal with ASPM at all because the PCI core does that already. But these parts seem to have issues that require special handling.

Bjorn

Quoted 93 lines

pcieport 0000:00:1c.5: PCIe Bus Error: severity=Corrected, type=Physical Layer, (Receiver ID)
pcieport 0000:00:1c.5: device [8086:9d15] error status/mask=00000001/00002000
pcieport 0000:00:1c.5: [ 0] RxErr (First)
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Corrected error received: 0000:00:1c.5
pcieport 0000:00:1c.5: AER: can't find device of ID00e5
pcieport 0000:00:1c.5: AER: Multiple Corrected error received: 0000:00:1c.5 pcieport 0000:00:1c.5: AER: can't find device of ID00e5
Link https://bugzilla.kernel.org/show_bug.cgi?id=218127
Signed-off-by Jian-Hong Pan <[email protected]>
---
v2: Add the switch case's default condition with comment:
"The ASPM has already been enabled by initializing rtl8723be_mod_params' aspm_support as 1."
v3: Rework with a PCI qurik which disables RTL8723BE PCIE's ASPM, if it
connects to some Intel bridges, such as Skylake and Kabylake. Then, rtl8723be checks the PCIE ASPM is enabled, or not. If it is not, disables rtl8723be's aspm_support parameter.
 .../wireless/realtek/rtlwifi/rtl8723be/sw.c   |  6 ++++
 drivers/pci/quirks.c                          | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +6 -0
index 43b611d5288d..fe9acbaa879b 100644
@@ -26,6 +26,12 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+	/* Disable ASPM if the link control disables it */
+	if (!pcie_aspm_enabled(rtlpci->pdev)) {
+		pci_info(rtlpci->pdev, "PCIE ASPM is disabled\n");
+		rtlpriv->cfg->mod_params->aspm_support = 0;
+	}
+
 	/*close ASPM for AMD defaultly */
 	rtlpci->const_amdpci_aspm = 0;
 
drivers/pci/quirks.c +36 -0
index eeec1d6f9023..170321f4b23b 100644
@@ -3606,6 +3606,42 @@ DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169,
 			quirk_broken_intx_masking);
 
+
+static void quirk_disable_int_bridge_sub_pci_aspm(struct pci_dev *dev)
+{
+	struct pci_dev *pdev;
+	u16 val;
+
+	if (dev->bus && dev->bus->self)
+		pdev = dev->bus->self;
+	else
+		return;
+
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
+		switch (pdev->device) {
+		case 0x9d15:
+		/* PCI bridges on Skylake */
+		case 0xa110 ... 0xa11f:
+		case 0xa167 ... 0xa16a:
+		/* PCI bridges on Kabylake */
+		case 0xa290 ... 0xa29f:
+		case 0xa2e7 ... 0xa2ee:
+			pci_info(dev, "quirk: disable the device's ASPM\n");
+			pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &val);
+			val &= ~PCI_EXP_LNKCTL_ASPMC;
+			pcie_capability_write_word(dev, PCI_EXP_LNKCTL, val);
+			break;
+		}
+	}
+}
+
+/*
+ * Disable Realtek RTL8723BE PCIE's ASPM, if it connects to some Intel bridges,
+ * such as Skylake and Kabylake. Otherwise, the PCI AER flood hangs system.
+ */
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_REALTEK, 0xb723,
+			quirk_disable_int_bridge_sub_pci_aspm);
+
 /*
  * Intel i40e (XL710/X710) 10/20/40GbE NICs all have broken INTx masking,
  * DisINTx can be set but the interrupt status bit is non-functional.
Signature · 1 line
2.42.1