Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86, uv: Ensure hub revision set for all ACPI modes.
Ensure that UV hub revision is set for all ACPI modes.
Signed-off-by: Russ Anderson <rja@sgi.com>
LKML-Reference: <20100115180908.GB7757@sgi.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
authored by Russ Anderson and committed by H. Peter Anvin 1d2c867c 7a1110e8
+4
-1
arch/x86/kernel/apic/x2apic_uv_x.c
+4
-1
arch/x86/kernel/apic/x2apic_uv_x.c
···
66
67
static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
68
{
69
if (!strcmp(oem_id, "SGI")) {
70
x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
71
if (!strcmp(oem_table_id, "UVL"))
72
uv_system_type = UV_LEGACY_APIC;
···
77
uv_system_type = UV_X2APIC;
78
else if (!strcmp(oem_table_id, "UVH")) {
79
__get_cpu_var(x2apic_extra_bits) =
80
-
early_get_nodeid() << (UV_APIC_PNODE_SHIFT - 1);
81
uv_system_type = UV_NON_UNIQUE_APIC;
82
return 1;
83
}
···
66
67
static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
68
{
69
+
int nodeid;
70
+
71
if (!strcmp(oem_id, "SGI")) {
72
+
nodeid = early_get_nodeid();
73
x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
74
if (!strcmp(oem_table_id, "UVL"))
75
uv_system_type = UV_LEGACY_APIC;
···
74
uv_system_type = UV_X2APIC;
75
else if (!strcmp(oem_table_id, "UVH")) {
76
__get_cpu_var(x2apic_extra_bits) =
77
+
nodeid << (UV_APIC_PNODE_SHIFT - 1);
78
uv_system_type = UV_NON_UNIQUE_APIC;
79
return 1;
80
}