BCM6358 has a shared TLB which conflicts with current SMP support, so it must
be disabled for now.
BCM6358 uses >= 0xfffe0000 addresses for internal registers, which need to be
remapped (by using a simplified version of BRCM63xx ioremap.h).
Signed-off-by: Álvaro Fernández Rojas <noltari@xxxxxxxxx>
---
v2: Use a different approach for remapping internal registers
arch/mips/bmips/setup.c | 29 +++++++++++++++++------
arch/mips/include/asm/mach-bmips/ioremap.h | 37 ++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 7 deletions(-)
create mode 100644 arch/mips/include/asm/mach-bmips/ioremap.h
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index 3553528..f834a86 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -18,6 +18,7 @@
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
#include <linux/smp.h>
+#include <linux/types.h>
#include <asm/addrspace.h>
#include <asm/bmips.h>
#include <asm/bootinfo.h>
@@ -35,9 +36,12 @@
static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
+phys_addr_t bmips_internal_registers;
+
struct bmips_quirk {
- const char *compatible;
- void (*quirk_fn)(void);
+ const char *compatible;
+ void (*quirk_fn)(void);
+ const phys_addr_t regs;
};
static void kbase_setup(void)
@@ -95,17 +99,27 @@ static void bcm6328_quirks(void)
bcm63xx_fixup_cpu1();
}
+static void bcm6358_quirks(void)
+{
+ /*
+ * BCM6358 needs special handling for its shared TLB, so
+ * disable SMP for now
+ */
+ bmips_smp_enabled = 0;
+}
+
static void bcm6368_quirks(void)
{
bcm63xx_fixup_cpu1();
}
static const struct bmips_quirk bmips_quirk_list[] = {
- { "brcm,bcm3384-viper", &bcm3384_viper_quirks },
- { "brcm,bcm33843-viper", &bcm3384_viper_quirks },
- { "brcm,bcm6328", &bcm6328_quirks },
- { "brcm,bcm6368", &bcm6368_quirks },
- { "brcm,bcm63168", &bcm6368_quirks },
+ { "brcm,bcm3384-viper", &bcm3384_viper_quirks, 0 },
+ { "brcm,bcm33843-viper", &bcm3384_viper_quirks, 0 },
+ { "brcm,bcm6328", &bcm6328_quirks, 0 },
+ { "brcm,bcm6358", &bcm6358_quirks, 0xfffe0000 },
+ { "brcm,bcm6368", &bcm6368_quirks, 0 },
+ { "brcm,bcm63168", &bcm6368_quirks, 0 },
{ },
};
@@ -162,6 +176,7 @@ void __init plat_mem_setup(void)
for (q = bmips_quirk_list; q->quirk_fn; q++) {
if (of_flat_dt_is_compatible(of_get_flat_dt_root(),
q->compatible)) {
+ bmips_internal_registers = q->regs;
q->quirk_fn();
}
}
diff --git a/arch/mips/include/asm/mach-bmips/ioremap.h b/arch/mips/include/asm/mach-bmips/ioremap.h
new file mode 100644
index 0000000..5ffca94
--- /dev/null
+++ b/arch/mips/include/asm/mach-bmips/ioremap.h
@@ -0,0 +1,37 @@
+#ifndef __ASM_MACH_BMIPS_IOREMAP_H
+#define __ASM_MACH_BMIPS_IOREMAP_H
+
+#include <linux/types.h>
+
+extern phys_addr_t bmips_internal_registers;
+
+static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr,
+ phys_addr_t size)
+{
+ return phys_addr;
+}
+
+static inline int is_bmips_internal_registers(phys_addr_t offset)
+{
+ if (bmips_internal_registers != 0 && offset >= bmips_internal_registers)
+ return 1;
+ else
+ return 0;
+}
+
+static inline void __iomem *plat_ioremap(phys_addr_t offset,
+ unsigned long size,
+ unsigned long flags)
+{
+ if (is_bmips_internal_registers(offset))
+ return (void __iomem *) offset;
+
+ return NULL;
+}
+
+static inline int plat_iounmap(const volatile void __iomem *addr)
+{
+ return is_bmips_internal_registers((unsigned long) addr);
+}
+
+#endif /* __ASM_MACH_BMIPS_IOREMAP_H */
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
