FAILED: patch "[PATCH] wifi: rtw88: check for PCI upstream bridge existence" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-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-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x eb101d2abdcccb514ca4fccd3b278dd8267374f6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026043013-untainted-dominion-7f06@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From eb101d2abdcccb514ca4fccd3b278dd8267374f6 Mon Sep 17 00:00:00 2001
From: Fedor Pchelkin <[email protected]>
Date: Fri, 20 Feb 2026 12:47:30 +0300
Subject: [PATCH] wifi: rtw88: check for PCI upstream bridge existence
pci_upstream_bridge() returns NULL if the device is on a root bus. If 8821CE is installed in the system with such a PCI topology, the probing routine will crash. This has probably been unnoticed as 8821CE is mostly supplied in laptops where there is a PCI-to-PCI bridge located upstream from the device. However the card might be installed on a system with different configuration.
Check if the bridge does exist for the specific workaround to be applied.
Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool.
drivers/net/wireless/realtek/rtw88/pci.c +2 -1
@@ -1804,7 +1804,8 @@ int rtw_pci_probe(struct pci_dev *pdev, }/* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */ -if (rtwdev->chip->id ==RTW_CHIP_TYPE_8821C && bridge->vendor ==PCI_VENDOR_ID_INTEL ) +if (rtwdev->chip->id ==RTW_CHIP_TYPE_8821C && + bridge && bridge->vendor ==PCI_VENDOR_ID_INTEL ) rtwpci->rx_no_aspm = true;rtw_pci_phy_cfg (rtwdev);
Sasha Levin
maintainerPATCH 1/2 rtw88: 8821ce: Disable PCIe ASPM L1 for 8821CE using chip ID
From: Jimmy Hon <[email protected]>
[ Upstream commit b9eb5f0742d107ca9c0f33da58f61ce83e3ce2fc ]
Make workaround work for other 8821CE devices with different PCI ID
Stable-dep-of: eb101d2abdcc ("wifi: rtw88: check for PCI upstream bridge existence")
--- drivers/net/wireless/realtek/rtw88/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/pci.c +1 -1
@@ -1766,7 +1766,7 @@ int rtw_pci_probe(struct pci_dev *pdev, }/* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */ -if (pdev->device ==0xc821 && bridge->vendor ==PCI_VENDOR_ID_INTEL ) +if (rtwdev->chip->id ==RTW_CHIP_TYPE_8821C && bridge->vendor ==PCI_VENDOR_ID_INTEL ) rtwpci->rx_no_aspm = true;rtw_pci_phy_cfg (rtwdev);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 wifi: rtw88: check for PCI upstream bridge existence
From: Fedor Pchelkin <[email protected]>
[ Upstream commit eb101d2abdcccb514ca4fccd3b278dd8267374f6 ]
pci_upstream_bridge() returns NULL if the device is on a root bus. If 8821CE is installed in the system with such a PCI topology, the probing routine will crash. This has probably been unnoticed as 8821CE is mostly supplied in laptops where there is a PCI-to-PCI bridge located upstream from the device. However the card might be installed on a system with different configuration.
Check if the bridge does exist for the specific workaround to be applied.
Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool.
--- drivers/net/wireless/realtek/rtw88/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/pci.c +2 -1
@@ -1766,7 +1766,8 @@ int rtw_pci_probe(struct pci_dev *pdev, }/* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */ -if (rtwdev->chip->id ==RTW_CHIP_TYPE_8821C && bridge->vendor ==PCI_VENDOR_ID_INTEL ) +if (rtwdev->chip->id ==RTW_CHIP_TYPE_8821C && + bridge && bridge->vendor ==PCI_VENDOR_ID_INTEL ) rtwpci->rx_no_aspm = true;rtw_pci_phy_cfg (rtwdev);
Signature · 1 line
2.53.0