PCI: keystone: Let AM65 use the pci_ops defined in pcie-designware-host.c
authorKishon Vijay Abraham I <kishon@ti.com>
Wed, 17 Mar 2021 13:15:18 +0000 (18:45 +0530)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Mon, 22 Mar 2021 14:47:21 +0000 (14:47 +0000)
Both TI's AM65x (K3) and TI's K2 PCIe driver are implemented in
pci-keystone. However Only K2 PCIe driver should use it's own pci_ops
for configuration space accesses. But commit 10a797c6e54a
("PCI: dwc: keystone: Use pci_ops for config space accessors") used
custom pci_ops for both AM65x and K2. This breaks configuration space
access for AM65x platform. Fix it here.

Link: https://lore.kernel.org/r/20210317131518.11040-1-kishon@ti.com
Fixes: 10a797c6e54a ("PCI: dwc: keystone: Use pci_ops for config space accessors")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Krzysztof WilczyƄski <kw@linux.com>
Cc: <stable@vger.kernel.org> # v5.10
drivers/pci/controller/dwc/pci-keystone.c

index 53aa35c..a59ecbe 100644 (file)
@@ -798,7 +798,8 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)
        int ret;
 
        pp->bridge->ops = &ks_pcie_ops;
-       pp->bridge->child_ops = &ks_child_pcie_ops;
+       if (!ks_pcie->is_am6)
+               pp->bridge->child_ops = &ks_child_pcie_ops;
 
        ret = ks_pcie_config_legacy_irq(ks_pcie);
        if (ret)