2dc10ad81f
- "genirq: Introduce generic irq migration for cpu hotunplugged" patch
merged from tip/irq/for-arm to allow the arm64-specific part to be
upstreamed via the arm64 tree
- CPU feature detection reworked to cope with heterogeneous systems
where CPUs may not have exactly the same features. The features
reported by the kernel via internal data structures or ELF_HWCAP are
delayed until all the CPUs are up (and before user space starts)
- Support for 16KB pages, with the additional bonus of a 36-bit VA
space, though the latter only depending on EXPERT
- Implement native {relaxed, acquire, release} atomics for arm64
- New ASID allocation algorithm which avoids IPI on roll-over, together
with TLB invalidation optimisations (using local vs global where
feasible)
- KASan support for arm64
- EFI_STUB clean-up and isolation for the kernel proper (required by
KASan)
- copy_{to,from,in}_user optimisations (sharing the memcpy template)
- perf: moving arm64 to the arm32/64 shared PMU framework
- L1_CACHE_BYTES increased to 128 to accommodate Cavium hardware
- Support for the contiguous PTE hint on kernel mapping (16 consecutive
entries may be able to use a single TLB entry)
- Generic CONFIG_HZ now used on arm64
- defconfig updates
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJWOkmIAAoJEGvWsS0AyF7x4GgQAINU3NePjFFvWZNCkqobeH9+
jFKwtXamIudhTSdnXNXyYWmtRL9Krg3qI4zDQf68dvDFAZAze2kVuOi1yPpCbpFZ
/j/afNyQc7+PoyqRAzmT+EMPZlcuOA84Prrl1r3QWZ58QaFeVk/6ZxrHunTHxN0x
mR9PIXfWx73MTo+UnG8FChkmEY6LmV4XpemgTaMR9FqFhdT51OZSxDDAYXOTm4JW
a5HdN9OWjjJ2rhLlFEaC7tszG9B5doHdy2tr5ge/YERVJzIPDogHkMe8ZhfAJc+x
SQU5tKN6Pg4MOi+dLhxlk0/mKCvHLiEQ5KVREJnt8GxupAR54Bat+DQ+rP9cSnpq
dRQTcARIOyy9LGgy+ROAsSo+NiyM5WuJ0/WJUYKmgWTJOfczRYoZv6TMKlwNOUYb
tGLCZHhKPM3yBHJlWbQykl3xmSuudxCMmjlZzg7B+MVfTP6uo0CRSPmYl+v67q+J
bBw/Z2RYXWYGnvlc6OfbMeImI6prXeE36+5ytyJFga0m+IqcTzRGzjcLxKEvdbiU
pr8n9i+hV9iSsT/UwukXZ8ay6zH7PrTLzILWQlieutfXlvha7MYeGxnkbLmdYcfe
GCj374io5cdImHcVKmfhnOMlFOLuOHphl9cmsd/O2LmCIqBj9BIeNH2Om8mHVK2F
YHczMdpESlJApE7kUc1e
=3six
-----END PGP SIGNATURE-----
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 updates from Catalin Marinas:
- "genirq: Introduce generic irq migration for cpu hotunplugged" patch
merged from tip/irq/for-arm to allow the arm64-specific part to be
upstreamed via the arm64 tree
- CPU feature detection reworked to cope with heterogeneous systems
where CPUs may not have exactly the same features. The features
reported by the kernel via internal data structures or ELF_HWCAP are
delayed until all the CPUs are up (and before user space starts)
- Support for 16KB pages, with the additional bonus of a 36-bit VA
space, though the latter only depending on EXPERT
- Implement native {relaxed, acquire, release} atomics for arm64
- New ASID allocation algorithm which avoids IPI on roll-over, together
with TLB invalidation optimisations (using local vs global where
feasible)
- KASan support for arm64
- EFI_STUB clean-up and isolation for the kernel proper (required by
KASan)
- copy_{to,from,in}_user optimisations (sharing the memcpy template)
- perf: moving arm64 to the arm32/64 shared PMU framework
- L1_CACHE_BYTES increased to 128 to accommodate Cavium hardware
- Support for the contiguous PTE hint on kernel mapping (16 consecutive
entries may be able to use a single TLB entry)
- Generic CONFIG_HZ now used on arm64
- defconfig updates
* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (91 commits)
arm64/efi: fix libstub build under CONFIG_MODVERSIONS
ARM64: Enable multi-core scheduler support by default
arm64/efi: move arm64 specific stub C code to libstub
arm64: page-align sections for DEBUG_RODATA
arm64: Fix build with CONFIG_ZONE_DMA=n
arm64: Fix compat register mappings
arm64: Increase the max granular size
arm64: remove bogus TASK_SIZE_64 check
arm64: make Timer Interrupt Frequency selectable
arm64/mm: use PAGE_ALIGNED instead of IS_ALIGNED
arm64: cachetype: fix definitions of ICACHEF_* flags
arm64: cpufeature: declare enable_cpu_capabilities as static
genirq: Make the cpuhotplug migration code less noisy
arm64: Constify hwcap name string arrays
arm64/kvm: Make use of the system wide safe values
arm64/debug: Make use of the system wide safe value
arm64: Move FP/ASIMD hwcap handling to common code
arm64/HWCAP: Use system wide safe values
arm64/capabilities: Make use of system wide safe value
arm64: Delay cpu feature capability checks
...
79 lines
2.6 KiB
C
79 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2013, 2014 Linaro Ltd; <roy.franz@linaro.org>
|
|
*
|
|
* This file implements the EFI boot stub for the arm64 kernel.
|
|
* Adapted from ARM version by Mark Salter <msalter@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
#include <linux/efi.h>
|
|
#include <asm/efi.h>
|
|
#include <asm/sections.h>
|
|
|
|
efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table_arg,
|
|
unsigned long *image_addr,
|
|
unsigned long *image_size,
|
|
unsigned long *reserve_addr,
|
|
unsigned long *reserve_size,
|
|
unsigned long dram_base,
|
|
efi_loaded_image_t *image)
|
|
{
|
|
efi_status_t status;
|
|
unsigned long kernel_size, kernel_memsize = 0;
|
|
unsigned long nr_pages;
|
|
void *old_image_addr = (void *)*image_addr;
|
|
unsigned long preferred_offset;
|
|
|
|
/*
|
|
* The preferred offset of the kernel Image is TEXT_OFFSET bytes beyond
|
|
* a 2 MB aligned base, which itself may be lower than dram_base, as
|
|
* long as the resulting offset equals or exceeds it.
|
|
*/
|
|
preferred_offset = round_down(dram_base, SZ_2M) + TEXT_OFFSET;
|
|
if (preferred_offset < dram_base)
|
|
preferred_offset += SZ_2M;
|
|
|
|
/* Relocate the image, if required. */
|
|
kernel_size = _edata - _text;
|
|
if (*image_addr != preferred_offset) {
|
|
kernel_memsize = kernel_size + (_end - _edata);
|
|
|
|
/*
|
|
* First, try a straight allocation at the preferred offset.
|
|
* This will work around the issue where, if dram_base == 0x0,
|
|
* efi_low_alloc() refuses to allocate at 0x0 (to prevent the
|
|
* address of the allocation to be mistaken for a FAIL return
|
|
* value or a NULL pointer). It will also ensure that, on
|
|
* platforms where the [dram_base, dram_base + TEXT_OFFSET)
|
|
* interval is partially occupied by the firmware (like on APM
|
|
* Mustang), we can still place the kernel at the address
|
|
* 'dram_base + TEXT_OFFSET'.
|
|
*/
|
|
*image_addr = *reserve_addr = preferred_offset;
|
|
nr_pages = round_up(kernel_memsize, EFI_ALLOC_ALIGN) /
|
|
EFI_PAGE_SIZE;
|
|
status = efi_call_early(allocate_pages, EFI_ALLOCATE_ADDRESS,
|
|
EFI_LOADER_DATA, nr_pages,
|
|
(efi_physical_addr_t *)reserve_addr);
|
|
if (status != EFI_SUCCESS) {
|
|
kernel_memsize += TEXT_OFFSET;
|
|
status = efi_low_alloc(sys_table_arg, kernel_memsize,
|
|
SZ_2M, reserve_addr);
|
|
|
|
if (status != EFI_SUCCESS) {
|
|
pr_efi_err(sys_table_arg, "Failed to relocate kernel\n");
|
|
return status;
|
|
}
|
|
*image_addr = *reserve_addr + TEXT_OFFSET;
|
|
}
|
|
memcpy((void *)*image_addr, old_image_addr, kernel_size);
|
|
*reserve_size = kernel_memsize;
|
|
}
|
|
|
|
|
|
return EFI_SUCCESS;
|
|
}
|