1 files changed, 94 insertions, 37 deletions

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 6e2b6638122d..7d12af1317f1 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -21,6 +21,8 @@
 #include <linux/screen_info.h>
 #include <linux/bootmem.h>
 #include <linux/kernel.h>
+#include <linux/percpu.h>
+#include <linux/cpu.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
@@ -37,6 +39,7 @@
 #endif
 
 #include <asm/bootparam.h>
+#include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/timex.h>
@@ -45,6 +48,7 @@
 #include <asm/setup.h>
 #include <asm/param.h>
 #include <asm/traps.h>
+#include <asm/smp.h>
 
 #include <platform/hardware.h>
 
@@ -85,12 +89,6 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 
 sysmem_info_t __initdata sysmem;
 
-#ifdef CONFIG_MMU
-extern void init_mmu(void);
-#else
-static inline void init_mmu(void) { }
-#endif
-
 extern int mem_reserve(unsigned long, unsigned long, int);
 extern void bootmem_init(void);
 extern void zones_init(void);
@@ -214,6 +212,42 @@ static int __init parse_bootparam(const bp_tag_t* tag)
 #ifdef CONFIG_OF
 bool __initdata dt_memory_scan = false;
 
+#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
+unsigned long xtensa_kio_paddr = XCHAL_KIO_DEFAULT_PADDR;
+EXPORT_SYMBOL(xtensa_kio_paddr);
+
+static int __init xtensa_dt_io_area(unsigned long node, const char *uname,
+                int depth, void *data)
+{
+        const __be32 *ranges;
+        unsigned long len;
+
+        if (depth > 1)
+                return 0;
+
+        if (!of_flat_dt_is_compatible(node, "simple-bus"))
+                return 0;
+
+        ranges = of_get_flat_dt_prop(node, "ranges", &len);
+        if (!ranges)
+                return 1;
+        if (len == 0)
+                return 1;
+
+        xtensa_kio_paddr = of_read_ulong(ranges+1, 1);
+        /* round down to nearest 256MB boundary */
+        xtensa_kio_paddr &= 0xf0000000;
+
+        return 1;
+}
+#else
+static int __init xtensa_dt_io_area(unsigned long node, const char *uname,
+                int depth, void *data)
+{
+        return 1;
+}
+#endif
+
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
         if (!dt_memory_scan)
@@ -234,6 +268,7 @@ void __init early_init_devtree(void *params)
                 dt_memory_scan = true;
 
         early_init_dt_scan(params);
+        of_scan_flat_dt(xtensa_dt_io_area, NULL);
 
         if (!command_line[0])
                 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
