Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM updates from Russell King:

 - UEFI boot and runtime services support for ARM from Ard Biesheuvel
   and Roy Franz.

 - DT compatibility with old atags booting protocol for Nokia N900
   devices from Ivaylo Dimitrov.

 - PSCI firmware interface using new arm-smc calling convention from
   Jens Wiklander.

 - Runtime patching for udiv/sdiv instructions for ARMv7 CPUs that
   support these instructions from Nicolas Pitre.

 - L2x0 cache updates from Dirk B and Linus Walleij.

 - Randconfig fixes from Arnd Bergmann.

 - ARMv7M (nommu) updates from Ezequiel Garcia

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (34 commits)
  ARM: 8481/2: drivers: psci: replace psci firmware calls
  ARM: 8480/2: arm64: add implementation for arm-smccc
  ARM: 8479/2: add implementation for arm-smccc
  ARM: 8478/2: arm/arm64: add arm-smccc
  ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
  ARM: 8496/1: OMAP: RX51: save ATAGS data in the early boot stage
  ARM: 8495/1: ATAGS: move save_atags() to arch/arm/include/asm/setup.h
  ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode
  ARM: 8482/1: l2x0: make it possible to disable outer sync from DT
  ARM: 8488/1: Make IPI_CPU_BACKTRACE a "non-secure" SGI
  ARM: 8487/1: Remove IPI_CALL_FUNC_SINGLE
  ARM: 8485/1: cpuidle: remove cpu parameter from the cpuidle_ops suspend hook
  ARM: 8484/1: Documentation: l2c2x0: Mention separate controllers explicitly
  ARM: 8483/1: Documentation: l2c: Rename l2cc to l2c2x0
  ARM: 8477/1: runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()
  ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check
  ARM: 8453/2: proc-v7.S: don't locate temporary stack space in .text section
  ARM: add UEFI stub support
  ARM: wire up UEFI init and runtime support
  ARM: only consider memblocks with NOMAP cleared for linear mapping
  ...

6 files changed, 122 insertions, 3 deletions

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index cf478fe6b335..49a3a1185bb6 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -173,6 +173,9 @@ config QCOM_SCM_64
         def_bool y
         depends on QCOM_SCM && ARM64
 
+config HAVE_ARM_SMCCC
+        bool
+
 source "drivers/firmware/broadcom/Kconfig"
 source "drivers/firmware/google/Kconfig"
 source "drivers/firmware/efi/Kconfig"
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index f292917b00e7..62e654f255f4 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -20,4 +20,5 @@ obj-$(CONFIG_EFI_STUB)			+= libstub/
 obj-$(CONFIG_EFI_FAKE_MEMMAP)           += fake_mem.o
 
 arm-obj-$(CONFIG_EFI)                   := arm-init.o arm-runtime.o
+obj-$(CONFIG_ARM)                       += $(arm-obj-y)
 obj-$(CONFIG_ARM64)                     += $(arm-obj-y)
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index c0ddd1b8dca3..9c12e18031d5 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -34,6 +34,7 @@ $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE
 lib-$(CONFIG_EFI_ARMSTUB)       += arm-stub.o fdt.o string.o \
                                    $(patsubst %.c,lib-%.o,$(arm-deps))
 
+lib-$(CONFIG_ARM)               += arm32-stub.o
 lib-$(CONFIG_ARM64)             += arm64-stub.o
 CFLAGS_arm64-stub.o             := -DTEXT_OFFSET=$(TEXT_OFFSET)
 
@@ -67,3 +68,11 @@ quiet_cmd_stubcopy = STUBCPY $@
                      $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y)        \
                      && (echo >&2 "$@: absolute symbol references not allowed in the EFI stub"; \
                          rm -f $@; /bin/false); else /bin/false; fi
+
+#
+# ARM discards the .data section because it disallows r/w data in the
+# decompressor. So move our .data to .data.efistub, which is preserved
+# explicitly by the decompressor linker script.
+#
+STUBCOPY_FLAGS-$(CONFIG_ARM)    += --rename-section .data=.data.efistub
+STUBCOPY_RELOC-$(CONFIG_ARM)    := R_ARM_ABS
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 950c87f5d279..3397902e4040 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -303,8 +303,10 @@ fail:
  * The value chosen is the largest non-zero power of 2 suitable for this purpose
  * both on 32-bit and 64-bit ARM CPUs, to maximize the likelihood that it can
  * be mapped efficiently.
+ * Since 32-bit ARM could potentially execute with a 1G/3G user/kernel split,
+ * map everything below 1 GB.
  */
