diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2015-10-15 06:32:21 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-11-12 13:02:05 -0500 |
commit | 9b1b61cd8e31d9beba871333d7a798b3adb89288 (patch) | |
tree | f0c73a9ede2bd89fe5f5a42995d6494386a68ceb /arch | |
parent | ff6d03b9d9cad592320ce21e9b22befe56ebe6b6 (diff) |
ARM: OMAP2+: remove custom abort handler for t410
This is not needed anymore. Handling a potentially pending imprecise external
abort left behind by the bootloader is now done in a slightly safer way inside
the common ARM startup code.
With the recent changes to abort handling, this issue got fixed by 57df53808534
("ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init").
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
[tony@atomide.com: updated comments to describe what fixed the issue]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 1dfe34654c43..58144779dec4 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c | |||
@@ -24,9 +24,6 @@ | |||
24 | #include <linux/platform_data/iommu-omap.h> | 24 | #include <linux/platform_data/iommu-omap.h> |
25 | #include <linux/platform_data/wkup_m3.h> | 25 | #include <linux/platform_data/wkup_m3.h> |
26 | 26 | ||
27 | #include <asm/siginfo.h> | ||
28 | #include <asm/signal.h> | ||
29 | |||
30 | #include "common.h" | 27 | #include "common.h" |
31 | #include "common-board-devices.h" | 28 | #include "common-board-devices.h" |
32 | #include "dss-common.h" | 29 | #include "dss-common.h" |
@@ -385,29 +382,6 @@ static void __init omap3_pandora_legacy_init(void) | |||
385 | } | 382 | } |
386 | #endif /* CONFIG_ARCH_OMAP3 */ | 383 | #endif /* CONFIG_ARCH_OMAP3 */ |
387 | 384 | ||
388 | #ifdef CONFIG_SOC_TI81XX | ||
389 | static int fault_fixed_up; | ||
390 | |||
391 | static int t410_abort_handler(unsigned long addr, unsigned int fsr, | ||
392 | struct pt_regs *regs) | ||
393 | { | ||
394 | if ((fsr == 0x406 || fsr == 0xc06) && !fault_fixed_up) { | ||
395 | pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n", | ||
396 | addr, fsr); | ||
397 | fault_fixed_up = 1; | ||
398 | return 0; | ||
399 | } | ||
400 | |||
401 | return 1; | ||
402 | } | ||
403 | |||
404 | static void __init t410_abort_init(void) | ||
405 | { | ||
406 | hook_fault_code(16 + 6, t410_abort_handler, SIGBUS, BUS_OBJERR, | ||
407 | "imprecise external abort"); | ||
408 | } | ||
409 | #endif | ||
410 | |||
411 | #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) | 385 | #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) |
412 | static struct iommu_platform_data omap4_iommu_pdata = { | 386 | static struct iommu_platform_data omap4_iommu_pdata = { |
413 | .reset_name = "mmu_cache", | 387 | .reset_name = "mmu_cache", |
@@ -536,9 +510,6 @@ static struct pdata_init pdata_quirks[] __initdata = { | |||
536 | { "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, }, | 510 | { "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, }, |
537 | { "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, }, | 511 | { "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, }, |
538 | #endif | 512 | #endif |
539 | #ifdef CONFIG_SOC_TI81XX | ||
540 | { "hp,t410", t410_abort_init, }, | ||
541 | #endif | ||
542 | #ifdef CONFIG_SOC_OMAP5 | 513 | #ifdef CONFIG_SOC_OMAP5 |
543 | { "ti,omap5-uevm", omap5_uevm_legacy_init, }, | 514 | { "ti,omap5-uevm", omap5_uevm_legacy_init, }, |
544 | #endif | 515 | #endif |