From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3449428826 for ; Thu, 30 Apr 2026 13:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777557076; cv=none; b=OHSK+7GmnwZ2wuuy1Zc64taFamt88ytFpW8b0Vyc1LnMH38fLUpkWiEXkqUo2HR3AqLofr2HsCp1rdSMZqCO/gtjMwxJ6ks8Yvvx4EksIbitGaqzu6Ffc7BUMnr9VwBEzlcAJYef/Yz5UloqNcNAdIRNrfbCUvKL2rwp5ZUp4Tw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777557076; c=relaxed/simple; bh=nZDXvyYwMczOfCEVhdrZ79LyTaB1NzUd8c/QMw3xKQQ=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=cy2F41AGxhaBxveT3/5YensnYuEW8HosZOCFxTKSFuBOLf/fnDtFKhvKZ1UsqDPugWzHI/absb/yOi+w8Yx89evsqHSSCczsKmUjzJV0TAfAIWaO/lF+lZKzm3Q8ka/CnCztubgeFRJDakKiZdiAu7/QWp1YVHdy4Q2NAhPTfKg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I8O9F6DT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="I8O9F6DT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C0E0C2BCB3; Thu, 30 Apr 2026 13:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777557075; bh=nZDXvyYwMczOfCEVhdrZ79LyTaB1NzUd8c/QMw3xKQQ=; h=Subject:To:Cc:From:Date:From; b=I8O9F6DTpyL5wyf6vf2tfRS8vrnOJ9VPPtXcCissZ8+Davk87b+/7q+35Kes5QQCf vfT4cE4QiECMtiKEcwxsnX/RE0SDQUrtY/dzRTCz0WcVQ7c9O92X9I/bz4m5lzoYgM ArPcpM0siqdj6PpfZKyuXphaIidG+jhUw4n2pcmg= Subject: FAILED: patch "[PATCH] wifi: rtw88: check for PCI upstream bridge existence" failed to apply to 5.15-stable tree To: pchelkin@ispras.ru,pkshih@realtek.com Cc: From: Date: Thu, 30 Apr 2026 15:51:13 +0200 Message-ID: <2026043013-untainted-dominion-7f06@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The 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 . 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 # git commit -s git send-email --to '' --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 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. Fixes: 24f5e38a13b5 ("rtw88: Disable PCIe ASPM while doing NAPI poll on 8821CE") Cc: stable@vger.kernel.org Signed-off-by: Fedor Pchelkin Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20260220094730.49791-1-pchelkin@ispras.ru diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c index 56b16186d3aa..ec0a45bfb670 100644 --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c @@ -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);