mirror
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYM9cGAAoJEIfQlpxEBwcEftgP+wSo/IYMff523CM8IGSwkS/7
 AmFYp/lw8t6MjwX/NNFmzeB3uuSdzfEK1J+tqURp/H+2i5vmdUsov1H36sFhDC8P
 k5sxwOo5hidjMUDaA7TOBBVewSad2TIzdpFj3AEgE/LTdyeSw/FOyBUFKeHkbN0p
 Mr84ZGY5NznYESfZeNB7jvouNjL6OdsTHKhNwrTs5DUhuAml6Nz5cdkzRbN+21WB
 vRQKW7ms473L1zEgAcfZuEWfYBKQr4pyg30muS5VkoSMbV9iT9DlDOTMXn8F6jNi
 k2cWVdBqlJFAKdE2yMCBNTSPjVKBMrd0hB2Ap2FGdyPGfwzaRi2Xz1X5WjgXULDs
 rQk3vDPclRbwuktwl7FSD7tgSdJzdJVYKUir/r3Mha6WgBvIbyWjW478C8XEtc9H
 k8lq6ln4uuYw1up8aHdtXAJmVXW6HzkwyirTDlzV+0IAu8KlSDzhiXN/MKrabJoW
 1iGy+YPSX131J9ae67MM5/vfk+vnoncByaNJylac+eRxIVARfF+Y8HFbHhuh62Gg
 OAix8s90Xub//PjO8ZeUO2/0mwVXPizvoNrqi4vRycqfqWiOHEAK7TNpMirMue9N
 FYuo127CaT66bQfWXKQ8czXCZ+yV/3o/yn8ZBjJbGV/nmwLEaOMCH7WO2THAt5b5
 hS/APwrSo3x3slm3Ks6y
 =RdSo
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-11-30 17:49:17 +01:00
parent 196249beab 09f3510fb7
commit 9442091ed0
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/mach-bcm/bcm_5301x.c
View File

@ -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