Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 updates from Catalin Marinas:
 - eBPF JIT compiler for arm64
 - CPU suspend backend for PSCI (firmware interface) with standard idle
   states defined in DT (generic idle driver to be merged via a
   different tree)
 - Support for CONFIG_DEBUG_SET_MODULE_RONX
 - Support for unmapped cpu-release-addr (outside kernel linear mapping)
 - set_arch_dma_coherent_ops() implemented and bus notifiers removed
 - EFI_STUB improvements when base of DRAM is occupied
 - Typos in KGDB macros
 - Clean-up to (partially) allow kernel building with LLVM
 - Other clean-ups (extern keyword, phys_addr_t usage)

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (51 commits)
  arm64: Remove unneeded extern keyword
  ARM64: make of_device_ids const
  arm64: Use phys_addr_t type for physical address
  aarch64: filter $x from kallsyms
  arm64: Use DMA_ERROR_CODE to denote failed allocation
  arm64: Fix typos in KGDB macros
  arm64: insn: Add return statements after BUG_ON()
  arm64: debug: don't re-enable debug exceptions on return from el1_dbg
  Revert "arm64: dmi: Add SMBIOS/DMI support"
  arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers
  of: amba: use of_dma_configure for AMBA devices
  arm64: dmi: Add SMBIOS/DMI support
  arm64: Correct ftrace calls to aarch64_insn_gen_branch_imm()
  arm64:mm: initialize max_mapnr using function set_max_mapnr
  setup: Move unmask of async interrupts after possible earlycon setup
  arm64: LLVMLinux: Fix inline arm64 assembly for use with clang
  arm64: pageattr: Correctly adjust unaligned start addresses
  net: bpf: arm64: fix module memory leak when JIT image build fails
  arm64: add PSCI CPU_SUSPEND based cpu_suspend support
  arm64: kernel: introduce cpu_init_idle CPU operation
  ...

1 files changed, 6 insertions, 10 deletions

diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c
index 1317fef8dde9..d27dd982ff26 100644
--- a/arch/arm64/kernel/efi-stub.c
+++ b/arch/arm64/kernel/efi-stub.c
@@ -28,20 +28,16 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
         kernel_size = _edata - _text;
         if (*image_addr != (dram_base + TEXT_OFFSET)) {
                 kernel_memsize = kernel_size + (_end - _edata);
-                status = efi_relocate_kernel(sys_table, image_addr,
-                                             kernel_size, kernel_memsize,
-                                             dram_base + TEXT_OFFSET,
-                                             PAGE_SIZE);
+                status = efi_low_alloc(sys_table, kernel_memsize + TEXT_OFFSET,
+                                       SZ_2M, reserve_addr);
                 if (status != EFI_SUCCESS) {
                         pr_efi_err(sys_table, "Failed to relocate kernel\n");
                         return status;
                 }
-                if (*image_addr != (dram_base + TEXT_OFFSET)) {
-                        pr_efi_err(sys_table, "Failed to alloc kernel memory\n");
-                        efi_free(sys_table, kernel_memsize, *image_addr);
-                        return EFI_LOAD_ERROR;
-                }
-                *image_size = kernel_memsize;
+                memcpy((void *)*reserve_addr + TEXT_OFFSET, (void *)*image_addr,
+                       kernel_size);
+                *image_addr = *reserve_addr + TEXT_OFFSET;
+                *reserve_size = kernel_memsize + TEXT_OFFSET;
         }