]> git.baikalelectronics.ru Git - kernel.git/commit
x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init
authorAlex Thorlton <athorlton@sgi.com>
Wed, 4 May 2016 22:39:52 +0000 (17:39 -0500)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 May 2016 07:55:02 +0000 (09:55 +0200)
commit7528be28e9fcb19115ec38a52ce99606541457a8
tree67a5be641a5f6b02e8728f6de17a02262cc92131
parent92c210dea15db4dd0ee386a76eaf2970675f69b5
x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init

A while back the following commit:

  48ae1252fdee ("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:

  af339e3342c3 ("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 48ae1252fdee.

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 <athorlton@sgi.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Russ Anderson <rja@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/1462401592-120735-1-git-send-email-athorlton@sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/x2apic_uv_x.c