浏览代码

MIPS: Netlogic: Move coremask setup to nlm_node_init

This is needed for nlm_node_present(0) to work on uniprocessor compile.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6861/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Jayachandran C 11 年之前
父节点
当前提交
3e468567c2
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 2 0
      arch/mips/netlogic/xlp/nlm_hal.c
  2. 0 4
      arch/mips/netlogic/xlp/wakeup.c

+ 2 - 0
arch/mips/netlogic/xlp/nlm_hal.c

@@ -54,6 +54,8 @@ void nlm_node_init(int node)
 	struct nlm_soc_info *nodep;
 	struct nlm_soc_info *nodep;
 
 
 	nodep = nlm_get_node(node);
 	nodep = nlm_get_node(node);
+	if (node == 0)
+		nodep->coremask = 1;	/* node 0, boot cpu */
 	nodep->sysbase = nlm_get_sys_regbase(node);
 	nodep->sysbase = nlm_get_sys_regbase(node);
 	nodep->picbase = nlm_get_pic_regbase(node);
 	nodep->picbase = nlm_get_pic_regbase(node);
 	nodep->ebase = read_c0_ebase() & (~((1 << 12) - 1));
 	nodep->ebase = read_c0_ebase() & (~((1 << 12) - 1));

+ 0 - 4
arch/mips/netlogic/xlp/wakeup.c

@@ -159,10 +159,6 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
 		 */
 		 */
 		syscoremask = (1 << hweight32(~fusemask & mask)) - 1;
 		syscoremask = (1 << hweight32(~fusemask & mask)) - 1;
 
 
-		/* The boot cpu */
-		if (n == 0)
-			nodep->coremask = 1;
-
 		pr_info("Node %d - SYS/FUSE coremask %x\n", n, syscoremask);
 		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 */
 			/* we will be on node 0 core 0 */