diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-16 18:37:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-16 18:37:05 -0400 |
| commit | e2f50c5c6cd8dcfda30b8d656fe213f7e285c54a (patch) | |
| tree | f0961c1ed7fb7422b45d4c87cd2b9cefb9253b7f | |
| parent | 2e572599139d27db3aaf540b0d34f0a4f58dfca1 (diff) | |
| parent | f4d5b8adf3668a2fb69a411974057ec3b150b747 (diff) | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fix from Ingo Molnar:
"An arm64 boot crash fix"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Don't apply MEMBLOCK_NOMAP to UEFI memory map mapping
| -rw-r--r-- | drivers/firmware/efi/arm-init.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index aa1f743152a2..8714f8c271ba 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c | |||
| @@ -203,7 +203,19 @@ void __init efi_init(void) | |||
| 203 | 203 | ||
| 204 | reserve_regions(); | 204 | reserve_regions(); |
| 205 | early_memunmap(memmap.map, params.mmap_size); | 205 | early_memunmap(memmap.map, params.mmap_size); |
| 206 | memblock_mark_nomap(params.mmap & PAGE_MASK, | 206 | |
| 207 | PAGE_ALIGN(params.mmap_size + | 207 | if (IS_ENABLED(CONFIG_ARM)) { |
| 208 | (params.mmap & ~PAGE_MASK))); | 208 | /* |
| 209 | * ARM currently does not allow ioremap_cache() to be called on | ||
| 210 | * memory regions that are covered by struct page. So remove the | ||
| 211 | * UEFI memory map from the linear mapping. | ||
| 212 | */ | ||
| 213 | memblock_mark_nomap(params.mmap & PAGE_MASK, | ||
| 214 | PAGE_ALIGN(params.mmap_size + | ||
| 215 | (params.mmap & ~PAGE_MASK))); | ||
| 216 | } else { | ||
| 217 | memblock_reserve(params.mmap & PAGE_MASK, | ||
| 218 | PAGE_ALIGN(params.mmap_size + | ||
| 219 | (params.mmap & ~PAGE_MASK))); | ||
| 220 | } | ||
| 209 | } | 221 | } |