x86/platform/uv: Adjust GAM MMR references affected by UV5 updates

Make modifications to the GAM MMR mappings to accommodate changes for UV5.

Signed-off-by: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Link: https://lkml.kernel.org/r/20201005203929.148656-9-mike.travis@hpe.com

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index e2e866a..5aed07f 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -927,12 +927,32 @@ static __init void map_gru_high(int max_pnode)
 
 static __init void map_mmr_high(int max_pnode)
 {
-       union uvh_rh_gam_mmr_overlay_config_u mmr;
-       int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT;
+       unsigned long base;
+       int shift;
+       bool enable;
+
+       if (UVH_RH10_GAM_MMR_OVERLAY_CONFIG) {
+               union uvh_rh10_gam_mmr_overlay_config_u mmr;
+
+               mmr.v = uv_read_local_mmr(UVH_RH10_GAM_MMR_OVERLAY_CONFIG);
+               enable = mmr.s.enable;
+               base = mmr.s.base;
+               shift = UVH_RH10_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT;
+       } else if (UVH_RH_GAM_MMR_OVERLAY_CONFIG) {
+               union uvh_rh_gam_mmr_overlay_config_u mmr;
+
+               mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG);
+               enable = mmr.s.enable;
+               base = mmr.s.base;
+               shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT;
+       } else {
+               pr_err("UV:%s:RH_GAM_MMR_OVERLAY_CONFIG MMR undefined?\n",
+                       __func__);
+               return;
+       }
 
-       mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG);
-       if (mmr.s.enable)
-               map_high("MMR", mmr.s.base, shift, shift, max_pnode, map_uc);
+       if (enable)
+               map_high("MMR", base, shift, shift, max_pnode, map_uc);
        else
                pr_info("UV: MMR disabled\n");
 }