diff options
| author | Mike Travis <mike.travis@hpe.com> | 2020-11-05 16:27:41 -0600 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-11-07 11:17:39 +0100 |
| commit | 801284f9737883a2b2639bd494455a72c82fdedf (patch) | |
| tree | 5c55042d20695a190d23587cb65cd92d7dedfb6c /arch | |
| parent | 1aee505e0171fc38fd5ed70c7f0dcbb7398c759f (diff) | |
| download | linux-stable-801284f9737883a2b2639bd494455a72c82fdedf.tar.gz linux-stable-801284f9737883a2b2639bd494455a72c82fdedf.tar.bz2 linux-stable-801284f9737883a2b2639bd494455a72c82fdedf.zip | |
x86/platform/uv: Recognize UV5 hubless system identifier
Testing shows a problem in that UV5 hubless systems were not being
recognized. Add them to the list of OEM IDs checked.
Fixes: 6c7794423a998 ("Add UV5 direct references")
Signed-off-by: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201105222741.157029-4-mike.travis@hpe.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 0f848d6dddc9..3115caa7d7d0 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -389,13 +389,20 @@ static int __init uv_set_system_type(char *_oem_id, char *_oem_table_id) /* (Not hubless), not a UV */ return 0; + /* Is UV hubless system */ + uv_hubless_system = 0x01; + + /* UV5 Hubless */ + if (strncmp(uv_archtype, "NSGI5", 5) == 0) + uv_hubless_system |= 0x20; + /* UV4 Hubless: CH */ - if (strncmp(uv_archtype, "NSGI4", 5) == 0) - uv_hubless_system = 0x11; + else if (strncmp(uv_archtype, "NSGI4", 5) == 0) + uv_hubless_system |= 0x10; /* UV3 Hubless: UV300/MC990X w/o hub */ else - uv_hubless_system = 0x9; + uv_hubless_system |= 0x8; /* Copy APIC type */ uv_stringify(sizeof(oem_table_id), oem_table_id, _oem_table_id); |