Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff69e44c authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Alistair Delva
Browse files

ANDROID: PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM 



There exists non-bridge PCIe devices with PCI_VENDOR_ID_QCOM, so limit
the fixup to only affect the PCIe 2.0 (0x106) and PCIe 3.0 (0x107)
bridges.

Bug: 146449535
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
(cherry picked from commit 5ed49c7a1ca12470415229233a3e6b4216a76c62
https://git.linaro.org/landing-teams/working/qualcomm/kernel.git


qclt/integration-linux-qcomlt  - An unstable rebased branch)
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Change-Id: Ibfd2b2dd41f6a22c832afb3d8e805c3602acba95
parent 2a8fed9a

drivers/pci/controller/dwc/pcie-qcom.c

+2 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,8 @@ static void qcom_fixup_class(struct pci_dev *dev) 
{

	dev->class = PCI_CLASS_BRIDGE_PCI << 8;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCI_ANY_ID, qcom_fixup_class);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCIE_DEVICE_ID_QCOM_PCIE20, qcom_fixup_class);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCIE_DEVICE_ID_QCOM_PCIE30, qcom_fixup_class);



static struct platform_driver qcom_pcie_driver = {

	.probe = qcom_pcie_probe,

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,8 @@ 
#define PCI_VENDOR_ID_LENOVO		0x17aa



#define PCI_VENDOR_ID_QCOM		0x17cb

#define PCIE_DEVICE_ID_QCOM_PCIE20	0x0106

#define PCIE_DEVICE_ID_QCOM_PCIE30	0x0107



#define PCI_VENDOR_ID_CDNS		0x17cd