diff options
| author |   Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-25 21:06:41 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2016-04-28 11:33:52 +0200 |
| commit | 24d45d1dc275b818093fe1d0055a230ce5e8c4c7 (patch) | |
| tree | 93cfd51aced47fce4285b639b7a1fe3c20e8856c /drivers/firmware | |
| parent | efi: Check EFI_MEMORY_DESCRIPTOR version explicitly (diff) | |
| download | linux-dev-24d45d1dc275b818093fe1d0055a230ce5e8c4c7.tar.xz linux-dev-24d45d1dc275b818093fe1d0055a230ce5e8c4c7.zip | |
efi/arm*: Use memremap() to create the persistent memmap mapping
Instead of using ioremap_cache(), which is slightly inappropriate for
mapping firmware tables, and is not even allowed on ARM for mapping
regions that are covered by a struct page, use memremap(), which was
invented for this purpose, and will also reuse the existing kernel
direct mapping if the requested region is covered by it.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1461614832-17633-10-git-send-email-matt@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efi/arm-runtime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 55a9ea041068..19283deac375 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -105,8 +105,7 @@ static int __init arm_enable_runtime_services(void) mapsize = efi.memmap.map_end - efi.memmap.map; - efi.memmap.map = (__force void *)ioremap_cache(efi.memmap.phys_map, - mapsize); + efi.memmap.map = memremap(efi.memmap.phys_map, mapsize, MEMREMAP_WB); if (!efi.memmap.map) { pr_err("Failed to remap EFI memory map\n"); return -ENOMEM; |