Skip to contentSkip to conversation

: sparc: Call OF and MD cpu scanning explicitly from paging_init()

PATCH In review David Miller 1 participant 1 message Apr 9, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

David Miller

author maintainer
#0 lore raw

PATCH 7/12 : sparc: Call OF and MD cpu scanning explicitly from paging_init()

We need to split up the cpu present mask setup from the cpu_data initialization, and this is a first step towards that.

---
 arch/sparc/include/asm/prom.h   |    1 +
 arch/sparc/kernel/mdesc.c       |    4 ----
 arch/sparc/kernel/prom.h        |    1 -
 arch/sparc/kernel/prom_common.c |    2 --
 arch/sparc/mm/init_32.c         |    1 +
 arch/sparc/mm/init_64.c         |    5 ++++-
 6 files changed, 6 insertions(+), 8 deletions(-)
arch/sparc/include/asm/prom.h +1 -0
index 1b15212..be8d7aa 100644
@@ -87,6 +87,7 @@ extern int of_node_to_nid(struct device_node *dp);
 
 extern void prom_build_devicetree(void);
 extern void of_populate_present_mask(void);
+extern void of_fill_in_cpu_data(void);
 
 /* Dummy ref counting routines - to be implemented later */
 static inline struct device_node *of_node_get(struct device_node *node)
arch/sparc/kernel/mdesc.c +0 -4
index f50af3f..602cbb7 100644
@@ -919,7 +919,6 @@ void __init sun4v_mdesc_init(void)
 {
 	struct mdesc_handle *hp;
 	unsigned long len, real_len, status;
-	cpumask_t mask;
 
 	(void) sun4v_mach_desc(0UL, 0UL, &len);
 
@@ -943,7 +942,4 @@ void __init sun4v_mdesc_init(void)
 	cur_mdesc = hp;
 
 	report_platform_properties();
-
-	cpus_setall(mask);
-	mdesc_fill_in_cpu_data(mask);
 }
arch/sparc/kernel/prom.h +0 -1
index bb0f0fd..453397f 100644
@@ -22,7 +22,6 @@ static inline int is_root_node(const struct device_node *dp)
 
 extern char *build_path_component(struct device_node *dp);
 extern void of_console_init(void);
-extern void of_fill_in_cpu_data(void);
 
 extern unsigned int prom_early_allocated;
 
arch/sparc/kernel/prom_common.c +0 -2
index ff7b591..0fb5789 100644
@@ -313,6 +313,4 @@ void __init prom_build_devicetree(void)
 
 	printk("PROM: Built device tree with %u bytes of memory.\n",
 	       prom_early_allocated);
-
-	of_fill_in_cpu_data();
 }
arch/sparc/mm/init_32.c +1 -0
index cbb282d..26bb391 100644
@@ -358,6 +358,7 @@ void __init paging_init(void)
 	protection_map[15] = PAGE_SHARED;
 	btfixup();
 	prom_build_devicetree();
+	of_fill_in_cpu_data();
 	device_scan();
 }
 
arch/sparc/mm/init_64.c +4 -1
index f26a352..c589d6e 100644
@@ -1806,9 +1806,12 @@ void __init paging_init(void)
 	real_setup_per_cpu_areas();
 
 	prom_build_devicetree();
+	of_fill_in_cpu_data();
 
-	if (tlb_type = hypervisor)
+	if (tlb_type = hypervisor) {
 		sun4v_mdesc_init();
+		mdesc_fill_in_cpu_data(CPU_MASK_ALL);
+	}
 
 	/* Once the OF device tree and MDESC have been setup, we know
 	 * the list of possible cpus.  Therefore we can allocate the
Signature · 1 line
1.6.2.2