On Mon 04 Nov 05:00 PST 2019, Stanimir Varbanov wrote:
Hi Bjorn,
Thanks for the fix!
On 11/2/19 2:24 AM, Bjorn Andersson wrote:
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.
Are you sure that this will not break ops_1_0_0 (Qcom IP rev.: 1.0.0 Synopsys IP rev.: 4.11a) i.e. apq8084 ?
I am not, I've only tested this on db820c and db845c. Unfortunately I'm unable to find a branch with the necessary dts snippets to test it. Do you perhaps have a branch somewhere?
Regards, Bjorn
Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson bjorn.andersson@linaro.org
drivers/pci/controller/dwc/pcie-qcom.c | 3 ++- include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 35f4980480bb..b91abf4d4905 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1441,7 +1441,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, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 21a572469a4e..3d0724ee4d2f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -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
-- regards, Stan