3 files changed, 53 insertions, 3 deletions

diff --git a/arch/mips/include/asm/mach-netlogic/irq.h b/arch/mips/include/asm/mach-netlogic/irq.h
index 868ed8a2ed5c..c0dbd530cca6 100644
--- a/arch/mips/include/asm/mach-netlogic/irq.h
+++ b/arch/mips/include/asm/mach-netlogic/irq.h
@@ -9,7 +9,8 @@
 #define __ASM_NETLOGIC_IRQ_H
 
 #include <asm/mach-netlogic/multi-node.h>
-#define NR_IRQS                 (64 * NLM_NR_NODES)
+#define NLM_IRQS_PER_NODE       1024
+#define NR_IRQS                 (NLM_IRQS_PER_NODE * NLM_NR_NODES)
 
 #define MIPS_CPU_IRQ_BASE       0
 
diff --git a/arch/mips/include/asm/mach-netlogic/multi-node.h b/arch/mips/include/asm/mach-netlogic/multi-node.h
index d62fc773f4d7..9ed8dacdc37c 100644
--- a/arch/mips/include/asm/mach-netlogic/multi-node.h
+++ b/arch/mips/include/asm/mach-netlogic/multi-node.h
@@ -47,8 +47,37 @@
 #endif
 #endif
 
-#define NLM_CORES_PER_NODE      8
 #define NLM_THREADS_PER_CORE    4
-#define NLM_CPUS_PER_NODE       (NLM_CORES_PER_NODE * NLM_THREADS_PER_CORE)
+#ifdef CONFIG_CPU_XLR
+#define nlm_cores_per_node()    8
+#else
+extern unsigned int xlp_cores_per_node;
+#define nlm_cores_per_node()    xlp_cores_per_node
+#endif
+
+#define nlm_threads_per_node()  (nlm_cores_per_node() * NLM_THREADS_PER_CORE)
+#define nlm_cpuid_to_node(c)    ((c) / nlm_threads_per_node())
+
+struct nlm_soc_info {
+        unsigned long   coremask;       /* cores enabled on the soc */
+        unsigned long   ebase;          /* not used now */
+        uint64_t        irqmask;        /* EIMR for the node */
+        uint64_t        sysbase;        /* only for XLP - sys block base */
+        uint64_t        picbase;        /* PIC block base */
+        spinlock_t      piclock;        /* lock for PIC access */
+        cpumask_t       cpumask;        /* logical cpu mask for node */
+        unsigned int    socbus;
+};
+
+extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES];
+#define nlm_get_node(i)         (&nlm_nodes[i])
+#define nlm_node_present(n)     ((n) >= 0 && (n) < NLM_NR_NODES && \
+                                        nlm_get_node(n)->coremask != 0)
+#ifdef CONFIG_CPU_XLR
+#define nlm_current_node()      (&nlm_nodes[0])
+#else
+#define nlm_current_node()      (&nlm_nodes[nlm_nodeid()])
+#endif
+void nlm_node_init(int node);
 
 #endif
diff --git a/arch/mips/include/asm/mach-netlogic/topology.h b/arch/mips/include/asm/mach-netlogic/topology.h
new file mode 100644
index 000000000000..0da99fa11c38
--- /dev/null
+++ b/arch/mips/include/asm/mach-netlogic/topology.h
@@ -0,0 +1,20 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2013 Broadcom Corporation
+ */
+#ifndef _ASM_MACH_NETLOGIC_TOPOLOGY_H
+#define _ASM_MACH_NETLOGIC_TOPOLOGY_H
+
+#include <asm/mach-netlogic/multi-node.h>
+
+#define topology_physical_package_id(cpu)       cpu_to_node(cpu)
+#define topology_core_id(cpu)   (cpu_logical_map(cpu) / NLM_THREADS_PER_CORE)
+#define topology_thread_cpumask(cpu)            (&cpu_sibling_map[cpu])
+#define topology_core_cpumask(cpu)      cpumask_of_node(cpu_to_node(cpu))
+
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_MACH_NETLOGIC_TOPOLOGY_H */