x86, uv: add early detection of UV system types
Portions of the ACPI code needs to know if a system is a UV system prior to genapic initialization. This patch adds a call early_acpi_boot_init() so that the apic type is discovered earlier. V2 of the patch adding fixes from Yinghai Lu. Much cleaner and smaller. Signed-off-by: Jack Steiner <steiner@sgi.com> Acked-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
e04d645f32
commit
2e42060c19
|
@ -998,6 +998,8 @@ void __init setup_arch(char **cmdline_p)
|
||||||
*/
|
*/
|
||||||
acpi_boot_table_init();
|
acpi_boot_table_init();
|
||||||
|
|
||||||
|
early_acpi_boot_init();
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI_NUMA
|
#ifdef CONFIG_ACPI_NUMA
|
||||||
/*
|
/*
|
||||||
* Parse SRAT to discover nodes.
|
* Parse SRAT to discover nodes.
|
||||||
|
|
|
@ -138,7 +138,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_uv_system())
|
if (get_uv_system_type() >= UV_X2APIC)
|
||||||
apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
|
apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
|
||||||
else
|
else
|
||||||
apic_id = pa->apic_id;
|
apic_id = pa->apic_id;
|
||||||
|
|
Loading…
Reference in New Issue