Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 05:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Mike Travis 2020-10-05 15:39:24 -05:00 committed by Borislav Petkov
parent ffe2febca4
commit 8540b2cf0d
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/x86/kernel/apic/x2apic_uv_x.c
View File

@ -927,12 +927,32 @@ static __init void map_gru_high(int max_pnode)
static __init void map_mmr_high(int max_pnode) static __init void map_mmr_high(int max_pnode)
{ {
union uvh_rh_gam_mmr_overlay_config_u mmr; unsigned long base;
int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT; int shift;
bool enable;
mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG); if (UVH_RH10_GAM_MMR_OVERLAY_CONFIG) {
if (mmr.s.enable) union uvh_rh10_gam_mmr_overlay_config_u mmr;
map_high("MMR", mmr.s.base, shift, shift, max_pnode, map_uc);
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;
}
if (enable)
map_high("MMR", base, shift, shift, max_pnode, map_uc);
else else
pr_info("UV: MMR disabled\n"); pr_info("UV: MMR disabled\n");
} }