* refs/heads/tmp-d6fbbe5 Linux 4.4.93 x86/alternatives: Fix alt_max_short macro to really be a max() USB: serial: console: fix use-after-free after failed setup USB: serial: qcserial: add Dell DW5818, DW5819 USB: serial: option: add support for TP-Link LTE module USB: serial: cp210x: add support for ELV TFD500 USB: serial: ftdi_sio: add id for Cypress WICED dev board fix unbalanced page refcounting in bio_map_user_iov direct-io: Prevent NULL pointer access in submit_page_section usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options ALSA: line6: Fix leftover URB at error-path during probe ALSA: caiaq: Fix stray URB at probe error path ALSA: seq: Fix copy_from_user() call inside lock ALSA: seq: Fix use-after-free at creating a port ALSA: usb-audio: Kill stray URB at exiting iommu/amd: Finish TLB flush in amd_iommu_unmap() usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit crypto: shash - Fix zero-length shash ahash digest crash HID: usbhid: fix out-of-bounds bug dmaengine: edma: Align the memcpy acnt array size with the transfer MIPS: math-emu: Remove pr_err() calls from fpu_emu() USB: dummy-hcd: Fix deadlock caused by disconnect detection rcu: Allow for page faults in NMI handlers iwlwifi: mvm: use IWL_HCMD_NOCOPY for MCAST_FILTER_CMD nl80211: Define policy for packet pattern attributes CIFS: Reconnect expired SMB sessions ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets brcmfmac: add length check in brcmf_cfg80211_escan_handler() ANDROID: HACK: arm64: use -mno-implicit-float instead of -mgeneral-regs-only sched: Update task->on_rq when tasks are moving between runqueues FROMLIST: f2fs: expose some sectors to user in inline data or dentry case crypto: Work around deallocated stack frame reference gcc bug on sparc. UPSTREAM: f2fs: fix potential panic during fstrim ANDROID: fscrypt: remove unnecessary fscrypto.h ANDROID: binder: fix node sched policy calculation ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple CHROMIUM: arm64: Disable asm-operand-width warning for clang CHROMIUM: kbuild: clang: Disable the 'duplicate-decl-specifier' warning UPSTREAM: x86/build: Use cc-option to validate stack alignment parameter UPSTREAM: x86/build: Fix stack alignment for CLang UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub BACKPORT: efi/libstub/arm64: Force 'hidden' visibility for section markers UPSTREAM: compiler, clang: always inline when CONFIG_OPTIMIZE_INLINING is disabled UPSTREAM: x86/boot: #undef memcpy() et al in string.c UPSTREAM: crypto: arm64/sha - avoid non-standard inline asm tricks UPSTREAM: kbuild: clang: Disable 'address-of-packed-member' warning UPSTREAM: x86/build: Specify stack alignment for clang UPSTREAM: x86/build: Use __cc-option for boot code compiler options BACKPORT: kbuild: Add __cc-option macro UPSTREAM: x86/hweight: Don't clobber %rdi BACKPORT: x86/hweight: Get rid of the special calling convention BACKPORT: x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility UPSTREAM: crypto, x86: aesni - fix token pasting for clang UPSTREAM: x86/kbuild: Use cc-option to enable -falign-{jumps/loops} UPSTREAM: compiler, clang: properly override 'inline' for clang UPSTREAM: compiler, clang: suppress warning for unused static inline functions UPSTREAM: Kbuild: provide a __UNIQUE_ID for clang UPSTREAM: modules: mark __inittest/__exittest as __maybe_unused BACKPORT: kbuild: Add support to generate LLVM assembly files UPSTREAM: kbuild: use -Oz instead of -Os when using clang BACKPORT: kbuild, LLVMLinux: Add -Werror to cc-option to support clang UPSTREAM: kbuild: drop -Wno-unknown-warning-option from clang options UPSTREAM: kbuild: fix asm-offset generation to work with clang UPSTREAM: kbuild: consolidate redundant sed script ASM offset generation UPSTREAM: kbuild: Consolidate header generation from ASM offset information UPSTREAM: kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS UPSTREAM: kbuild: Add better clang cross build support Conflicts: arch/x86/lib/Makefile net/wireless/nl80211.c Change-Id: I76032e8d1206903bc948b9ed918e7ddee7e746c7 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
129 lines
4.1 KiB
C
129 lines
4.1 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.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* To prevent the compiler from emitting GOT-indirected (and thus absolute)
|
|
* references to the section markers, override their visibility as 'hidden'
|
|
*/
|
|
#pragma GCC visibility push(hidden)
|
|
#include <asm/sections.h>
|
|
#pragma GCC visibility pop
|
|
|
|
#include <linux/efi.h>
|
|
#include <asm/efi.h>
|
|
|
|
#include "efistub.h"
|
|
|
|
extern bool __nokaslr;
|
|
|
|
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;
|
|
void *old_image_addr = (void *)*image_addr;
|
|
unsigned long preferred_offset;
|
|
u64 phys_seed = 0;
|
|
|
|
if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
|
|
if (!__nokaslr) {
|
|
status = efi_get_random_bytes(sys_table_arg,
|
|
sizeof(phys_seed),
|
|
(u8 *)&phys_seed);
|
|
if (status == EFI_NOT_FOUND) {
|
|
pr_efi(sys_table_arg, "EFI_RNG_PROTOCOL unavailable, no randomness supplied\n");
|
|
} else if (status != EFI_SUCCESS) {
|
|
pr_efi_err(sys_table_arg, "efi_get_random_bytes() failed\n");
|
|
return status;
|
|
}
|
|
} else {
|
|
pr_efi(sys_table_arg, "KASLR disabled on kernel command line\n");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* 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, MIN_KIMG_ALIGN) + TEXT_OFFSET;
|
|
if (preferred_offset < dram_base)
|
|
preferred_offset += MIN_KIMG_ALIGN;
|
|
|
|
kernel_size = _edata - _text;
|
|
kernel_memsize = kernel_size + (_end - _edata);
|
|
|
|
if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && phys_seed != 0) {
|
|
/*
|
|
* If CONFIG_DEBUG_ALIGN_RODATA is not set, produce a
|
|
* displacement in the interval [0, MIN_KIMG_ALIGN) that
|
|
* is a multiple of the minimal segment alignment (SZ_64K)
|
|
*/
|
|
u32 mask = (MIN_KIMG_ALIGN - 1) & ~(SZ_64K - 1);
|
|
u32 offset = !IS_ENABLED(CONFIG_DEBUG_ALIGN_RODATA) ?
|
|
(phys_seed >> 32) & mask : TEXT_OFFSET;
|
|
|
|
/*
|
|
* If KASLR is enabled, and we have some randomness available,
|
|
* locate the kernel at a randomized offset in physical memory.
|
|
*/
|
|
*reserve_size = kernel_memsize + offset;
|
|
status = efi_random_alloc(sys_table_arg, *reserve_size,
|
|
MIN_KIMG_ALIGN, reserve_addr,
|
|
(u32)phys_seed);
|
|
|
|
*image_addr = *reserve_addr + offset;
|
|
} else {
|
|
/*
|
|
* Else, 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'.
|
|
*/
|
|
if (*image_addr == preferred_offset)
|
|
return EFI_SUCCESS;
|
|
|
|
*image_addr = *reserve_addr = preferred_offset;
|
|
*reserve_size = round_up(kernel_memsize, EFI_ALLOC_ALIGN);
|
|
|
|
status = efi_call_early(allocate_pages, EFI_ALLOCATE_ADDRESS,
|
|
EFI_LOADER_DATA,
|
|
*reserve_size / EFI_PAGE_SIZE,
|
|
(efi_physical_addr_t *)reserve_addr);
|
|
}
|
|
|
|
if (status != EFI_SUCCESS) {
|
|
*reserve_size = kernel_memsize + TEXT_OFFSET;
|
|
status = efi_low_alloc(sys_table_arg, *reserve_size,
|
|
MIN_KIMG_ALIGN, reserve_addr);
|
|
|
|
if (status != EFI_SUCCESS) {
|
|
pr_efi_err(sys_table_arg, "Failed to relocate kernel\n");
|
|
*reserve_size = 0;
|
|
return status;
|
|
}
|
|
*image_addr = *reserve_addr + TEXT_OFFSET;
|
|
}
|
|
memcpy((void *)*image_addr, old_image_addr, kernel_size);
|
|
|
|
return EFI_SUCCESS;
|
|
}
|