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

Commit 9442091e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.10/soc' of http://github.com/Broadcom/stblinux into next/soc 

Merge "Broadcom soc changes for 4.10" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC changes for 4.10, please pull
the following:

- Rafal adds back the abort handler hook on BCM5301x which is required to silence
  errors forwared from the PCIe controller that cannot be silenced at the PCIe RC level

* tag 'arm-soc/for-4.10/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM5301X: Add back handler ignoring external imprecise aborts
parents 196249be 09f3510f

arch/arm/mach-bcm/bcm_5301x.c

+28 −0
Original line number Diff line number Diff line
@@ -9,14 +9,42 @@ 
#include <asm/hardware/cache-l2x0.h>



#include <asm/mach/arch.h>

#include <asm/siginfo.h>

#include <asm/signal.h>



#define FSR_EXTERNAL		(1 << 12)

#define FSR_READ		(0 << 10)

#define FSR_IMPRECISE		0x0406



static const char *const bcm5301x_dt_compat[] __initconst = {

	"brcm,bcm4708",

	NULL,

};



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

				  struct pt_regs *regs)

{

	/*

	 * We want to ignore aborts forwarded from the PCIe bus that are

	 * expected and shouldn't really be passed by the PCIe controller.

	 * The biggest disadvantage is the same FSR code may be reported when

	 * reading non-existing APB register and we shouldn't ignore that.

	 */

	if (fsr == (FSR_EXTERNAL | FSR_READ | FSR_IMPRECISE))

		return 0;



	return 1;

}



static void __init bcm5301x_init_early(void)

{

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

			"imprecise external abort");

}



DT_MACHINE_START(BCM5301X, "BCM5301X")

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.dt_compat	= bcm5301x_dt_compat,

	.init_early	= bcm5301x_init_early,

MACHINE_END