Skip to content

Commit 08914f4

Browse files
Alex ThorltonIngo Molnar
authored andcommitted
x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init
A while back the following commit: d394f2d ("x86/platform/UV: Remove EFI memmap quirk for UV2+") changed uv_system_init() to only call map_low_mmrs() on older UV1 hardware, which requires EFI_OLD_MEMMAP to be set in order to boot. The recent changes to the EFI memory mapping code in: d2f7cbe ("x86/efi: Runtime services virtual mapping") exposed some issues with the fact that we were relying on the EFI memory mapping mechanisms to map in our MMRs for us, after commit d394f2d. Rather than revert the entire commit and go back to forcing EFI_OLD_MEMMAP on all UVs, we're going to add the call to map_low_mmrs() back into uv_system_init(), and then fix up our EFI runtime calls to use the appropriate page table. For now, UV2+ will still need efi=old_map to boot, but there will be other changes soon that should eliminate the need for this. Signed-off-by: Alex Thorlton <[email protected]> Cc: Matt Fleming <[email protected]> Cc: Adam Buchbinder <[email protected]> Cc: Len Brown <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Russ Anderson <[email protected]> Cc: Dimitri Sivanich <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 04974df commit 08914f4

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/x86/kernel/apic/x2apic_uv_x.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -891,9 +891,7 @@ void __init uv_system_init(void)
891891
}
892892
pr_info("UV: Found %s hub\n", hub);
893893

894-
/* We now only need to map the MMRs on UV1 */
895-
if (is_uv1_hub())
896-
map_low_mmrs();
894+
map_low_mmrs();
897895

898896
m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );
899897
m_val = m_n_config.s.m_skt;

0 commit comments

Comments
 (0)