The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 8dcc0e19dfbd73ad6b3172924d6da8f7f3f8b3b0
Gitweb: https://git.kernel.org/tip/8dcc0e19dfbd73ad6b3172924d6da8f7f3f8b3b0
Author: Mike Travis <mike.travis@xxxxxxx>
AuthorDate: Thu, 03 Dec 2020 09:22:52 -06:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Thu, 03 Dec 2020 18:09:18 +01:00
x86/platform/uv: Fix UV4 hub revision adjustment
Currently, UV4 is incorrectly identified as UV4A and UV4A as UV5. Hub
chip starts with revision 1, fix it.
[ bp: Massage commit message. ]
Fixes: 647128f1536e ("x86/platform/uv: Update UV MMRs for UV5")
Signed-off-by: Mike Travis <mike.travis@xxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Steve Wahl <steve.wahl@xxxxxxx>
Acked-by: Dimitri Sivanich <dimitri.sivanich@xxxxxxx>
Link: https://lkml.kernel.org/r/20201203152252.371199-1-mike.travis@xxxxxxx
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1b98f8c..235f5cd 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -161,7 +161,7 @@ static int __init early_set_hub_type(void)
/* UV4/4A only have a revision difference */
case UV4_HUB_PART_NUMBER:
uv_min_hub_revision_id = node_id.s.revision
- + UV4_HUB_REVISION_BASE;
+ + UV4_HUB_REVISION_BASE - 1;
uv_hub_type_set(UV4);
if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE)
uv_hub_type_set(UV4|UV4A);
|