| From 3d0b2a3a87ce5ae85de46c4241afd52ab8b566fe Mon Sep 17 00:00:00 2001 |
| From: Kishon Vijay Abraham I <kishon@ti.com> |
| Date: Wed, 17 Mar 2021 18:45:18 +0530 |
| Subject: PCI: keystone: Let AM65 use the pci_ops defined in pcie-designware-host.c |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Kishon Vijay Abraham I <kishon@ti.com> |
| |
| commit 3d0b2a3a87ce5ae85de46c4241afd52ab8b566fe upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/pci/controller/dwc/pci-keystone.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/pci/controller/dwc/pci-keystone.c |
| +++ b/drivers/pci/controller/dwc/pci-keystone.c |
| @@ -798,7 +798,8 @@ static int __init ks_pcie_host_init(stru |
| 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) |