-#define EFI_RT_VIRTUAL_BASE     0x40000000
+#define EFI_RT_VIRTUAL_BASE     SZ_512M
 
 static int cmp_mem_desc(const void *l, const void *r)
 {
diff --git a/drivers/firmware/efi/libstub/arm32-stub.c b/drivers/firmware/efi/libstub/arm32-stub.c
new file mode 100644
index 000000000000..495ebd657e38
--- /dev/null
+++ b/drivers/firmware/efi/libstub/arm32-stub.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2013 Linaro Ltd;  <roy.franz@linaro.org>
+ *
+ * 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>
+
+efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
+                                 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)
+{
+        unsigned long nr_pages;
+        efi_status_t status;
+        /* Use alloc_addr to tranlsate between types */
+        efi_physical_addr_t alloc_addr;
+
+        /*
+         * Verify that the DRAM base address is compatible with the ARM
+         * boot protocol, which determines the base of DRAM by masking
+         * off the low 27 bits of the address at which the zImage is
+         * loaded. These assumptions are made by the decompressor,
+         * before any memory map is available.
+         */
+        dram_base = round_up(dram_base, SZ_128M);
+
+        /*
+         * Reserve memory for the uncompressed kernel image. This is
+         * all that prevents any future allocations from conflicting
+         * with the kernel. Since we can't tell from the compressed
+         * image how much DRAM the kernel actually uses (due to BSS
+         * size uncertainty) we allocate the maximum possible size.
+         * Do this very early, as prints can cause memory allocations
+         * that may conflict with this.
+         */
+        alloc_addr = dram_base;
+        *reserve_size = MAX_UNCOMP_KERNEL_SIZE;
+        nr_pages = round_up(*reserve_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
+        status = sys_table->boottime->allocate_pages(EFI_ALLOCATE_ADDRESS,
+                                                     EFI_LOADER_DATA,
+                                                     nr_pages, &alloc_addr);
+        if (status != EFI_SUCCESS) {
+                *reserve_size = 0;
+                pr_efi_err(sys_table, "Unable to allocate memory for uncompressed kernel.\n");
+                return status;
+        }
+        *reserve_addr = alloc_addr;
+
+        /*
+         * Relocate the zImage, so that it appears in the lowest 128 MB
+         * memory window.
+         */
+        *image_size = image->image_size;
+        status = efi_relocate_kernel(sys_table, image_addr, *image_size,
+                                     *image_size,
+                                     dram_base + MAX_UNCOMP_KERNEL_SIZE, 0);
+        if (status != EFI_SUCCESS) {
+                pr_efi_err(sys_table, "Failed to relocate kernel.\n");
+                efi_free(sys_table, *reserve_size, *reserve_addr);
+                *reserve_size = 0;
+                return status;
+        }
+
+        /*
+         * Check to see if we were able to allocate memory low enough
+         * in memory. The kernel determines the base of DRAM from the
+         * address at which the zImage is loaded.
+         */
+        if (*image_addr + *image_size > dram_base + ZIMAGE_OFFSET_LIMIT) {
+                pr_efi_err(sys_table, "Failed to relocate kernel, no low memory available.\n");
+                efi_free(sys_table, *reserve_size, *reserve_addr);
+                *reserve_size = 0;
+                efi_free(sys_table, *image_size, *image_addr);
+                *image_size = 0;
+                return EFI_LOAD_ERROR;
+        }
+        return EFI_SUCCESS;
+}
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index d24f35d74b27..f25cd79c8a79 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -13,6 +13,7 @@
 
 #define pr_fmt(fmt) "psci: " fmt
 
+#include <linux/arm-smccc.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/of.h>
@@ -58,8 +59,6 @@ struct psci_operations psci_ops;
 
 typedef unsigned long (psci_fn)(unsigned long, unsigned long,
                                 unsigned long, unsigned long);
-asmlinkage psci_fn __invoke_psci_fn_hvc;
-asmlinkage psci_fn __invoke_psci_fn_smc;
 static psci_fn *invoke_psci_fn;
 
 enum psci_function {
@@ -107,6 +106,26 @@ bool psci_power_state_is_valid(u32 state)
         return !(state & ~valid_mask);
 }
 
+static unsigned long __invoke_psci_fn_hvc(unsigned long function_id,
+                        unsigned long arg0, unsigned long arg1,
+                        unsigned long arg2)
+{
+        struct arm_smccc_res res;
+
+        arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res);
+        return res.a0;
+}
+
+static unsigned long __invoke_psci_fn_smc(unsigned long function_id,
+                        unsigned long arg0, unsigned long arg1,
+                        unsigned long arg2)
+{
+        struct arm_smccc_res res;
+
+        arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res);
+        return res.a0;
+}
+
 static int psci_to_linux_errno(int errno)
 {
         switch (errno) {