Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1b61cd authored by Lucas Stach's avatar Lucas Stach Committed by Tony Lindgren
Browse files

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 57df5380
("ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init").

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
[tony@atomide.com: updated comments to describe what fixed the issue]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ff6d03b9

arch/arm/mach-omap2/pdata-quirks.c

+0 −29
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
#include <linux/platform_data/iommu-omap.h>

#include <linux/platform_data/wkup_m3.h>



#include <asm/siginfo.h>

#include <asm/signal.h>



#include "common.h"

#include "common-board-devices.h"

#include "dss-common.h"
@@ -385,29 +382,6 @@ static void __init omap3_pandora_legacy_init(void) 
}

#endif /* CONFIG_ARCH_OMAP3 */



#ifdef CONFIG_SOC_TI81XX

static int fault_fixed_up;



static int t410_abort_handler(unsigned long addr, unsigned int fsr,

			      struct pt_regs *regs)

{

	if ((fsr == 0x406 || fsr == 0xc06) && !fault_fixed_up) {

		pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",

			addr, fsr);

		fault_fixed_up = 1;

		return 0;

	}



	return 1;

}



static void __init t410_abort_init(void)

{

	hook_fault_code(16 + 6, t410_abort_handler, SIGBUS, BUS_OBJERR,

			"imprecise external abort");

}

#endif



#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

static struct iommu_platform_data omap4_iommu_pdata = {

	.reset_name = "mmu_cache",
@@ -536,9 +510,6 @@ static struct pdata_init pdata_quirks[] __initdata = { 
	{ "openpandora,omap3-pandora-600mhz", omap3_pandora_legacy_init, },

	{ "openpandora,omap3-pandora-1ghz", omap3_pandora_legacy_init, },

#endif

#ifdef CONFIG_SOC_TI81XX

	{ "hp,t410", t410_abort_init, },

#endif

#ifdef CONFIG_SOC_OMAP5

	{ "ti,omap5-uevm", omap5_uevm_legacy_init, },

#endif