aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/netlogic/xlp/nlm_hal.c2
-rw-r--r--arch/mips/netlogic/xlp/wakeup.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index 997cd9ee10de..7b277cda31f3 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -54,6 +54,8 @@ void nlm_node_init(int node)
54 struct nlm_soc_info *nodep; 54 struct nlm_soc_info *nodep;
55 55
56 nodep = nlm_get_node(node); 56 nodep = nlm_get_node(node);
57 if (node == 0)
58 nodep->coremask = 1; /* node 0, boot cpu */
57 nodep->sysbase = nlm_get_sys_regbase(node); 59 nodep->sysbase = nlm_get_sys_regbase(node);
58 nodep->picbase = nlm_get_pic_regbase(node); 60 nodep->picbase = nlm_get_pic_regbase(node);
59 nodep->ebase = read_c0_ebase() & (~((1 << 12) - 1)); 61 nodep->ebase = read_c0_ebase() & (~((1 << 12) - 1));
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index 9a92617a2af5..758923865886 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -159,10 +159,6 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
159 */ 159 */
160 syscoremask = (1 << hweight32(~fusemask & mask)) - 1; 160 syscoremask = (1 << hweight32(~fusemask & mask)) - 1;
161 161
162 /* The boot cpu */
163 if (n == 0)
164 nodep->coremask = 1;
165
166 pr_info("Node %d - SYS/FUSE coremask %x\n", n, syscoremask); 162 pr_info("Node %d - SYS/FUSE coremask %x\n", n, syscoremask);
167 for (core = 0; core < nlm_cores_per_node(); core++) { 163 for (core = 0; core < nlm_cores_per_node(); core++) {
168 /* we will be on node 0 core 0 */ 164 /* we will be on node 0 core 0 */