mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
PCI: keystone: Prevent ARM32 specific code to be compiled for ARM64
[ Upstream commit f316a2b53c
]
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: Kishon Vijay Abraham I <kishon@ti.com>
[lorenzo.pieralisi@arm.com: commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
9c8ace787b
commit
7cb42a3549
1 changed files with 4 additions and 0 deletions
|
@ -240,6 +240,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
|
||||||
ks_dw_pcie_enable_error_irq(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
|
* 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
|
||||||
|
@ -259,6 +260,7 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int __init ks_pcie_host_init(struct pcie_port *pp)
|
static int __init ks_pcie_host_init(struct pcie_port *pp)
|
||||||
{
|
{
|
||||||
|
@ -282,12 +284,14 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)
|
||||||
val |= BIT(12);
|
val |= BIT(12);
|
||||||
writel(val, pci->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL);
|
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
|
* PCIe access errors that result into OCP errors are caught by ARM as
|
||||||
* "External aborts"
|
* "External aborts"
|
||||||
*/
|
*/
|
||||||
hook_fault_code(17, keystone_pcie_fault, SIGBUS, 0,
|
hook_fault_code(17, keystone_pcie_fault, SIGBUS, 0,
|
||||||
"Asynchronous external abort");
|
"Asynchronous external abort");
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue