Skip to content

Commit 801284f

Browse files
mike-travisKAGA-KOKO
authored andcommitted
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: 6c77944 ("Add UV5 direct references") Signed-off-by: Mike Travis <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1aee505 commit 801284f

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

arch/x86/kernel/apic/x2apic_uv_x.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,13 +389,20 @@ static int __init uv_set_system_type(char *_oem_id, char *_oem_table_id)
389389
/* (Not hubless), not a UV */
390390
return 0;
391391

392+
/* Is UV hubless system */
393+
uv_hubless_system = 0x01;
394+
395+
/* UV5 Hubless */
396+
if (strncmp(uv_archtype, "NSGI5", 5) == 0)
397+
uv_hubless_system |= 0x20;
398+
392399
/* UV4 Hubless: CH */
393-
if (strncmp(uv_archtype, "NSGI4", 5) == 0)
394-
uv_hubless_system = 0x11;
400+
else if (strncmp(uv_archtype, "NSGI4", 5) == 0)
401+
uv_hubless_system |= 0x10;
395402

396403
/* UV3 Hubless: UV300/MC990X w/o hub */
397404
else
398-
uv_hubless_system = 0x9;
405+
uv_hubless_system |= 0x8;
399406

400407
/* Copy APIC type */
401408
uv_stringify(sizeof(oem_table_id), oem_table_id, _oem_table_id);

0 commit comments

Comments
 (0)