diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 13:41:10 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 13:41:10 -0400 |
| commit | d279122b16e49c2b7a51be5737e0f144524eade8 (patch) | |
| tree | 986adbe1b1869d8fa79e58b02ae0e1a36d90ceaa | |
| parent | 21fafc6a6ace398be4903424c966a9cb08cea39a (diff) | |
| download | longterm-queue-4.18-d279122b16e49c2b7a51be5737e0f144524eade8.tar.gz | |
pci: ctxt refresh for ARM
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch b/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch index e40b5a9..2379639 100644 --- a/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch +++ b/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch @@ -1,4 +1,4 @@ -From f316a2b53cd7f37963ae20ec7072eb27a349a4ce Mon Sep 17 00:00:00 2001 +From 0f8d1d2dc72291dedd79e7864b7afbd69b106d26 Mon Sep 17 00:00:00 2001 From: Kishon Vijay Abraham I <kishon@ti.com> Date: Mon, 25 Mar 2019 15:09:33 +0530 Subject: [PATCH] PCI: keystone: Prevent ARM32 specific code to be compiled for @@ -19,40 +19,40 @@ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c -index dfe54553d832..93296d434f40 100644 +index 3722a5f31e5e..f2901baf8cfc 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c -@@ -710,6 +710,7 @@ err: - return ret; +@@ -237,6 +237,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) + ks_dw_pcie_enable_error_irq(ks_pcie); } +#ifdef CONFIG_ARM /* * When a PCI device does not exist during config cycles, keystone host gets a * bus error instead of returning 0xffffffff. This handler always returns 0 -@@ -729,6 +730,7 @@ static int ks_pcie_fault(unsigned long addr, unsigned int fsr, +@@ -256,6 +257,7 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr, return 0; } +#endif - static int __init ks_pcie_init_id(struct keystone_pcie *ks_pcie) + static int __init ks_pcie_host_init(struct pcie_port *pp) { -@@ -778,12 +780,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) - if (ret < 0) - return ret; +@@ -279,12 +281,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) + val |= BIT(12); + writel(val, pci->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL); +#ifdef CONFIG_ARM /* * PCIe access errors that result into OCP errors are caught by ARM as * "External aborts" */ - hook_fault_code(17, ks_pcie_fault, SIGBUS, 0, + hook_fault_code(17, keystone_pcie_fault, SIGBUS, 0, "Asynchronous external abort"); +#endif - ks_pcie_start_link(pci); - dw_pcie_wait_for_link(pci); + return 0; + } -- 2.7.4 |