]> git.baikalelectronics.ru Git - kernel.git/commit
x86, efi: Make efi_call_phys_{prelog,epilog} CONFIG_RELOCATABLE-aware
authorMatt Fleming <matt.fleming@intel.com>
Thu, 8 Dec 2011 12:10:50 +0000 (12:10 +0000)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 10 Dec 2011 00:39:11 +0000 (16:39 -0800)
commit7bbf2ebbb99ebf399896aa183c4bdd5e354c28ef
tree72bdee063f7495039e55f2321a54d20bc4a8a8b2
parent3514f8ad6bbd181ac8d2554320b0eda287b8a6cd
x86, efi: Make efi_call_phys_{prelog,epilog} CONFIG_RELOCATABLE-aware

efi_call_phys_prelog() sets up a 1:1 mapping of the physical address
range in swapper_pg_dir. Instead of replacing then restoring entries
in swapper_pg_dir we should be using initial_page_table which already
contains the 1:1 mapping.

It's safe to blindly switch back to swapper_pg_dir in the epilog
because the physical EFI routines are only called before
efi_enter_virtual_mode(), e.g. before any user processes have been
forked. Therefore, we don't need to track which pgd was in %cr3 when
we entered the prelog.

The previous code actually contained a bug because it assumed that the
kernel was loaded at a physical address within the first 8MB of ram,
usually at 0x100000. However, this isn't the case with a
CONFIG_RELOCATABLE=y kernel which could have been loaded anywhere in
the physical address space.

Also delete the ancient (and bogus) comments about the page table
being restored after the lock is released. There is no locking.

Cc: Matthew Garrett <mjg@redhat.com>
Cc: Darrent Hart <dvhart@linux.intel.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1323346250.3894.74.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/platform/efi/efi_32.c