From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EEF943403F3; Sat, 30 May 2026 16:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780159860; cv=none; b=HqvuCTRq8W8La1z/VA6qiDy0BaxbxXqhSS1E5n1BHDH0t03iGgKAPWT0dALZ3XUqpFaM6V27AJahcGxdEc3KLHZBVWnx9/eZH9tJbqyP6zubyz9wbV6oSzXomXKmsX/ZPQU9mxEEWkAAVY4pOquk4ar6cyS3kiHdW4LYM3aaw3s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780159860; c=relaxed/simple; bh=j7B1O+x8o2PCV433C2WWL8VKL76eaqbctIulOMwMl4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EcnDWXFIkEDVDbl61Bdvt9EUpnEq0cC78BvhMWDwwX82gMKX6cCy+5qX2xoy9Dc6cRZLYWJK1lkTAXbZo/8zeJA9Qyb4c4FzoFihD01pkq6dNN4WfzZxLO5rwmt6GXW5wOWhgGW3+Lw4AqZ4SU15yb7+W9xb10qPlwsllz9WCCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nzKQe5NG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nzKQe5NG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 325F91F00898; Sat, 30 May 2026 16:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780159857; bh=VokPjfki+mBzDOJuXHMmXFx4/SGON/d94E7E3Lle+iI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nzKQe5NGHpzdwtAfWAZYg13FmqO+2MB1GyJFufTLruN3tVglhgGbv8cSATKzoNOLJ oa4Z189y+N7d3XwkHT6e9xsrmbttcK8GATF9vt0cBAwy4VTlQsq+dCHI5hOaMbvj1j SUxJyz4QSSObAaM7w8c7Lo+cMkDi4FVehz9mAwMk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fedor Pchelkin , Ping-Ke Shih Subject: [PATCH 6.1 180/969] wifi: rtw88: check for PCI upstream bridge existence Date: Sat, 30 May 2026 17:55:04 +0200 Message-ID: <20260530160305.465348577@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fedor Pchelkin commit eb101d2abdcccb514ca4fccd3b278dd8267374f6 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtw88/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c @@ -1784,7 +1784,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);