Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12cda817 authored by Tejun Heo's avatar Tejun Heo
Browse files

ia64: initialize cpu maps early 



All information necessary to initialize cpu possible and present maps
are available once early_acpi_boot_init() is complete.  Reorganize
setup_arch() and acpi init functions such that,

* CPU information is printed after LAPIC entries are parsed in
  early_acpi_boot_init().

* smp_build_cpu_map() is called by setup_arch() instead of acpi
  functions.

* smp_build_cpu_map() is called once all CPU related information is
  available before memory is initialized.

This is primarily to allow find_memory() to use cpu maps but is also a
general cleanup.  Please note that with this change, the somewhat
ad-hoc early_cpu_possible_map defined and used for NUMA configurations
is probably unnecessary.  Something to clean up another day.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64 <linux-ia64@vger.kernel.org>
parent 126b3fcd

arch/ia64/kernel/acpi.c

+15 −18
Original line number Diff line number Diff line
@@ -702,10 +702,22 @@ int __init early_acpi_boot_init(void) 
		printk(KERN_ERR PREFIX

		       "Error parsing MADT - no LAPIC entries\n");



	return 0;

#ifdef CONFIG_SMP

	if (available_cpus == 0) {

		printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");

		printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());

		smp_boot_data.cpu_phys_id[available_cpus] =

		    hard_smp_processor_id();

		available_cpus = 1;	/* We've got at least one of these, no? */

	}

	smp_boot_data.cpu_count = available_cpus;

#endif

	/* Make boot-up look pretty */

	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus,

	       total_cpus);





	return 0;

}



int __init acpi_boot_init(void)

{
@@ -769,18 +781,8 @@ int __init acpi_boot_init(void) 
	if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt))

		printk(KERN_ERR PREFIX "Can't find FADT\n");



#ifdef CONFIG_SMP

	if (available_cpus == 0) {

		printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");

		printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());

		smp_boot_data.cpu_phys_id[available_cpus] =

		    hard_smp_processor_id();

		available_cpus = 1;	/* We've got at least one of these, no? */

	}

	smp_boot_data.cpu_count = available_cpus;



	smp_build_cpu_map();

#ifdef CONFIG_ACPI_NUMA

#ifdef CONFIG_SMP

	if (srat_num_cpus == 0) {

		int cpu, i = 1;

		for (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++)
@@ -790,13 +792,8 @@ int __init acpi_boot_init(void) 
				    smp_boot_data.cpu_phys_id[cpu];

	}

#endif

#endif

#ifdef CONFIG_ACPI_NUMA

	build_cpu_to_node_map();

#endif

	/* Make boot-up look pretty */

	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus,

	       total_cpus);

	return 0;

}

arch/ia64/kernel/setup.c

+5 −6
Original line number Diff line number Diff line
@@ -573,12 +573,11 @@ setup_arch (char **cmdline_p) 
		32 : cpus_weight(early_cpu_possible_map)),

		additional_cpus > 0 ? additional_cpus : 0);

# endif

#else

# ifdef CONFIG_SMP

	smp_build_cpu_map();	/* happens, e.g., with the Ski simulator */

# endif

#endif /* CONFIG_APCI_BOOT */



#ifdef CONFIG_SMP

	smp_build_cpu_map();

#endif

	find_memory();



	/* process SAL system table: */