Commit 02cb726b authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman

PCI: keystone: Prevent ARM32 specific code to be compiled for ARM64

[ Upstream commit f316a2b5 ]

hook_fault_code() is an ARM32 specific API for hooking into data abort.

AM65X platforms (that integrate ARM v8 cores and select CONFIG_ARM64 as
arch) rely on pci-keystone.c but on them the enumeration of a
non-present BDF does not trigger a bus error, so the fixup exception
provided by calling hook_fault_code() is not needed and can be guarded
with CONFIG_ARM.
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
[lorenzo.pieralisi@arm.com: commit log]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e178094a
...@@ -705,6 +705,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) ...@@ -705,6 +705,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
ks_pcie_enable_error_irq(ks_pcie); ks_pcie_enable_error_irq(ks_pcie);
} }
#ifdef CONFIG_ARM
/* /*
* When a PCI device does not exist during config cycles, keystone host gets a * 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 * bus error instead of returning 0xffffffff. This handler always returns 0
...@@ -724,6 +725,7 @@ static int ks_pcie_fault(unsigned long addr, unsigned int fsr, ...@@ -724,6 +725,7 @@ static int ks_pcie_fault(unsigned long addr, unsigned int fsr,
return 0; return 0;
} }
#endif
static int __init ks_pcie_init_id(struct keystone_pcie *ks_pcie) static int __init ks_pcie_init_id(struct keystone_pcie *ks_pcie)
{ {
...@@ -766,12 +768,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) ...@@ -766,12 +768,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)
if (ret < 0) if (ret < 0)
return ret; return ret;
#ifdef CONFIG_ARM
/* /*
* PCIe access errors that result into OCP errors are caught by ARM as * PCIe access errors that result into OCP errors are caught by ARM as
* "External aborts" * "External aborts"
*/ */
hook_fault_code(17, ks_pcie_fault, SIGBUS, 0, hook_fault_code(17, ks_pcie_fault, SIGBUS, 0,
"Asynchronous external abort"); "Asynchronous external abort");
#endif
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment