MIPS: Netlogic: Add cpu to node mapping for XLP9XX

XLP9XX has 20 cores per node, opposed to 8 on earlier XLP8XX.
Update code that calculates node id from cpu id to handle this.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6283/

2 files changed, 7 insertions, 2 deletions

diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 310d88a82abe..2a39bbeb45b0 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -51,6 +51,7 @@ uint64_t nlm_io_base;
 struct nlm_soc_info nlm_nodes[NLM_NR_NODES];
 cpumask_t nlm_cpumask = CPU_MASK_CPU0;
 unsigned int nlm_threads_per_core;
+unsigned int xlp_cores_per_node;
 
 static void nlm_linux_exit(void)
 {
@@ -154,6 +155,10 @@ void __init prom_init(void)
         void *reset_vec;
 
         nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE);
+        if (cpu_is_xlp9xx())
+                xlp_cores_per_node = 32;
+        else
+                xlp_cores_per_node = 8;
         nlm_init_boot_cpu();
         xlp_mmu_init();
         nlm_node_init(0);
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index a5d6647e5fe8..bbd53f8e92db 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -165,7 +165,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
                         nodep->coremask = 1;
 
                 pr_info("Node %d - SYS/FUSE coremask %x\n", n, syscoremask);
-                for (core = 0; core < NLM_CORES_PER_NODE; core++) {
+                for (core = 0; core < nlm_cores_per_node(); core++) {
                         /* we will be on node 0 core 0 */
                         if (n == 0 && core == 0)
                                 continue;
@@ -175,7 +175,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
                                 continue;
 
                         /* see if at least the first hw thread is enabled */
-                        cpu = (n * NLM_CORES_PER_NODE + core)
+                        cpu = (n * nlm_cores_per_node() + core)
                                                 * NLM_THREADS_PER_CORE;
                         if (!cpumask_test_cpu(cpu, wakeup_mask))
                                 continue;