@@ -241,7 +276,7 @@ void __init early_init_devtree(void *params)
 
 static int __init xtensa_device_probe(void)
 {
-        of_platform_populate(NULL, NULL, NULL, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         return 0;
 }
 
@@ -354,7 +389,8 @@ static inline int probed_compare_swap(int *v, int cmp, int set)
 
 /* Handle probed exception */
 
-void __init do_probed_exception(struct pt_regs *regs, unsigned long exccause)
+static void __init do_probed_exception(struct pt_regs *regs,
+                unsigned long exccause)
 {
         if (regs->pc == rcw_probe_pc) { /* exception on s32c1i ? */
                 regs->pc += 3;          /* skip the s32c1i instruction */
@@ -366,7 +402,7 @@ void __init do_probed_exception(struct pt_regs *regs, unsigned long exccause)
 
 /* Simple test of S32C1I (soc bringup assist) */
 
-void __init check_s32c1i(void)
+static int __init check_s32c1i(void)
 {
         int n, cause1, cause2;
         void *handbus, *handdata, *handaddr; /* temporarily saved handlers */
@@ -421,24 +457,21 @@ void __init check_s32c1i(void)
         trap_set_handler(EXCCAUSE_LOAD_STORE_ERROR, handbus);
         trap_set_handler(EXCCAUSE_LOAD_STORE_DATA_ERROR, handdata);
         trap_set_handler(EXCCAUSE_LOAD_STORE_ADDR_ERROR, handaddr);
+        return 0;
 }
 
 #else /* XCHAL_HAVE_S32C1I */
 
 /* This condition should not occur with a commercially deployed processor.
    Display reminder for early engr test or demo chips / FPGA bitstreams */
-void __init check_s32c1i(void)
+static int __init check_s32c1i(void)
 {
         pr_warn("Processor configuration lacks atomic compare-and-swap support!\n");
+        return 0;
 }
 
 #endif /* XCHAL_HAVE_S32C1I */
-#else /* CONFIG_S32C1I_SELFTEST */
-
-void __init check_s32c1i(void)
-{
-}
-
+early_initcall(check_s32c1i);
 #endif /* CONFIG_S32C1I_SELFTEST */
 
 
@@ -447,8 +480,6 @@ void __init setup_arch(char **cmdline_p)
         strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
         *cmdline_p = command_line;
 
-        check_s32c1i();
-
         /* Reserve some memory regions */
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -505,6 +536,10 @@ void __init setup_arch(char **cmdline_p)
 
         platform_setup(cmdline_p);
 
+#ifdef CONFIG_SMP
+        smp_init_cpus();
+#endif
+
         paging_init();
         zones_init();
 
@@ -521,6 +556,22 @@ void __init setup_arch(char **cmdline_p)
 #endif
 }
 
+static DEFINE_PER_CPU(struct cpu, cpu_data);
+
+static int __init topology_init(void)
+{
+        int i;
+
+        for_each_possible_cpu(i) {
+                struct cpu *cpu = &per_cpu(cpu_data, i);
+                cpu->hotpluggable = !!i;
+                register_cpu(cpu, i);
+        }
+
+        return 0;
+}
+subsys_initcall(topology_init);
+
 void machine_restart(char * cmd)
 {
         platform_restart();
@@ -546,21 +597,27 @@ void machine_power_off(void)
 static int
 c_show(struct seq_file *f, void *slot)
 {
+        char buf[NR_CPUS * 5];
+
+        cpulist_scnprintf(buf, sizeof(buf), cpu_online_mask);
         /* high-level stuff */
-        seq_printf(f,"processor\t: 0\n"
-                     "vendor_id\t: Tensilica\n"
-                     "model\t\t: Xtensa " XCHAL_HW_VERSION_NAME "\n"
-                     "core ID\t\t: " XCHAL_CORE_ID "\n"
-                     "build ID\t: 0x%x\n"
-                     "byte order\t: %s\n"
-                     "cpu MHz\t\t: %lu.%02lu\n"
-                     "bogomips\t: %lu.%02lu\n",
-                     XCHAL_BUILD_UNIQUE_ID,
-                     XCHAL_HAVE_BE ?  "big" : "little",
-                     ccount_freq/1000000,
-                     (ccount_freq/10000) % 100,
-                     loops_per_jiffy/(500000/HZ),
-                     (loops_per_jiffy/(5000/HZ)) % 100);
+        seq_printf(f, "CPU count\t: %u\n"
+                      "CPU list\t: %s\n"
+                      "vendor_id\t: Tensilica\n"
+                      "model\t\t: Xtensa " XCHAL_HW_VERSION_NAME "\n"
+                      "core ID\t\t: " XCHAL_CORE_ID "\n"
+                      "build ID\t: 0x%x\n"
+                      "byte order\t: %s\n"
+                      "cpu MHz\t\t: %lu.%02lu\n"
+                      "bogomips\t: %lu.%02lu\n",
+                      num_online_cpus(),
+                      buf,
+                      XCHAL_BUILD_UNIQUE_ID,
+                      XCHAL_HAVE_BE ?  "big" : "little",
+                      ccount_freq/1000000,
+                      (ccount_freq/10000) % 100,
+                      loops_per_jiffy/(500000/HZ),
+                      (loops_per_jiffy/(5000/HZ)) % 100);
 
         seq_printf(f,"flags\t\t: "
 #if XCHAL_HAVE_NMI
@@ -672,7 +729,7 @@ c_show(struct seq_file *f, void *slot)
 static void *
 c_start(struct seq_file *f, loff_t *pos)
 {
-        return (void *) ((*pos == 0) ? (void *)1 : NULL);
+        return (*pos == 0) ? (void *)1 : NULL;
 }
 
 static void *
@@ -688,10 +745,10 @@ c_stop(struct seq_file *f, void *v)
 
 const struct seq_operations cpuinfo_op =
 {
-        start:  c_start,
-        next:   c_next,
-        stop:   c_stop,
-        show:   c_show
+        .start  = c_start,
+        .next   = c_next,
+        .stop   = c_stop,
+        .show   = c_show,
 };
 
 #endif /* CONFIG_PROC_FS */