UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu cleanup for 4.4 (part 2) 

Remove code related to Armada 375 Z1 stepping no more supported in mainline
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYhNdoACgkQCwYYjhRyO9XfRgCbBLfDDVPLhhVwT+Rh4M8dsP+g
 ZLYAoKI884Me01F+dIDYmJVNypuHsj/g
 =YgnH
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-cleanup-4.4-2' of git://git.infradead.org/linux-mvebu into next/cleanup

mvebu cleanup for 4.4 (part 2)

Remove code related to Armada 375 Z1 stepping no more supported in mainline

* tag 'mvebu-cleanup-4.4-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: remove the workaround imprecise abort fault handler

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-10-22 10:35:28 -07:00
parent b96fc2f3c1 ef2cdccd21
commit 7b192fb7b4
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/arm/mach-mvebu/board-v7.c
View File

@ -22,7 +22,6 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/memblock.h> #include <linux/memblock.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <linux/signal.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/irqchip.h> #include <linux/irqchip.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
@ -105,27 +104,6 @@ static void __init mvebu_memblock_reserve(void)
static void __init mvebu_memblock_reserve(void) {} static void __init mvebu_memblock_reserve(void) {}
#endif #endif
/*
* Early versions of Armada 375 SoC have a bug where the BootROM
* leaves an external data abort pending. The kernel is hit by this
* data abort as soon as it enters userspace, because it unmasks the
* data aborts at this moment. We register a custom abort handler
* below to ignore the first data abort to work around this
* problem.
*/
static int armada_375_external_abort_wa(unsigned long addr, unsigned int fsr,
struct pt_regs *regs)
{
static int ignore_first;
if (!ignore_first && fsr == 0x1406) {
ignore_first = 1;
return 0;
}
return 1;
}
static void __init mvebu_init_irq(void) static void __init mvebu_init_irq(void)
{ {
irqchip_init(); irqchip_init();
@ -134,17 +112,6 @@ static void __init mvebu_init_irq(void)
BUG_ON(mvebu_mbus_dt_init(coherency_available())); BUG_ON(mvebu_mbus_dt_init(coherency_available()));
} }
static void __init external_abort_quirk(void)
{
u32 dev, rev;
if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
return;
hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
"imprecise external abort");
}
static void __init i2c_quirk(void) static void __init i2c_quirk(void)
{ {
struct device_node *np; struct device_node *np;
@ -177,8 +144,6 @@ static void __init mvebu_dt_init(void)
{ {
if (of_machine_is_compatible("marvell,armadaxp")) if (of_machine_is_compatible("marvell,armadaxp"))
i2c_quirk(); i2c_quirk();
if (of_machine_is_compatible("marvell,a375-db"))
external_abort_quirk();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }