* [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by 32-bit ARM
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-10 20:53 ` Matt Fleming
2015-10-01 17:04 ` [PATCH 2/9] arm64/efi: refactor " Ard Biesheuvel
` (8 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
This splits off the early EFI init and runtime code that
- discovers the EFI params and the memory map from the FDT, and installs
the memblocks and config tables.
- prepares and installs the EFI page tables so that UEFI Runtime Services
can be invoked at the virtual address installed by the stub.
This will allow it to be reused for 32-bit ARM.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/kernel/efi.c | 363 +-------------------
drivers/firmware/efi/Makefile | 4 +-
drivers/firmware/efi/arm-init.c | 214 ++++++++++++
drivers/firmware/efi/arm-runtime.c | 191 ++++++++++
4 files changed, 409 insertions(+), 363 deletions(-)
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index caca71590984..bd3b2f5adf0c 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -11,348 +11,11 @@
*
*/
-#include <linux/atomic.h>
#include <linux/dmi.h>
#include <linux/efi.h>
-#include <linux/export.h>
-#include <linux/memblock.h>
-#include <linux/mm_types.h>
-#include <linux/bootmem.h>
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/preempt.h>
-#include <linux/rbtree.h>
-#include <linux/rwsem.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/init.h>
-#include <asm/cacheflush.h>
#include <asm/efi.h>
-#include <asm/tlbflush.h>
-#include <asm/mmu_context.h>
-#include <asm/mmu.h>
-#include <asm/pgtable.h>
-
-struct efi_memory_map memmap;
-
-static u64 efi_system_table;
-
-static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss;
-
-static struct mm_struct efi_mm = {
- .mm_rb = RB_ROOT,
- .pgd = efi_pgd,
- .mm_users = ATOMIC_INIT(2),
- .mm_count = ATOMIC_INIT(1),
- .mmap_sem = __RWSEM_INITIALIZER(efi_mm.mmap_sem),
- .page_table_lock = __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),
- .mmlist = LIST_HEAD_INIT(efi_mm.mmlist),
- INIT_MM_CONTEXT(efi_mm)
-};
-
-static int __init is_normal_ram(efi_memory_desc_t *md)
-{
- if (md->attribute & EFI_MEMORY_WB)
- return 1;
- return 0;
-}
-
-/*
- * Translate a EFI virtual address into a physical address: this is necessary,
- * as some data members of the EFI system table are virtually remapped after
- * SetVirtualAddressMap() has been called.
- */
-static phys_addr_t efi_to_phys(unsigned long addr)
-{
- efi_memory_desc_t *md;
-
- for_each_efi_memory_desc(&memmap, md) {
- if (!(md->attribute & EFI_MEMORY_RUNTIME))
- continue;
- if (md->virt_addr == 0)
- /* no virtual mapping has been installed by the stub */
- break;
- if (md->virt_addr <= addr &&
- (addr - md->virt_addr) < (md->num_pages << EFI_PAGE_SHIFT))
- return md->phys_addr + addr - md->virt_addr;
- }
- return addr;
-}
-
-static int __init uefi_init(void)
-{
- efi_char16_t *c16;
- void *config_tables;
- u64 table_size;
- char vendor[100] = "unknown";
- int i, retval;
-
- efi.systab = early_memremap(efi_system_table,
- sizeof(efi_system_table_t));
- if (efi.systab == NULL) {
- pr_warn("Unable to map EFI system table.\n");
- return -ENOMEM;
- }
-
- set_bit(EFI_BOOT, &efi.flags);
- set_bit(EFI_64BIT, &efi.flags);
-
- /*
- * Verify the EFI Table
- */
- if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) {
- pr_err("System table signature incorrect\n");
- retval = -EINVAL;
- goto out;
- }
- if ((efi.systab->hdr.revision >> 16) < 2)
- pr_warn("Warning: EFI system table version %d.%02d, expected 2.00 or greater\n",
- efi.systab->hdr.revision >> 16,
- efi.systab->hdr.revision & 0xffff);
-
- /* Show what we know for posterity */
- c16 = early_memremap(efi_to_phys(efi.systab->fw_vendor),
- sizeof(vendor) * sizeof(efi_char16_t));
- if (c16) {
- for (i = 0; i < (int) sizeof(vendor) - 1 && *c16; ++i)
- vendor[i] = c16[i];
- vendor[i] = '\0';
- early_memunmap(c16, sizeof(vendor) * sizeof(efi_char16_t));
- }
-
- pr_info("EFI v%u.%.02u by %s\n",
- efi.systab->hdr.revision >> 16,
- efi.systab->hdr.revision & 0xffff, vendor);
-
- table_size = sizeof(efi_config_table_64_t) * efi.systab->nr_tables;
- config_tables = early_memremap(efi_to_phys(efi.systab->tables),
- table_size);
-
- retval = efi_config_parse_tables(config_tables, efi.systab->nr_tables,
- sizeof(efi_config_table_64_t), NULL);
-
- early_memunmap(config_tables, table_size);
-out:
- early_memunmap(efi.systab, sizeof(efi_system_table_t));
- return retval;
-}
-
-/*
- * Return true for RAM regions we want to permanently reserve.
- */
-static __init int is_reserve_region(efi_memory_desc_t *md)
-{
- switch (md->type) {
- case EFI_LOADER_CODE:
- case EFI_LOADER_DATA:
- case EFI_BOOT_SERVICES_CODE:
- case EFI_BOOT_SERVICES_DATA:
- case EFI_CONVENTIONAL_MEMORY:
- case EFI_PERSISTENT_MEMORY:
- return 0;
- default:
- break;
- }
- return is_normal_ram(md);
-}
-
-static __init void reserve_regions(void)
-{
- efi_memory_desc_t *md;
- u64 paddr, npages, size;
-
- if (efi_enabled(EFI_DBG))
- pr_info("Processing EFI memory map:\n");
-
- for_each_efi_memory_desc(&memmap, md) {
- paddr = md->phys_addr;
- npages = md->num_pages;
-
- if (efi_enabled(EFI_DBG)) {
- char buf[64];
-
- pr_info(" 0x%012llx-0x%012llx %s",
- paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
- efi_md_typeattr_format(buf, sizeof(buf), md));
- }
-
- memrange_efi_to_native(&paddr, &npages);
- size = npages << PAGE_SHIFT;
-
- if (is_normal_ram(md))
- early_init_dt_add_memory(paddr, size);
-
- if (is_reserve_region(md)) {
- memblock_mark_nomap(paddr, size);
- if (efi_enabled(EFI_DBG))
- pr_cont("*");
- }
-
- if (efi_enabled(EFI_DBG))
- pr_cont("\n");
- }
-}
-
-void __init efi_parse_fdt(void *fdt)
-{
- struct efi_fdt_params params;
-
- /* Grab UEFI information placed in FDT by stub */
- if (!efi_get_fdt_params(fdt, ¶ms))
- return;
-
- efi_system_table = params.system_table;
-
- memmap.phys_map = (void *)params.mmap;
- memmap.desc_size = params.desc_size;
- memmap.desc_version = params.desc_ver;
- memmap.nr_map = params.mmap_size / params.desc_size;
-
- set_bit(EFI_MEMMAP, &efi.flags);
-}
-
-void __init efi_init(void)
-{
- int mmap_size = memmap.nr_map * memmap.desc_size;
-
- if (!efi_enabled(EFI_MEMMAP))
- return;
-
- memmap.map = early_memremap((u64)memmap.phys_map, mmap_size);
- memmap.map_end = memmap.map + mmap_size;
-
- if (uefi_init() < 0)
- return;
-
- reserve_regions();
- early_memunmap(memmap.map, mmap_size);
- memblock_mark_nomap((unsigned long)memmap.phys_map & PAGE_MASK,
- PAGE_ALIGN(mmap_size));
-}
-
-static bool __init efi_virtmap_init(void)
-{
- efi_memory_desc_t *md;
-
- for_each_efi_memory_desc(&memmap, md) {
- u64 paddr, npages, size;
- pteval_t prot_val;
-
- if (!(md->attribute & EFI_MEMORY_RUNTIME))
- continue;
- if (md->virt_addr == 0)
- return false;
-
- paddr = md->phys_addr;
- npages = md->num_pages;
- memrange_efi_to_native(&paddr, &npages);
- size = npages << PAGE_SHIFT;
-
- /*
- * Order is important here: memory regions may have all of the
- * bits below set (and usually do), and any memory that has the
- * EFI_MEMORY_WB bit set may be covered by the linear mapping
- * and mapped write-back cacheable already. So check the
- * EFI_MEMORY_WB bit first.
- */
- if (md->attribute & EFI_MEMORY_WB) {
- prot_val = pgprot_val(PAGE_KERNEL_EXEC);
- } else if (md->attribute & EFI_MEMORY_WT) {
- prot_val = PROT_NORMAL_WT;
- } else if (md->attribute & EFI_MEMORY_WC) {
- prot_val = PROT_NORMAL_NC;
- } else if (md->attribute & EFI_MEMORY_UC) {
- prot_val = PROT_DEVICE_nGnRnE;
- } else {
- pr_warn(" EFI remap 0x%012llx: not remapping due to unsupported memory attributes (0x%llx)\n",
- md->phys_addr, md->attribute);
- continue;
- }
-
- /*
- * Since the UEFI spec requires only the type attributes to be
- * identical within the same 64 KB page frame, we may encounter
- * regions that are not 64 KB aligned, but whose attributes only
- * differ from adjacent regions in the permission bits.
- * This means we can only enforce any permission restrictions if
- * the boundaries of this region are aligned to the OS page
- * size.
- */
- if (PAGE_SIZE == EFI_PAGE_SIZE ||
- (PAGE_ALIGNED(md->virt_addr) &&
- PAGE_ALIGNED(md->virt_addr + md->num_pages * EFI_PAGE_SIZE))) {
-
- if (md->attribute & EFI_MEMORY_RO)
- prot_val |= PTE_RDONLY;
- if (md->attribute & EFI_MEMORY_XP)
- prot_val |= PTE_PXN;
- }
-
- pr_info(" EFI remap 0x%012llx => %p (R%c%c)\n",
- md->phys_addr, (void *)md->virt_addr,
- prot_val & PTE_RDONLY ? '-' : 'W',
- prot_val & PTE_PXN ? '-' : 'X');
-
- create_pgd_mapping(&efi_mm, paddr, md->virt_addr, size,
- __pgprot(prot_val));
- }
- return true;
-}
-
-/*
- * Enable the UEFI Runtime Services if all prerequisites are in place, i.e.,
- * non-early mapping of the UEFI system table and virtual mappings for all
- * EFI_MEMORY_RUNTIME regions.
- */
-static int __init arm64_enable_runtime_services(void)
-{
- u64 mapsize;
-
- if (!efi_enabled(EFI_BOOT)) {
- pr_info("EFI services will not be available.\n");
- return -1;
- }
-
- if (efi_runtime_disabled()) {
- pr_info("EFI runtime services will be disabled.\n");
- return -1;
- }
-
- pr_info("Remapping and enabling EFI services.\n");
-
- mapsize = memmap.map_end - memmap.map;
- memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
- mapsize);
- if (!memmap.map) {
- pr_err("Failed to remap EFI memory map\n");
- return -1;
- }
- memmap.map_end = memmap.map + mapsize;
- efi.memmap = &memmap;
-
- efi.systab = (__force void *)ioremap_cache(efi_system_table,
- sizeof(efi_system_table_t));
- if (!efi.systab) {
- pr_err("Failed to remap EFI System Table\n");
- return -1;
- }
- set_bit(EFI_SYSTEM_TABLES, &efi.flags);
-
- if (!efi_virtmap_init()) {
- pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
- return -1;
- }
-
- /* Set up runtime services function pointers */
- efi_native_runtime_setup();
- set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
-
- efi.runtime_version = efi.systab->hdr.revision;
-
- return 0;
-}
-early_initcall(arm64_enable_runtime_services);
static int __init arm64_dmi_init(void)
{
@@ -368,30 +31,6 @@ static int __init arm64_dmi_init(void)
}
core_initcall(arm64_dmi_init);
-static void efi_set_pgd(struct mm_struct *mm)
-{
- if (mm == &init_mm)
- cpu_set_reserved_ttbr0();
- else
- cpu_switch_mm(mm->pgd, mm);
-
- flush_tlb_all();
- if (icache_is_aivivt())
- __flush_icache_all();
-}
-
-void efi_virtmap_load(void)
-{
- preempt_disable();
- efi_set_pgd(&efi_mm);
-}
-
-void efi_virtmap_unload(void)
-{
- efi_set_pgd(current->active_mm);
- preempt_enable();
-}
-
/*
* UpdateCapsule() depends on the system being shutdown via
* ResetSystem().
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index d9140208fc1c..62b272375422 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -1,7 +1,9 @@
#
# Makefile for linux kernel
#
-obj-$(CONFIG_EFI) += efi.o vars.o reboot.o
+arm-obj-$(CONFIG_ARM64)$(CONFIG_ARM) := arm-init.o arm-runtime.o
+
+obj-$(CONFIG_EFI) += efi.o vars.o reboot.o $(arm-obj-y)
obj-$(CONFIG_EFI_VARS) += efivars.o
obj-$(CONFIG_EFI_ESRT) += esrt.o
obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
new file mode 100644
index 000000000000..56987a5b9033
--- /dev/null
+++ b/drivers/firmware/efi/arm-init.c
@@ -0,0 +1,214 @@
+/*
+ * Extensible Firmware Interface
+ *
+ * Based on Extensible Firmware Interface Specification version 2.4
+ *
+ * Copyright (C) 2013 - 2015 Linaro Ltd.
+ *
+ * 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 <linux/init.h>
+#include <linux/memblock.h>
+#include <linux/mm_types.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+
+#include <asm/efi.h>
+
+struct efi_memory_map memmap;
+
+u64 efi_system_table;
+
+static int uefi_debug __initdata;
+static int __init uefi_debug_setup(char *str)
+{
+ uefi_debug = 1;
+
+ return 0;
+}
+early_param("uefi_debug", uefi_debug_setup);
+
+static int __init is_normal_ram(efi_memory_desc_t *md)
+{
+ if (md->attribute & EFI_MEMORY_WB)
+ return 1;
+ return 0;
+}
+
+/*
+ * Translate a EFI virtual address into a physical address: this is necessary,
+ * as some data members of the EFI system table are virtually remapped after
+ * SetVirtualAddressMap() has been called.
+ */
+static phys_addr_t efi_to_phys(unsigned long addr)
+{
+ efi_memory_desc_t *md;
+
+ for_each_efi_memory_desc(&memmap, md) {
+ if (!(md->attribute & EFI_MEMORY_RUNTIME))
+ continue;
+ if (md->virt_addr == 0)
+ /* no virtual mapping has been installed by the stub */
+ break;
+ if (md->virt_addr <= addr &&
+ (addr - md->virt_addr) < (md->num_pages << EFI_PAGE_SHIFT))
+ return md->phys_addr + addr - md->virt_addr;
+ }
+ return addr;
+}
+
+static int __init uefi_init(void)
+{
+ efi_char16_t *c16;
+ void *config_tables;
+ u64 table_size;
+ char vendor[100] = "unknown";
+ int i, retval;
+
+ efi.systab = early_memremap(efi_system_table,
+ sizeof(efi_system_table_t));
+ if (efi.systab == NULL) {
+ pr_warn("Unable to map EFI system table.\n");
+ return -ENOMEM;
+ }
+
+ set_bit(EFI_BOOT, &efi.flags);
+ set_bit(EFI_64BIT, &efi.flags);
+
+ /*
+ * Verify the EFI Table
+ */
+ if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) {
+ pr_err("System table signature incorrect\n");
+ retval = -EINVAL;
+ goto out;
+ }
+ if ((efi.systab->hdr.revision >> 16) < 2)
+ pr_warn("Warning: EFI system table version %d.%02d, expected 2.00 or greater\n",
+ efi.systab->hdr.revision >> 16,
+ efi.systab->hdr.revision & 0xffff);
+
+ /* Show what we know for posterity */
+ c16 = early_memremap(efi_to_phys(efi.systab->fw_vendor),
+ sizeof(vendor) * sizeof(efi_char16_t));
+ if (c16) {
+ for (i = 0; i < (int) sizeof(vendor) - 1 && *c16; ++i)
+ vendor[i] = c16[i];
+ vendor[i] = '\0';
+ early_memunmap(c16, sizeof(vendor) * sizeof(efi_char16_t));
+ }
+
+ pr_info("EFI v%u.%.02u by %s\n",
+ efi.systab->hdr.revision >> 16,
+ efi.systab->hdr.revision & 0xffff, vendor);
+
+ table_size = sizeof(efi_config_table_64_t) * efi.systab->nr_tables;
+ config_tables = early_memremap(efi_to_phys(efi.systab->tables),
+ table_size);
+
+ retval = efi_config_parse_tables(config_tables, efi.systab->nr_tables,
+ sizeof(efi_config_table_64_t), NULL);
+
+ early_memunmap(config_tables, table_size);
+out:
+ early_memunmap(efi.systab, sizeof(efi_system_table_t));
+ return retval;
+}
+
+/*
+ * Return true for RAM regions we want to permanently reserve.
+ */
+static __init int is_reserve_region(efi_memory_desc_t *md)
+{
+ switch (md->type) {
+ case EFI_LOADER_CODE:
+ case EFI_LOADER_DATA:
+ case EFI_BOOT_SERVICES_CODE:
+ case EFI_BOOT_SERVICES_DATA:
+ case EFI_CONVENTIONAL_MEMORY:
+ case EFI_PERSISTENT_MEMORY:
+ return 0;
+ default:
+ break;
+ }
+ return is_normal_ram(md);
+}
+
+static __init void reserve_regions(void)
+{
+ efi_memory_desc_t *md;
+ u64 paddr, npages, size;
+
+ if (efi_enabled(EFI_DBG))
+ pr_info("Processing EFI memory map:\n");
+
+ for_each_efi_memory_desc(&memmap, md) {
+ paddr = md->phys_addr;
+ npages = md->num_pages;
+
+ if (efi_enabled(EFI_DBG)) {
+ char buf[64];
+
+ pr_info(" 0x%012llx-0x%012llx %s",
+ paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
+ efi_md_typeattr_format(buf, sizeof(buf), md));
+ }
+
+ memrange_efi_to_native(&paddr, &npages);
+ size = npages << PAGE_SHIFT;
+
+ if (is_normal_ram(md))
+ early_init_dt_add_memory(paddr, size);
+
+ if (is_reserve_region(md)) {
+ memblock_mark_nomap(paddr, size);
+ if (efi_enabled(EFI_DBG))
+ pr_cont("*");
+ }
+
+ if (efi_enabled(EFI_DBG))
+ pr_cont("\n");
+ }
+}
+
+void __init efi_parse_fdt(void *fdt)
+{
+ struct efi_fdt_params params;
+
+ /* Grab UEFI information placed in FDT by stub */
+ if (!efi_get_fdt_params(fdt, ¶ms))
+ return;
+
+ efi_system_table = params.system_table;
+
+ memmap.phys_map = (void *)params.mmap;
+ memmap.desc_size = params.desc_size;
+ memmap.desc_version = params.desc_ver;
+ memmap.nr_map = params.mmap_size / params.desc_size;
+
+ set_bit(EFI_MEMMAP, &efi.flags);
+}
+
+void __init efi_init(void)
+{
+ int mmap_size = memmap.nr_map * memmap.desc_size;
+
+ if (!efi_enabled(EFI_MEMMAP))
+ return;
+
+ memmap.map = early_memremap((u64)memmap.phys_map, mmap_size);
+ memmap.map_end = memmap.map + mmap_size;
+
+ if (uefi_init() < 0)
+ return;
+
+ reserve_regions();
+ early_memunmap(memmap.map, mmap_size);
+ memblock_mark_nomap((unsigned long)memmap.phys_map & PAGE_MASK,
+ PAGE_ALIGN(mmap_size));
+}
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
new file mode 100644
index 000000000000..5a94ea48670d
--- /dev/null
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -0,0 +1,191 @@
+/*
+ * Extensible Firmware Interface
+ *
+ * Based on Extensible Firmware Interface Specification version 2.4
+ *
+ * Copyright (C) 2013, 2014 Linaro Ltd.
+ *
+ * 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 <linux/memblock.h>
+#include <linux/mm_types.h>
+#include <linux/preempt.h>
+#include <linux/rbtree.h>
+#include <linux/rwsem.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+#include <asm/cacheflush.h>
+#include <asm/efi.h>
+#include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
+#include <asm/mmu.h>
+#include <asm/pgtable.h>
+
+static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss;
+
+extern u64 efi_system_table;
+
+static struct mm_struct efi_mm = {
+ .mm_rb = RB_ROOT,
+ .pgd = efi_pgd,
+ .mm_users = ATOMIC_INIT(2),
+ .mm_count = ATOMIC_INIT(1),
+ .mmap_sem = __RWSEM_INITIALIZER(efi_mm.mmap_sem),
+ .page_table_lock = __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),
+ .mmlist = LIST_HEAD_INIT(efi_mm.mmlist),
+ INIT_MM_CONTEXT(efi_mm)
+};
+
+static bool __init efi_virtmap_init(void)
+{
+ efi_memory_desc_t *md;
+
+ for_each_efi_memory_desc(&memmap, md) {
+ u64 paddr, npages, size;
+ pteval_t prot_val;
+
+ if (!(md->attribute & EFI_MEMORY_RUNTIME))
+ continue;
+ if (md->virt_addr == 0)
+ return false;
+
+ paddr = md->phys_addr;
+ npages = md->num_pages;
+ memrange_efi_to_native(&paddr, &npages);
+ size = npages << PAGE_SHIFT;
+
+ /*
+ * Order is important here: memory regions may have all of the
+ * bits below set (and usually do), and any memory that has the
+ * EFI_MEMORY_WB bit set may be covered by the linear mapping
+ * and mapped write-back cacheable already. So check the
+ * EFI_MEMORY_WB bit first.
+ */
+ if (md->attribute & EFI_MEMORY_WB) {
+ prot_val = pgprot_val(PAGE_KERNEL_EXEC);
+ } else if (md->attribute & EFI_MEMORY_WT) {
+ prot_val = PROT_NORMAL_WT;
+ } else if (md->attribute & EFI_MEMORY_WC) {
+ prot_val = PROT_NORMAL_NC;
+ } else if (md->attribute & EFI_MEMORY_UC) {
+ prot_val = PROT_DEVICE_nGnRnE;
+ } else {
+ pr_warn(" EFI remap 0x%012llx: not remapping due to unsupported memory attributes (0x%llx)\n",
+ md->phys_addr, md->attribute);
+ continue;
+ }
+
+ /*
+ * Since the UEFI spec requires only the type attributes to be
+ * identical within the same 64 KB page frame, we may encounter
+ * regions that are not 64 KB aligned, but whose attributes only
+ * differ from adjacent regions in the permission bits.
+ * This means we can only enforce any permission restrictions if
+ * the boundaries of this region are aligned to the OS page
+ * size.
+ */
+ if (PAGE_SIZE == EFI_PAGE_SIZE ||
+ (PAGE_ALIGNED(md->virt_addr) &&
+ PAGE_ALIGNED(md->virt_addr + md->num_pages * EFI_PAGE_SIZE))) {
+
+ if (md->attribute & EFI_MEMORY_RO)
+ prot_val |= PTE_RDONLY;
+ if (md->attribute & EFI_MEMORY_XP)
+ prot_val |= PTE_PXN;
+ }
+
+ pr_info(" EFI remap 0x%012llx => %p (R%c%c)\n",
+ md->phys_addr, (void *)md->virt_addr,
+ prot_val & PTE_RDONLY ? '-' : 'W',
+ prot_val & PTE_PXN ? '-' : 'X');
+
+ create_pgd_mapping(&efi_mm, paddr, md->virt_addr, size,
+ __pgprot(prot_val));
+ }
+ return true;
+}
+
+/*
+ * Enable the UEFI Runtime Services if all prerequisites are in place, i.e.,
+ * non-early mapping of the UEFI system table and virtual mappings for all
+ * EFI_MEMORY_RUNTIME regions.
+ */
+static int __init arm64_enable_runtime_services(void)
+{
+ u64 mapsize;
+
+ if (!efi_enabled(EFI_BOOT)) {
+ pr_info("EFI services will not be available.\n");
+ return -1;
+ }
+
+ if (efi_runtime_disabled()) {
+ pr_info("EFI runtime services will be disabled.\n");
+ return -1;
+ }
+
+ pr_info("Remapping and enabling EFI services.\n");
+
+ mapsize = memmap.map_end - memmap.map;
+ memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
+ mapsize);
+ if (!memmap.map) {
+ pr_err("Failed to remap EFI memory map\n");
+ return -1;
+ }
+ memmap.map_end = memmap.map + mapsize;
+ efi.memmap = &memmap;
+
+ efi.systab = (__force void *)ioremap_cache(efi_system_table,
+ sizeof(efi_system_table_t));
+ if (!efi.systab) {
+ pr_err("Failed to remap EFI System Table\n");
+ return -1;
+ }
+ set_bit(EFI_SYSTEM_TABLES, &efi.flags);
+
+ if (!efi_virtmap_init()) {
+ pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
+ return -1;
+ }
+
+ /* Set up runtime services function pointers */
+ efi_native_runtime_setup();
+ set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
+
+ efi.runtime_version = efi.systab->hdr.revision;
+
+ return 0;
+}
+early_initcall(arm64_enable_runtime_services);
+
+static void efi_set_pgd(struct mm_struct *mm)
+{
+ if (mm == &init_mm)
+ cpu_set_reserved_ttbr0();
+ else
+ cpu_switch_mm(mm->pgd, mm);
+
+ flush_tlb_all();
+ if (icache_is_aivivt())
+ __flush_icache_all();
+}
+
+void efi_virtmap_load(void)
+{
+ preempt_disable();
+ efi_set_pgd(&efi_mm);
+}
+
+void efi_virtmap_unload(void)
+{
+ efi_set_pgd(current->active_mm);
+ preempt_enable();
+}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by 32-bit ARM
2015-10-01 17:04 ` [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by " Ard Biesheuvel
@ 2015-10-10 20:53 ` Matt Fleming
2015-10-12 7:57 ` Ard Biesheuvel
0 siblings, 1 reply; 20+ messages in thread
From: Matt Fleming @ 2015-10-10 20:53 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 01 Oct, at 07:04:15PM, Ard Biesheuvel wrote:
> This splits off the early EFI init and runtime code that
> - discovers the EFI params and the memory map from the FDT, and installs
> the memblocks and config tables.
> - prepares and installs the EFI page tables so that UEFI Runtime Services
> can be invoked at the virtual address installed by the stub.
>
> This will allow it to be reused for 32-bit ARM.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> arch/arm64/kernel/efi.c | 363 +-------------------
> drivers/firmware/efi/Makefile | 4 +-
> drivers/firmware/efi/arm-init.c | 214 ++++++++++++
> drivers/firmware/efi/arm-runtime.c | 191 ++++++++++
> 4 files changed, 409 insertions(+), 363 deletions(-)
[...]
> +static int uefi_debug __initdata;
> +static int __init uefi_debug_setup(char *str)
> +{
> + uefi_debug = 1;
> +
> + return 0;
> +}
> +early_param("uefi_debug", uefi_debug_setup);
Was this hunk an unintentional reintroduction of the code Leif deleted
in commit a9cc0cf5701b ("arm64: Use core efi=debug instead of
uefi_debug command line parameter")?
--
Matt Fleming, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by 32-bit ARM
2015-10-10 20:53 ` Matt Fleming
@ 2015-10-12 7:57 ` Ard Biesheuvel
0 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-12 7:57 UTC (permalink / raw)
To: linux-arm-kernel
On 10 October 2015 at 22:53, Matt Fleming <matt@codeblueprint.co.uk> wrote:
> On Thu, 01 Oct, at 07:04:15PM, Ard Biesheuvel wrote:
>> This splits off the early EFI init and runtime code that
>> - discovers the EFI params and the memory map from the FDT, and installs
>> the memblocks and config tables.
>> - prepares and installs the EFI page tables so that UEFI Runtime Services
>> can be invoked at the virtual address installed by the stub.
>>
>> This will allow it to be reused for 32-bit ARM.
>>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>> arch/arm64/kernel/efi.c | 363 +-------------------
>> drivers/firmware/efi/Makefile | 4 +-
>> drivers/firmware/efi/arm-init.c | 214 ++++++++++++
>> drivers/firmware/efi/arm-runtime.c | 191 ++++++++++
>> 4 files changed, 409 insertions(+), 363 deletions(-)
>
> [...]
>
>> +static int uefi_debug __initdata;
>> +static int __init uefi_debug_setup(char *str)
>> +{
>> + uefi_debug = 1;
>> +
>> + return 0;
>> +}
>> +early_param("uefi_debug", uefi_debug_setup);
>
> Was this hunk an unintentional reintroduction of the code Leif deleted
> in commit a9cc0cf5701b ("arm64: Use core efi=debug instead of
> uefi_debug command line parameter")?
>
Indeed. I will get rid of it on v2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/9] arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by " Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-10 21:00 ` Matt Fleming
2015-10-01 17:04 ` [PATCH 3/9] ARM: add support for generic early_ioremap/early_memremap Ard Biesheuvel
` (7 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
This refactors the EFI init and runtime code that will be shared
between arm64 and ARM so that it can be built for both archs.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/include/asm/efi.h | 16 ++++
arch/arm64/kernel/efi.c | 51 ++++++++++
drivers/firmware/efi/arm-init.c | 11 ++-
drivers/firmware/efi/arm-runtime.c | 101 ++++++--------------
drivers/firmware/efi/efi.c | 4 +-
5 files changed, 105 insertions(+), 78 deletions(-)
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index 7cc8df68c638..a16490d6ec1a 100644
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@ -2,7 +2,9 @@
#define _ASM_EFI_H
#include <asm/io.h>
+#include <asm/mmu_context.h>
#include <asm/neon.h>
+#include <asm/tlbflush.h>
#ifdef CONFIG_EFI
extern void efi_init(void);
@@ -12,6 +14,8 @@ extern void efi_parse_fdt(void *fdt);
#define efi_parse_fdt(x)
#endif
+int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);
+
#define efi_call_virt(f, ...) \
({ \
efi_##f##_t *__f; \
@@ -65,6 +69,18 @@ extern void efi_parse_fdt(void *fdt);
* Services are enabled and the EFI_RUNTIME_SERVICES bit set.
*/
+static inline void efi_set_pgd(struct mm_struct *mm)
+{
+ if (mm == &init_mm)
+ cpu_set_reserved_ttbr0();
+ else
+ cpu_switch_mm(mm->pgd, mm);
+
+ flush_tlb_all();
+ if (icache_is_aivivt())
+ __flush_icache_all();
+}
+
void efi_virtmap_load(void);
void efi_virtmap_unload(void);
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index bd3b2f5adf0c..77df172f0e6d 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -17,6 +17,57 @@
#include <asm/efi.h>
+int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)
+{
+ u64 paddr, npages, size;
+ pteval_t prot_val;
+
+ paddr = md->phys_addr;
+ npages = md->num_pages;
+ memrange_efi_to_native(&paddr, &npages);
+ size = npages << PAGE_SHIFT;
+
+ /*
+ * Order is important here: memory regions may have all of the
+ * bits below set (and usually do), and any memory that has the
+ * EFI_MEMORY_WB bit set may be covered by the linear mapping
+ * and mapped write-back cacheable already. So check the
+ * EFI_MEMORY_WB bit first.
+ */
+ if (md->attribute & EFI_MEMORY_WB)
+ prot_val = pgprot_val(PAGE_KERNEL_EXEC);
+ else if (md->attribute & EFI_MEMORY_WT)
+ prot_val = PROT_NORMAL_WT;
+ else if (md->attribute & EFI_MEMORY_WC)
+ prot_val = PROT_NORMAL_NC;
+ else if (md->attribute & EFI_MEMORY_UC)
+ prot_val = PROT_DEVICE_nGnRnE;
+ else
+ return -EINVAL;
+
+ /*
+ * Since the UEFI spec requires only the type attributes to be
+ * identical within the same 64 KB page frame, we may encounter
+ * regions that are not 64 KB aligned, but whose attributes only
+ * differ from adjacent regions in the permission bits.
+ * This means we can only enforce any permission restrictions if
+ * the boundaries of this region are aligned to the OS page
+ * size.
+ */
+ if (PAGE_SIZE == EFI_PAGE_SIZE ||
+ (PAGE_ALIGNED(md->virt_addr) &&
+ PAGE_ALIGNED(md->virt_addr + md->num_pages * EFI_PAGE_SIZE))) {
+
+ if (md->attribute & EFI_MEMORY_RO)
+ prot_val |= PTE_RDONLY;
+ if (md->attribute & EFI_MEMORY_XP)
+ prot_val |= PTE_PXN;
+ }
+
+ create_pgd_mapping(mm, paddr, md->virt_addr, size, __pgprot(prot_val));
+ return 0;
+}
+
static int __init arm64_dmi_init(void)
{
/*
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index 56987a5b9033..235677b86e4e 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -66,7 +66,7 @@ static int __init uefi_init(void)
{
efi_char16_t *c16;
void *config_tables;
- u64 table_size;
+ int table_size;
char vendor[100] = "unknown";
int i, retval;
@@ -78,7 +78,8 @@ static int __init uefi_init(void)
}
set_bit(EFI_BOOT, &efi.flags);
- set_bit(EFI_64BIT, &efi.flags);
+ if (IS_ENABLED(CONFIG_64BIT))
+ set_bit(EFI_64BIT, &efi.flags);
/*
* Verify the EFI Table
@@ -112,7 +113,7 @@ static int __init uefi_init(void)
table_size);
retval = efi_config_parse_tables(config_tables, efi.systab->nr_tables,
- sizeof(efi_config_table_64_t), NULL);
+ sizeof(efi_config_table_t), NULL);
early_memunmap(config_tables, table_size);
out:
@@ -186,7 +187,7 @@ void __init efi_parse_fdt(void *fdt)
efi_system_table = params.system_table;
- memmap.phys_map = (void *)params.mmap;
+ memmap.phys_map = (void *)(unsigned long)params.mmap;
memmap.desc_size = params.desc_size;
memmap.desc_version = params.desc_ver;
memmap.nr_map = params.mmap_size / params.desc_size;
@@ -201,7 +202,7 @@ void __init efi_init(void)
if (!efi_enabled(EFI_MEMMAP))
return;
- memmap.map = early_memremap((u64)memmap.phys_map, mmap_size);
+ memmap.map = early_memremap((unsigned long)memmap.phys_map, mmap_size);
memmap.map_end = memmap.map + mmap_size;
if (uefi_init() < 0)
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 5a94ea48670d..7f23f3cffb46 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -23,18 +23,19 @@
#include <asm/cacheflush.h>
#include <asm/efi.h>
-#include <asm/tlbflush.h>
-#include <asm/mmu_context.h>
+#include <asm/io.h>
#include <asm/mmu.h>
+#include <asm/pgalloc.h>
#include <asm/pgtable.h>
-static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss;
+#ifndef INIT_MM_CONTEXT
+#define INIT_MM_CONTEXT(name)
+#endif
extern u64 efi_system_table;
static struct mm_struct efi_mm = {
.mm_rb = RB_ROOT,
- .pgd = efi_pgd,
.mm_users = ATOMIC_INIT(2),
.mm_count = ATOMIC_INIT(1),
.mmap_sem = __RWSEM_INITIALIZER(efi_mm.mmap_sem),
@@ -47,67 +48,34 @@ static bool __init efi_virtmap_init(void)
{
efi_memory_desc_t *md;
+ efi_mm.pgd = pgd_alloc(&efi_mm);
+
for_each_efi_memory_desc(&memmap, md) {
- u64 paddr, npages, size;
- pteval_t prot_val;
+ phys_addr_t phys = (phys_addr_t)md->phys_addr;
+ int ret;
if (!(md->attribute & EFI_MEMORY_RUNTIME))
continue;
if (md->virt_addr == 0)
return false;
- paddr = md->phys_addr;
- npages = md->num_pages;
- memrange_efi_to_native(&paddr, &npages);
- size = npages << PAGE_SHIFT;
-
- /*
- * Order is important here: memory regions may have all of the
- * bits below set (and usually do), and any memory that has the
- * EFI_MEMORY_WB bit set may be covered by the linear mapping
- * and mapped write-back cacheable already. So check the
- * EFI_MEMORY_WB bit first.
- */
- if (md->attribute & EFI_MEMORY_WB) {
- prot_val = pgprot_val(PAGE_KERNEL_EXEC);
- } else if (md->attribute & EFI_MEMORY_WT) {
- prot_val = PROT_NORMAL_WT;
- } else if (md->attribute & EFI_MEMORY_WC) {
- prot_val = PROT_NORMAL_NC;
- } else if (md->attribute & EFI_MEMORY_UC) {
- prot_val = PROT_DEVICE_nGnRnE;
- } else {
- pr_warn(" EFI remap 0x%012llx: not remapping due to unsupported memory attributes (0x%llx)\n",
- md->phys_addr, md->attribute);
- continue;
- }
-
- /*
- * Since the UEFI spec requires only the type attributes to be
- * identical within the same 64 KB page frame, we may encounter
- * regions that are not 64 KB aligned, but whose attributes only
- * differ from adjacent regions in the permission bits.
- * This means we can only enforce any permission restrictions if
- * the boundaries of this region are aligned to the OS page
- * size.
- */
- if (PAGE_SIZE == EFI_PAGE_SIZE ||
- (PAGE_ALIGNED(md->virt_addr) &&
- PAGE_ALIGNED(md->virt_addr + md->num_pages * EFI_PAGE_SIZE))) {
-
- if (md->attribute & EFI_MEMORY_RO)
- prot_val |= PTE_RDONLY;
- if (md->attribute & EFI_MEMORY_XP)
- prot_val |= PTE_PXN;
+ ret = efi_create_mapping(&efi_mm, md);
+ switch (ret) {
+ case 0:
+ pr_info(" EFI remap %pa => %p (R%c%c)\n",
+ &phys, (void *)(unsigned long)md->virt_addr,
+ md->attribute & EFI_MEMORY_RO ? '-' : 'W',
+ md->attribute & EFI_MEMORY_XP ? '-' : 'X');
+ break;
+ case -EINVAL:
+ pr_warn(" EFI remap %pa: not remapping due to unsupported memory attributes (0x%llx)\n",
+ &phys, md->attribute);
+ return false;
+ default:
+ pr_warn(" EFI remap %pa: failed to create mapping (%d)\n",
+ &phys, ret);
+ return false;
}
-
- pr_info(" EFI remap 0x%012llx => %p (R%c%c)\n",
- md->phys_addr, (void *)md->virt_addr,
- prot_val & PTE_RDONLY ? '-' : 'W',
- prot_val & PTE_PXN ? '-' : 'X');
-
- create_pgd_mapping(&efi_mm, paddr, md->virt_addr, size,
- __pgprot(prot_val));
}
return true;
}
@@ -117,7 +85,7 @@ static bool __init efi_virtmap_init(void)
* non-early mapping of the UEFI system table and virtual mappings for all
* EFI_MEMORY_RUNTIME regions.
*/
-static int __init arm64_enable_runtime_services(void)
+static int __init arm_enable_runtime_services(void)
{
u64 mapsize;
@@ -134,7 +102,7 @@ static int __init arm64_enable_runtime_services(void)
pr_info("Remapping and enabling EFI services.\n");
mapsize = memmap.map_end - memmap.map;
- memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
+ memmap.map = (__force void *)ioremap_cache((unsigned long)memmap.phys_map,
mapsize);
if (!memmap.map) {
pr_err("Failed to remap EFI memory map\n");
@@ -155,6 +123,7 @@ static int __init arm64_enable_runtime_services(void)
pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
return -1;
}
+ iounmap(memmap.map);
/* Set up runtime services function pointers */
efi_native_runtime_setup();
@@ -164,19 +133,7 @@ static int __init arm64_enable_runtime_services(void)
return 0;
}
-early_initcall(arm64_enable_runtime_services);
-
-static void efi_set_pgd(struct mm_struct *mm)
-{
- if (mm == &init_mm)
- cpu_set_reserved_ttbr0();
- else
- cpu_switch_mm(mm->pgd, mm);
-
- flush_tlb_all();
- if (icache_is_aivivt())
- __flush_icache_all();
-}
+early_initcall(arm_enable_runtime_services);
void efi_virtmap_load(void)
{
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index f5e586bd3b24..2eb31e28a35c 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -23,6 +23,8 @@
#include <linux/io.h>
#include <linux/platform_device.h>
+#include <asm/efi.h>
+
struct efi __read_mostly efi = {
.mps = EFI_INVALID_TABLE_ADDR,
.acpi = EFI_INVALID_TABLE_ADDR,
@@ -286,7 +288,7 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)
* So just always get our own virtual map on the CPU.
*
*/
- md = early_memremap((phys_addr_t)p, sizeof (*md));
+ md = early_memremap((unsigned long)p, sizeof (*md));
if (!md) {
pr_err_once("early_memremap(%p, %zu) failed.\n",
p, sizeof (*md));
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 2/9] arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM
2015-10-01 17:04 ` [PATCH 2/9] arm64/efi: refactor " Ard Biesheuvel
@ 2015-10-10 21:00 ` Matt Fleming
2015-11-04 11:44 ` Ard Biesheuvel
0 siblings, 1 reply; 20+ messages in thread
From: Matt Fleming @ 2015-10-10 21:00 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 01 Oct, at 07:04:16PM, Ard Biesheuvel wrote:
> This refactors the EFI init and runtime code that will be shared
> between arm64 and ARM so that it can be built for both archs.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> arch/arm64/include/asm/efi.h | 16 ++++
> arch/arm64/kernel/efi.c | 51 ++++++++++
> drivers/firmware/efi/arm-init.c | 11 ++-
> drivers/firmware/efi/arm-runtime.c | 101 ++++++--------------
> drivers/firmware/efi/efi.c | 4 +-
> 5 files changed, 105 insertions(+), 78 deletions(-)
[...]
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index 56987a5b9033..235677b86e4e 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -66,7 +66,7 @@ static int __init uefi_init(void)
> {
> efi_char16_t *c16;
> void *config_tables;
> - u64 table_size;
> + int table_size;
> char vendor[100] = "unknown";
> int i, retval;
Perhaps 'table_size' should be unsigned long? At the very least it
should be size_t, not int.
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index f5e586bd3b24..2eb31e28a35c 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -23,6 +23,8 @@
> #include <linux/io.h>
> #include <linux/platform_device.h>
>
> +#include <asm/efi.h>
> +
> struct efi __read_mostly efi = {
> .mps = EFI_INVALID_TABLE_ADDR,
> .acpi = EFI_INVALID_TABLE_ADDR,
Hmm... not quite sure why this new include is required?
--
Matt Fleming, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 2/9] arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM
2015-10-10 21:00 ` Matt Fleming
@ 2015-11-04 11:44 ` Ard Biesheuvel
0 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-11-04 11:44 UTC (permalink / raw)
To: linux-arm-kernel
On 10 October 2015 at 23:00, Matt Fleming <matt@codeblueprint.co.uk> wrote:
> On Thu, 01 Oct, at 07:04:16PM, Ard Biesheuvel wrote:
>> This refactors the EFI init and runtime code that will be shared
>> between arm64 and ARM so that it can be built for both archs.
>>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>> arch/arm64/include/asm/efi.h | 16 ++++
>> arch/arm64/kernel/efi.c | 51 ++++++++++
>> drivers/firmware/efi/arm-init.c | 11 ++-
>> drivers/firmware/efi/arm-runtime.c | 101 ++++++--------------
>> drivers/firmware/efi/efi.c | 4 +-
>> 5 files changed, 105 insertions(+), 78 deletions(-)
>
> [...]
>
>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>> index 56987a5b9033..235677b86e4e 100644
>> --- a/drivers/firmware/efi/arm-init.c
>> +++ b/drivers/firmware/efi/arm-init.c
>> @@ -66,7 +66,7 @@ static int __init uefi_init(void)
>> {
>> efi_char16_t *c16;
>> void *config_tables;
>> - u64 table_size;
>> + int table_size;
>> char vendor[100] = "unknown";
>> int i, retval;
>
> Perhaps 'table_size' should be unsigned long? At the very least it
> should be size_t, not int.
>
OK, I will change that.
>> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
>> index f5e586bd3b24..2eb31e28a35c 100644
>> --- a/drivers/firmware/efi/efi.c
>> +++ b/drivers/firmware/efi/efi.c
>> @@ -23,6 +23,8 @@
>> #include <linux/io.h>
>> #include <linux/platform_device.h>
>>
>> +#include <asm/efi.h>
>> +
>> struct efi __read_mostly efi = {
>> .mps = EFI_INVALID_TABLE_ADDR,
>> .acpi = EFI_INVALID_TABLE_ADDR,
>
> Hmm... not quite sure why this new include is required?
>
I need this or the file won't build on ARM.
We are currently relying on a transitive include of
<asm/early_ioremap.h>, which does not exist on IA-64. This is a bit of
a kludge, and I am open to better ways of dealing with this.
(IA-64 declares early_ioremap() in asm/io.h, and #define's
early_memremap() as an alias of it) and I am reluctant to include
asm/early_ioremap.h in ARM's asm/io.h (as the other archs do)
--
Ard.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 3/9] ARM: add support for generic early_ioremap/early_memremap
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 1/9] arm64/efi: split off EFI init and runtime code for reuse by " Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 2/9] arm64/efi: refactor " Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 4/9] ARM: only consider memblocks with NOMAP cleared for linear mapping Ard Biesheuvel
` (6 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
This enables the generic early_ioremap implementation for ARM.
It uses the fixmap region reserved for kmap. Since early_ioremap
is only supported before paging_init(), and kmap is only supported
afterwards, this is guaranteed not to cause any clashes.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/Kconfig | 1 +
arch/arm/include/asm/Kbuild | 1 +
arch/arm/include/asm/fixmap.h | 28 +++++++++++++++++++-
arch/arm/kernel/setup.c | 7 +++--
arch/arm/mm/ioremap.c | 9 +++++++
arch/arm/mm/mmu.c | 2 +-
6 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 72ad724c67ae..e4b7d6cfd8eb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -20,6 +20,7 @@ config ARM
select GENERIC_ALLOCATOR
select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ select GENERIC_EARLY_IOREMAP
select GENERIC_IDLE_POLL_SETUP
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index be648eb47cd9..4ea9642af500 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -3,6 +3,7 @@
generic-y += bitsperlong.h
generic-y += cputime.h
generic-y += current.h
+generic-y += early_ioremap.h
generic-y += emergency-restart.h
generic-y += errno.h
generic-y += exec.h
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
index 58cfe9f1a687..defac13e161a 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -19,9 +19,26 @@ enum fixed_addresses {
FIX_TEXT_POKE0,
FIX_TEXT_POKE1,
- __end_of_fixed_addresses
+ __end_of_fixmap_region,
+
+ /*
+ * Share the kmap() region with early_ioremap(): this is guaranteed
+ * not to clash since early_ioremap() is only available before
+ * paging_init(), and kmap() only after.
+ */
+#define NR_FIX_BTMAPS 32
+#define FIX_BTMAPS_SLOTS 7
+#define TOTAL_FIX_BTMAPS (NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
+
+ FIX_BTMAP_END = __end_of_permanent_fixed_addresses,
+ FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,
+ __end_of_early_ioremap_region
};
+static const enum fixed_addresses __end_of_fixed_addresses =
+ __end_of_fixmap_region > __end_of_early_ioremap_region ?
+ __end_of_fixmap_region : __end_of_early_ioremap_region;
+
#define FIXMAP_PAGE_COMMON (L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN | L_PTE_DIRTY)
#define FIXMAP_PAGE_NORMAL (FIXMAP_PAGE_COMMON | L_PTE_MT_WRITEBACK)
@@ -30,9 +47,18 @@ enum fixed_addresses {
#define FIXMAP_PAGE_IO (FIXMAP_PAGE_COMMON | L_PTE_MT_DEV_SHARED | L_PTE_SHARED)
#define FIXMAP_PAGE_NOCACHE FIXMAP_PAGE_IO
+#define __early_set_fixmap __set_fixmap
+
+#ifdef CONFIG_MMU
+
void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
void __init early_fixmap_init(void);
#include <asm-generic/fixmap.h>
+#else
+
+static inline void early_fixmap_init(void) { }
+
+#endif
#endif
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 20edd349d379..5df2bca57c42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -38,6 +38,7 @@
#include <asm/cpu.h>
#include <asm/cputype.h>
#include <asm/elf.h>
+#include <asm/early_ioremap.h>
#include <asm/fixmap.h>
#include <asm/procinfo.h>
#include <asm/psci.h>
@@ -956,8 +957,8 @@ void __init setup_arch(char **cmdline_p)
strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
*cmdline_p = cmd_line;
- if (IS_ENABLED(CONFIG_FIX_EARLYCON_MEM))
- early_fixmap_init();
+ early_fixmap_init();
+ early_ioremap_init();
parse_early_param();
@@ -968,6 +969,8 @@ void __init setup_arch(char **cmdline_p)
sanity_check_meminfo();
arm_memblock_init(mdesc);
+ early_ioremap_reset();
+
paging_init(mdesc);
request_standard_resources(mdesc);
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 0c81056c1dd7..66a978d05958 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -30,6 +30,7 @@
#include <asm/cp15.h>
#include <asm/cputype.h>
#include <asm/cacheflush.h>
+#include <asm/early_ioremap.h>
#include <asm/mmu_context.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
@@ -469,3 +470,11 @@ int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr)
}
EXPORT_SYMBOL_GPL(pci_ioremap_io);
#endif
+
+/*
+ * Must be called after early_fixmap_init
+ */
+void __init early_ioremap_init(void)
+{
+ early_ioremap_setup();
+}
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 7cd15143a507..b74686be6272 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -389,7 +389,7 @@ void __init early_fixmap_init(void)
* The early fixmap range spans multiple pmds, for which
* we are not prepared:
*/
- BUILD_BUG_ON((__fix_to_virt(__end_of_permanent_fixed_addresses) >> PMD_SHIFT)
+ BUILD_BUG_ON((__fix_to_virt(__end_of_early_ioremap_region) >> PMD_SHIFT)
!= FIXADDR_TOP >> PMD_SHIFT);
pmd = fixmap_pmd(FIXADDR_TOP);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 4/9] ARM: only consider memblocks with NOMAP cleared for linear mapping
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (2 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 3/9] ARM: add support for generic early_ioremap/early_memremap Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 5/9] ARM: split off core mapping logic from create_mapping Ard Biesheuvel
` (5 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
Take the new memblock attribute MEMBLOCK_NOMAP into account when
deciding whether a certain region is or should be covered by the
kernel direct mapping.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/mm/init.c | 2 +-
arch/arm/mm/mmu.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 8a63b4cdc0f2..1c667c6804a6 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -191,7 +191,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
#ifdef CONFIG_HAVE_ARCH_PFN_VALID
int pfn_valid(unsigned long pfn)
{
- return memblock_is_memory(__pfn_to_phys(pfn));
+ return memblock_is_map_memory(__pfn_to_phys(pfn));
}
EXPORT_SYMBOL(pfn_valid);
#endif
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index b74686be6272..008f28ef6d68 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1388,6 +1388,9 @@ static void __init map_lowmem(void)
phys_addr_t end = start + reg->size;
struct map_desc map;
+ if (memblock_is_nomap(reg))
+ continue;
+
if (end > arm_lowmem_limit)
end = arm_lowmem_limit;
if (start >= end)
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 5/9] ARM: split off core mapping logic from create_mapping
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (3 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 4/9] ARM: only consider memblocks with NOMAP cleared for linear mapping Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 6/9] ARM: factor out allocation routine from __create_mapping() Ard Biesheuvel
` (4 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
In order to be able to reuse the core mapping logic of create_mapping
for mapping the UEFI Runtime Services into a private set of page tables,
split it off from create_mapping() into a separate function
__create_mapping which we will wire up in a subsequent patch.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/mm/mmu.c | 56 +++++++++++---------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 008f28ef6d68..3930bad44a61 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -817,7 +817,8 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
}
#ifndef CONFIG_ARM_LPAE
-static void __init create_36bit_mapping(struct map_desc *md,
+static void __init create_36bit_mapping(struct mm_struct *mm,
+ struct map_desc *md,
const struct mem_type *type)
{
unsigned long addr, length, end;
@@ -858,7 +859,7 @@ static void __init create_36bit_mapping(struct map_desc *md,
*/
phys |= (((md->pfn >> (32 - PAGE_SHIFT)) & 0xF) << 20);
- pgd = pgd_offset_k(addr);
+ pgd = pgd_offset(mm, addr);
end = addr + length;
do {
pud_t *pud = pud_offset(pgd, addr);
@@ -875,33 +876,13 @@ static void __init create_36bit_mapping(struct map_desc *md,
}
#endif /* !CONFIG_ARM_LPAE */
-/*
- * Create the page directory entries and any necessary
- * page tables for the mapping specified by `md'. We
- * are able to cope here with varying sizes and address
- * offsets, and we take full advantage of sections and
- * supersections.
- */
-static void __init create_mapping(struct map_desc *md)
+static void __init __create_mapping(struct mm_struct *mm, struct map_desc *md)
{
unsigned long addr, length, end;
phys_addr_t phys;
const struct mem_type *type;
pgd_t *pgd;
- if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) {
- pr_warn("BUG: not creating mapping for 0x%08llx@0x%08lx in user region\n",
- (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
- return;
- }
-
- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
- md->virtual >= PAGE_OFFSET && md->virtual < FIXADDR_START &&
- (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
- pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
- (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
- }
-
type = &mem_types[md->type];
#ifndef CONFIG_ARM_LPAE
@@ -909,7 +890,7 @@ static void __init create_mapping(struct map_desc *md)
* Catch 36-bit addresses
*/
if (md->pfn >= 0x100000) {
- create_36bit_mapping(md, type);
+ create_36bit_mapping(mm, md, type);
return;
}
#endif
@@ -924,7 +905,7 @@ static void __init create_mapping(struct map_desc *md)
return;
}
- pgd = pgd_offset_k(addr);
+ pgd = pgd_offset(mm, addr);
end = addr + length;
do {
unsigned long next = pgd_addr_end(addr, end);
@@ -937,6 +918,31 @@ static void __init create_mapping(struct map_desc *md)
}
/*
+ * Create the page directory entries and any necessary
+ * page tables for the mapping specified by `md'. We
+ * are able to cope here with varying sizes and address
+ * offsets, and we take full advantage of sections and
+ * supersections.
+ */
+static void __init create_mapping(struct map_desc *md)
+{
+ if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) {
+ pr_warn("BUG: not creating mapping for 0x%08llx@0x%08lx in user region\n",
+ (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
+ return;
+ }
+
+ if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
+ md->virtual >= PAGE_OFFSET && md->virtual < FIXADDR_START &&
+ (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
+ pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
+ (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
+ }
+
+ __create_mapping(&init_mm, md);
+}
+
+/*
* Create the architecture specific mappings
*/
void __init iotable_init(struct map_desc *io_desc, int nr)
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 6/9] ARM: factor out allocation routine from __create_mapping()
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (4 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 5/9] ARM: split off core mapping logic from create_mapping Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 7/9] ARM: implement create_mapping_late() for EFI use Ard Biesheuvel
` (3 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
To allow __create_mapping() to be used for populating UEFI Runtime
Services page tables, factor out the allocation routine 'early_alloc'
and pass it down as a function pointer into alloc_init_[pud|pmd|pte].
This way, new users of __create_mapping() can supply another allocation
function.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/mm/mmu.c | 34 +++++++++++++-------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 3930bad44a61..dd0967ee23b7 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -723,21 +723,30 @@ static void __init *early_alloc(unsigned long sz)
return early_alloc_aligned(sz, sz);
}
-static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot)
+static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
+ unsigned long prot,
+ void *(*alloc)(unsigned long sz))
{
if (pmd_none(*pmd)) {
- pte_t *pte = early_alloc(PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE);
+ pte_t *pte = alloc(PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE);
__pmd_populate(pmd, __pa(pte), prot);
}
BUG_ON(pmd_bad(*pmd));
return pte_offset_kernel(pmd, addr);
}
+static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,
+ unsigned long prot)
+{
+ return pte_alloc(pmd, addr, prot, early_alloc);
+}
+
static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
unsigned long end, unsigned long pfn,
- const struct mem_type *type)
+ const struct mem_type *type,
+ void *(*alloc)(unsigned long sz))
{
- pte_t *pte = early_pte_alloc(pmd, addr, type->prot_l1);
+ pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);
do {
set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0);
pfn++;
@@ -773,7 +782,8 @@ static void __init __map_init_section(pmd_t *pmd, unsigned long addr,
static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
unsigned long end, phys_addr_t phys,
- const struct mem_type *type)
+ const struct mem_type *type,
+ void *(*alloc)(unsigned long sz))
{
pmd_t *pmd = pmd_offset(pud, addr);
unsigned long next;
@@ -794,7 +804,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
__map_init_section(pmd, addr, next, phys, type);
} else {
alloc_init_pte(pmd, addr, next,
- __phys_to_pfn(phys), type);
+ __phys_to_pfn(phys), type, alloc);
}
phys += next - addr;
@@ -804,14 +814,15 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
unsigned long end, phys_addr_t phys,
- const struct mem_type *type)
+ const struct mem_type *type,
+ void *(*alloc)(unsigned long sz))
{
pud_t *pud = pud_offset(pgd, addr);
unsigned long next;
do {
next = pud_addr_end(addr, end);
- alloc_init_pmd(pud, addr, next, phys, type);
+ alloc_init_pmd(pud, addr, next, phys, type, alloc);
phys += next - addr;
} while (pud++, addr = next, addr != end);
}
@@ -876,7 +887,8 @@ static void __init create_36bit_mapping(struct mm_struct *mm,
}
#endif /* !CONFIG_ARM_LPAE */
-static void __init __create_mapping(struct mm_struct *mm, struct map_desc *md)
+static void __init __create_mapping(struct mm_struct *mm, struct map_desc *md,
+ void *(*alloc)(unsigned long sz))
{
unsigned long addr, length, end;
phys_addr_t phys;
@@ -910,7 +922,7 @@ static void __init __create_mapping(struct mm_struct *mm, struct map_desc *md)
do {
unsigned long next = pgd_addr_end(addr, end);
- alloc_init_pud(pgd, addr, next, phys, type);
+ alloc_init_pud(pgd, addr, next, phys, type, alloc);
phys += next - addr;
addr = next;
@@ -939,7 +951,7 @@ static void __init create_mapping(struct map_desc *md)
(long long)__pfn_to_phys((u64)md->pfn), md->virtual);
}
- __create_mapping(&init_mm, md);
+ __create_mapping(&init_mm, md, early_alloc);
}
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 7/9] ARM: implement create_mapping_late() for EFI use
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (5 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 6/9] ARM: factor out allocation routine from __create_mapping() Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 8/9] ARM: wire up UEFI init and runtime support Ard Biesheuvel
` (2 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
This implements create_mapping_late(), which we will use to populate
the UEFI Runtime Services page tables.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/include/asm/mach/map.h | 1 +
arch/arm/mm/mmu.c | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index f98c7f32c9c8..14fe67bd0272 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -42,6 +42,7 @@ enum {
extern void iotable_init(struct map_desc *, int);
extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
void *caller);
+extern void create_mapping_late(struct mm_struct *mm, struct map_desc *md);
#ifdef CONFIG_DEBUG_LL
extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index dd0967ee23b7..c5f0c0ade981 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -723,6 +723,14 @@ static void __init *early_alloc(unsigned long sz)
return early_alloc_aligned(sz, sz);
}
+static void *__init late_alloc(unsigned long sz)
+{
+ void *ptr = (void *)__get_free_pages(PGALLOC_GFP, get_order(sz));
+
+ BUG_ON(!ptr);
+ return ptr;
+}
+
static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
unsigned long prot,
void *(*alloc)(unsigned long sz))
@@ -954,6 +962,17 @@ static void __init create_mapping(struct map_desc *md)
__create_mapping(&init_mm, md, early_alloc);
}
+void __init create_mapping_late(struct mm_struct *mm, struct map_desc *md)
+{
+#ifdef CONFIG_ARM_LPAE
+ pud_t *pud = pud_alloc(mm, pgd_offset(mm, md->virtual), md->virtual);
+ if (WARN_ON(!pud))
+ return;
+ pmd_alloc(mm, pud, 0);
+#endif
+ __create_mapping(mm, md, late_alloc);
+}
+
/*
* Create the architecture specific mappings
*/
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 8/9] ARM: wire up UEFI init and runtime support
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (6 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 7/9] ARM: implement create_mapping_late() for EFI use Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
2015-10-01 17:04 ` [PATCH 9/9] ARM: add UEFI stub support Ard Biesheuvel
2015-10-02 20:38 ` [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Russell King - ARM Linux
9 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
This adds support to the kernel proper for booting via UEFI. It shares
most of the code with arm64, so this patch mostly just wires it up for
use with ARM.
Note that this does not include the EFI stub, it is added in a subsequent
patch.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/include/asm/efi.h | 69 +++++++++++++++++++
arch/arm/kernel/Makefile | 1 +
arch/arm/kernel/devtree.c | 4 ++
arch/arm/kernel/efi.c | 71 ++++++++++++++++++++
arch/arm/kernel/setup.c | 3 +
arch/arm/mm/init.c | 14 +++-
drivers/firmware/efi/libstub/arm-stub.c | 4 +-
7 files changed, 164 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
new file mode 100644
index 000000000000..2622322f1135
--- /dev/null
+++ b/arch/arm/include/asm/efi.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@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.
+ */
+
+#ifndef __ASM_ARM_EFI_H
+#define __ASM_ARM_EFI_H
+
+#include <asm/cacheflush.h>
+#include <asm/cachetype.h>
+#include <asm/early_ioremap.h>
+#include <asm/fixmap.h>
+#include <asm/highmem.h>
+#include <asm/mach/map.h>
+#include <asm/mmu_context.h>
+#include <asm/pgtable.h>
+
+#ifdef CONFIG_EFI
+void efi_init(void);
+void efi_parse_fdt(void *fdt);
+
+int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);
+
+#define efi_call_virt(f, ...) \
+({ \
+ efi_##f##_t *__f; \
+ efi_status_t __s; \
+ \
+ efi_virtmap_load(); \
+ __f = efi.systab->runtime->f; \
+ __s = __f(__VA_ARGS__); \
+ efi_virtmap_unload(); \
+ __s; \
+})
+
+#define __efi_call_virt(f, ...) \
+({ \
+ efi_##f##_t *__f; \
+ \
+ efi_virtmap_load(); \
+ __f = efi.systab->runtime->f; \
+ __f(__VA_ARGS__); \
+ efi_virtmap_unload(); \
+})
+
+static inline void efi_set_pgd(struct mm_struct *mm)
+{
+ if (unlikely(mm->context.vmalloc_seq != init_mm.context.vmalloc_seq))
+ __check_vmalloc_seq(mm);
+
+ cpu_switch_mm(mm->pgd, mm);
+
+ flush_tlb_all();
+ if (icache_is_vivt_asid_tagged())
+ __flush_icache_all();
+}
+
+void efi_virtmap_load(void);
+void efi_virtmap_unload(void);
+
+#else
+#define efi_init()
+#define efi_parse_fdt(x)
+#endif /* CONFIG_EFI */
+
+#endif /* _ASM_ARM_EFI_H */
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index af9e59bf3831..c90f4a70d646 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -77,6 +77,7 @@ CFLAGS_pj4-cp0.o := -marm
AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
obj-$(CONFIG_VDSO) += vdso.o
+obj-$(CONFIG_EFI) += efi.o
ifneq ($(CONFIG_ARCH_EBSA110),y)
obj-y += io.o
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 11c54de9f8cf..c3439eaf46ce 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -9,6 +9,7 @@
*/
#include <linux/init.h>
+#include <linux/efi.h>
#include <linux/export.h>
#include <linux/errno.h>
#include <linux/types.h>
@@ -21,6 +22,7 @@
#include <linux/smp.h>
#include <asm/cputype.h>
+#include <asm/efi.h>
#include <asm/setup.h>
#include <asm/page.h>
#include <asm/smp_plat.h>
@@ -215,6 +217,8 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
if (!dt_phys || !early_init_dt_verify(phys_to_virt(dt_phys)))
return NULL;
+ efi_parse_fdt(phys_to_virt(dt_phys));
+
mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
if (!mdesc) {
diff --git a/arch/arm/kernel/efi.c b/arch/arm/kernel/efi.c
new file mode 100644
index 000000000000..ef4dab987da5
--- /dev/null
+++ b/arch/arm/kernel/efi.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@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>
+#include <asm/mach/map.h>
+#include <asm/mmu_context.h>
+
+static int set_efi_permissions(pte_t *ptep, pgtable_t token, unsigned long addr,
+ void *data)
+{
+ pteval_t *prot_val = data;
+ pte_t pte = *ptep;
+
+ pte = set_pte_bit(pte, __pgprot(*prot_val));
+ set_pte_ext(ptep, pte, 0);
+ return 0;
+}
+
+int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)
+{
+ struct map_desc desc = {
+ .virtual = md->virt_addr,
+ .pfn = __phys_to_pfn(md->phys_addr),
+ .length = md->num_pages * EFI_PAGE_SIZE,
+ };
+ pteval_t prot_val = 0;
+ int ret = 0;
+
+ /*
+ * Order is important here: memory regions may have all of the
+ * bits below set (and usually do), and any memory that has the
+ * EFI_MEMORY_WB bit set may be covered by the linear mapping
+ * and mapped write-back cacheable already. So check the
+ * EFI_MEMORY_WB bit first.
+ */
+ if (md->attribute & EFI_MEMORY_WB)
+ desc.type = MT_MEMORY_RWX;
+ else if (md->attribute & EFI_MEMORY_WT)
+ desc.type = MT_MEMORY_RWX_NONCACHED;
+ else if (md->attribute & EFI_MEMORY_WC)
+ desc.type = MT_DEVICE_WC;
+ else if (md->attribute & EFI_MEMORY_UC)
+ desc.type = MT_DEVICE;
+ else
+ return -EINVAL;
+
+ create_mapping_late(mm, &desc);
+
+ if (md->attribute & EFI_MEMORY_RO)
+ prot_val |= L_PTE_RDONLY;
+ if (md->attribute & EFI_MEMORY_XP)
+ prot_val |= L_PTE_XN;
+
+ /*
+ * MT_DEVICE[_WC] implies XN, so no need to set it again.
+ */
+ if (desc.type == MT_DEVICE_WC || desc.type == MT_DEVICE)
+ prot_val &= ~L_PTE_XN;
+
+ if (prot_val != 0)
+ ret = apply_to_page_range(mm, desc.virtual, desc.length,
+ set_efi_permissions, &prot_val);
+
+ return ret;
+}
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 5df2bca57c42..b341b1c3b2fa 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -7,6 +7,7 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/efi.h>
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
@@ -37,6 +38,7 @@
#include <asm/cp15.h>
#include <asm/cpu.h>
#include <asm/cputype.h>
+#include <asm/efi.h>
#include <asm/elf.h>
#include <asm/early_ioremap.h>
#include <asm/fixmap.h>
@@ -966,6 +968,7 @@ void __init setup_arch(char **cmdline_p)
early_paging_init(mdesc);
#endif
setup_dma_zone(mdesc);
+ efi_init();
sanity_check_meminfo();
arm_memblock_init(mdesc);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 1c667c6804a6..43df6a23689b 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
+#include <linux/efi.h>
#include <linux/errno.h>
#include <linux/swap.h>
#include <linux/init.h>
@@ -24,6 +25,7 @@
#include <linux/sizes.h>
#include <asm/cp15.h>
+#include <asm/efi.h>
#include <asm/mach-types.h>
#include <asm/memblock.h>
#include <asm/prom.h>
@@ -269,7 +271,8 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
mdesc->reserve();
early_init_fdt_reserve_self();
- early_init_fdt_scan_reserved_mem();
+ if (!efi_enabled(EFI_MEMMAP))
+ early_init_fdt_scan_reserved_mem();
/* reserve memory for DMA contiguous allocations */
dma_contiguous_reserve(arm_dma_limit);
@@ -751,3 +754,12 @@ static int __init keepinitrd_setup(char *__unused)
__setup("keepinitrd", keepinitrd_setup);
#endif
+
+void __init early_init_dt_add_memory_arch(u64 base, u64 size)
+{
+ /*
+ * Ignore DT memory nodes if we are booting via UEFI.
+ */
+ if (!efi_enabled(EFI_MEMMAP))
+ early_init_dt_add_memory(base, size);
+}
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)
{
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 9/9] ARM: add UEFI stub support
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (7 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 8/9] ARM: wire up UEFI init and runtime support Ard Biesheuvel
@ 2015-10-01 17:04 ` Ard Biesheuvel
[not found] ` <CAD0U-h+zPhDe6Fqpg_vhF46FLjvvsbeSrQ_Fnj86o5cRc+A2QQ@mail.gmail.com>
2015-10-02 20:38 ` [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Russell King - ARM Linux
9 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-01 17:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Roy Franz <roy.franz@linaro.org>
This patch adds EFI stub support for the ARM Linux kernel.
The EFI stub operates similarly to the x86 and arm64 stubs: it is a
shim between the EFI firmware and the normal zImage entry point, and
sets up the environment that the zImage is expecting. This includes
optionally loading the initrd and device tree from the system partition
based on the kernel command line.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/Kconfig | 19 +++
arch/arm/boot/compressed/Makefile | 5 +-
| 130 ++++++++++++++++++++
arch/arm/boot/compressed/efi-stub.c | 89 ++++++++++++++
arch/arm/boot/compressed/head.S | 54 +++++++-
arch/arm/boot/compressed/vmlinux.lds.S | 7 ++
arch/arm/include/asm/efi.h | 23 ++++
drivers/firmware/efi/libstub/Makefile | 12 ++
8 files changed, 336 insertions(+), 3 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e4b7d6cfd8eb..6d7fd83c2ee4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2061,6 +2061,25 @@ config AUTO_ZRELADDR
0xf8000000. This assumes the zImage being placed in the first 128MB
from start of memory.
+config EFI_STUB
+ bool
+
+config EFI
+ bool "UEFI runtime support"
+ depends on OF && !CPU_BIG_ENDIAN && MMU && AUTO_ZRELADDR && !XIP_KERNEL
+ select UCS2_STRING
+ select EFI_PARAMS_FROM_FDT
+ select EFI_STUB
+ select EFI_ARMSTUB
+ select EFI_RUNTIME_WRAPPERS
+ ---help---
+ This option provides support for runtime services provided
+ by UEFI firmware (such as non-volatile variables, realtime
+ clock, and platform reset). A UEFI stub is also provided to
+ allow the kernel to be booted as an EFI application. This
+ is only useful for kernels that may run on systems that have
+ UEFI firmware.
+
endmenu
menu "CPU Power Management"
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 3f9a9ebc77c3..0e5624d6215d 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -167,9 +167,12 @@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \
false; \
fi
+efi-obj-$(CONFIG_EFI_STUB) := $(obj)/efi-stub.o $(obj)/efi-banner.o \
+ $(objtree)/drivers/firmware/efi/libstub/lib.a
+
$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
- $(bswapsdi2) FORCE
+ $(bswapsdi2) $(efi-obj-y) FORCE
@$(check_for_multiple_zreladdr)
$(call if_changed,ld)
@$(check_for_bad_syms)
--git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S
new file mode 100644
index 000000000000..9d5dc4fda3c1
--- /dev/null
+++ b/arch/arm/boot/compressed/efi-header.S
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2013-2015 Linaro Ltd
+ * Authors: Roy Franz <roy.franz@linaro.org>
+ * Ard Biesheuvel <ard.biesheuvel@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.
+ */
+
+ .macro __nop
+#ifdef CONFIG_EFI_STUB
+ @ This is almost but not quite a NOP, since it does clobber the
+ @ condition flags. But it is the best we can do for EFI, since
+ @ PE/COFF expects the magic string "MZ" at offset 0, while the
+ @ ARM/Linux boot protocol expects an executable instruction
+ @ there.
+ .inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000
+#else
+ mov r0, r0
+#endif
+ .endm
+
+ .macro __EFI_HEADER
+#ifdef CONFIG_EFI_STUB
+ b __efi_start
+
+ .set start_offset, __efi_start - start
+ .org start + 0x3c
+ @
+ @ The PE header can be anywhere in the file, but for
+ @ simplicity we keep it together with the MSDOS header
+ @ The offset to the PE/COFF header needs to be at offset
+ @ 0x3C in the MSDOS header.
+ @ The only 2 fields of the MSDOS header that are used are this
+ @ PE/COFF offset, and the "MZ" bytes at offset 0x0.
+ @
+ .long pe_header - start @ Offset to the PE header.
+
+pe_header:
+ .ascii "PE\0\0"
+
+coff_header:
+ .short 0x01c2 @ ARM or Thumb
+ .short 2 @ nr_sections
+ .long 0 @ TimeDateStamp
+ .long 0 @ PointerToSymbolTable
+ .long 1 @ NumberOfSymbols
+ .short section_table - optional_header
+ @ SizeOfOptionalHeader
+ .short 0x306 @ Characteristics.
+ @ IMAGE_FILE_32BIT_MACHINE |
+ @ IMAGE_FILE_DEBUG_STRIPPED |
+ @ IMAGE_FILE_EXECUTABLE_IMAGE |
+ @ IMAGE_FILE_LINE_NUMS_STRIPPED
+
+optional_header:
+ .short 0x10b @ PE32 format
+ .byte 0x02 @ MajorLinkerVersion
+ .byte 0x14 @ MinorLinkerVersion
+ .long _end - __efi_start @ SizeOfCode
+ .long 0 @ SizeOfInitializedData
+ .long 0 @ SizeOfUninitializedData
+ .long efi_stub_entry - start @ AddressOfEntryPoint
+ .long start_offset @ BaseOfCode
+ .long 0 @ data
+
+extra_header_fields:
+ .long 0 @ ImageBase
+ .long 0x200 @ SectionAlignment
+ .long 0x200 @ FileAlignment
+ .short 0 @ MajorOperatingSystemVersion
+ .short 0 @ MinorOperatingSystemVersion
+ .short 0 @ MajorImageVersion
+ .short 0 @ MinorImageVersion
+ .short 0 @ MajorSubsystemVersion
+ .short 0 @ MinorSubsystemVersion
+ .long 0 @ Win32VersionValue
+
+ .long _end - start @ SizeOfImage
+ .long start_offset @ SizeOfHeaders
+ .long 0 @ CheckSum
+ .short 0xa @ Subsystem (EFI application)
+ .short 0 @ DllCharacteristics
+ .long 0 @ SizeOfStackReserve
+ .long 0 @ SizeOfStackCommit
+ .long 0 @ SizeOfHeapReserve
+ .long 0 @ SizeOfHeapCommit
+ .long 0 @ LoaderFlags
+ .long 0x6 @ NumberOfRvaAndSizes
+
+ .quad 0 @ ExportTable
+ .quad 0 @ ImportTable
+ .quad 0 @ ResourceTable
+ .quad 0 @ ExceptionTable
+ .quad 0 @ CertificationTable
+ .quad 0 @ BaseRelocationTable
+
+section_table:
+ @
+ @ The EFI application loader requires a relocation section
+ @ because EFI applications must be relocatable. This is a
+ @ dummy section as far as we are concerned.
+ @
+ .ascii ".reloc\0\0"
+ .long 0 @ VirtualSize
+ .long 0 @ VirtualAddress
+ .long 0 @ SizeOfRawData
+ .long 0 @ PointerToRawData
+ .long 0 @ PointerToRelocations
+ .long 0 @ PointerToLineNumbers
+ .short 0 @ NumberOfRelocations
+ .short 0 @ NumberOfLineNumbers
+ .long 0x42100040 @ Characteristics
+
+ .ascii ".text\0\0\0"
+ .long _end - __efi_start @ VirtualSize
+ .long __efi_start @ VirtualAddress
+ .long _edata - __efi_start @ SizeOfRawData
+ .long __efi_start @ PointerToRawData
+ .long 0 @ PointerToRelocations
+ .long 0 @ PointerToLineNumbers
+ .short 0 @ NumberOfRelocations
+ .short 0 @ NumberOfLineNumbers
+ .long 0xe0500020 @ Characteristics
+
+ .align 9
+__efi_start:
+#endif
+ .endm
diff --git a/arch/arm/boot/compressed/efi-stub.c b/arch/arm/boot/compressed/efi-stub.c
new file mode 100644
index 000000000000..f1a3b1825337
--- /dev/null
+++ b/arch/arm/boot/compressed/efi-stub.c
@@ -0,0 +1,89 @@
+/*
+ * linux/arch/arm/boot/compressed/efi-stub.c
+ *
+ * Copyright (C) 2013 Linaro Ltd; <roy.franz@linaro.org>
+ *
+ * This file implements the EFI boot stub for the ARM kernel
+ *
+ * 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, if required. ARM doesn't have a
+ * preferred address, so we set it to 0, as we want to allocate
+ * as low in memory as possible.
+ */
+ *image_size = image->image_size;
+ status = efi_relocate_kernel(sys_table, image_addr, *image_size,
+ *image_size, 0, 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/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 06e983f59980..af11c2f8f3b7 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -12,6 +12,8 @@
#include <asm/assembler.h>
#include <asm/v7m.h>
+#include "efi-header.S"
+
AR_CLASS( .arch armv7-a )
M_CLASS( .arch armv7-m )
@@ -126,7 +128,7 @@
start:
.type start,#function
.rept 7
- mov r0, r0
+ __nop
.endr
ARM( mov r0, r0 )
ARM( b 1f )
@@ -139,7 +141,8 @@ start:
.word 0x04030201 @ endianness flag
THUMB( .thumb )
-1:
+1: __EFI_HEADER
+
ARM_BE8( setend be ) @ go BE8 if compiled for BE8
AR_CLASS( mrs r9, cpsr )
#ifdef CONFIG_ARM_VIRT_EXT
@@ -1353,6 +1356,53 @@ __enter_kernel:
reloc_code_end:
+#ifdef CONFIG_EFI_STUB
+ .align 2
+_start: .long start - .
+
+ENTRY(efi_stub_entry)
+ @ allocate space on stack for passing current zImage address
+ @ and for the EFI stub to return of new entry point of
+ @ zImage, as EFI stub may copy the kernel. Pointer address
+ @ is passed in r2. r0 and r1 are passed through from the
+ @ EFI firmware to efi_entry
+ adr ip, _start
+ ldr r3, [ip]
+ add r3, r3, ip
+ stmfd sp!, {r3, lr}
+ mov r2, sp @ pass zImage address in r2
+ bl efi_entry
+
+ @ Check for error return from EFI stub. r0 has FDT address
+ @ or error code.
+ cmn r0, #1
+ beq efi_load_fail
+
+ @ Preserve return value of efi_entry() in r4
+ mov r4, r0
+ bl cache_clean_flush
+ bl cache_off
+
+ @ Set parameters for booting zImage according to boot protocol
+ @ put FDT address in r2, it was returned by efi_entry()
+ @ r1 is the machine type, and r0 needs to be 0
+ mov r0, #0
+ mov r1, #0xFFFFFFFF
+ mov r2, r4
+
+ @ Branch to (possibly) relocated zImage that is in [sp]
+ ldr lr, [sp]
+ ldr ip, =start_offset
+ add lr, lr, ip
+ mov pc, lr @ no mode switch
+
+efi_load_fail:
+ @ Return EFI_LOAD_ERROR to EFI firmware on error.
+ ldr r0, =0x80000001
+ ldmfd sp!, {ip, pc}
+ENDPROC(efi_stub_entry)
+#endif
+
.align
.section ".stack", "aw", %nobits
.L_user_stack: .space 4096
diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S
index 2b60b843ac5e..81c493156ce8 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.S
+++ b/arch/arm/boot/compressed/vmlinux.lds.S
@@ -48,6 +48,13 @@ SECTIONS
*(.rodata)
*(.rodata.*)
}
+ .data : {
+ /*
+ * The EFI stub always executes from RAM, and runs strictly before the
+ * decompressor, so we can make an exception for its r/w data, and keep it
+ */
+ *(.data.efistub)
+ }
.piggydata : {
*(.piggydata)
}
diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
index 2622322f1135..bf22d0d1d52d 100644
--- a/arch/arm/include/asm/efi.h
+++ b/arch/arm/include/asm/efi.h
@@ -66,4 +66,27 @@ void efi_virtmap_unload(void);
#define efi_parse_fdt(x)
#endif /* CONFIG_EFI */
+/* arch specific definitions used by the stub code */
+
+#define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__)
+
+/*
+ * A reasonable upper bound for the uncompressed kernel size is 32 MBytes,
+ * so we will reserve that amount of memory. We have no easy way to tell what
+ * the actuall size of code + data the uncompressed kernel will use.
+ * If this is insufficient, the decompressor will relocate itself out of the
+ * way before performing the decompression.
+ */
+#define MAX_UNCOMP_KERNEL_SIZE SZ_32M
+
+/*
+ * The kernel zImage should preferably be located between 32 MB and 128 MB
+ * from the base of DRAM. The min address leaves space for a maximal size
+ * uncompressed image, and the max address is due to how the zImage decompressor
+ * picks a destination address.
+ */
+#define ZIMAGE_OFFSET_LIMIT SZ_128M
+#define MIN_ZIMAGE_OFFSET MAX_UNCOMP_KERNEL_SIZE
+#define MAX_FDT_OFFSET ZIMAGE_OFFSET_LIMIT
+
#endif /* _ASM_ARM_EFI_H */
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index 50557f4d12db..6d86e2713e9f 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -62,3 +62,15 @@ quiet_cmd_stubcopy = STUBCPY $@
$(OBJDUMP) -r $@ | grep R_AARCH64_ABS \
&& (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.
+#
+extra-$(CONFIG_ARM) := $(lib-y)
+lib-$(CONFIG_ARM) := $(patsubst %.o,%.stub.o,$(lib-y))
+
+$(obj)/%.stub.o: OBJCOPYFLAGS := --rename-section .data=.data.efistub
+$(obj)/%.stub.o: $(obj)/%.o FORCE
+ $(call if_changed,objcopy)
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM
2015-10-01 17:04 [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Ard Biesheuvel
` (8 preceding siblings ...)
2015-10-01 17:04 ` [PATCH 9/9] ARM: add UEFI stub support Ard Biesheuvel
@ 2015-10-02 20:38 ` Russell King - ARM Linux
2015-10-02 20:49 ` Ard Biesheuvel
9 siblings, 1 reply; 20+ messages in thread
From: Russell King - ARM Linux @ 2015-10-02 20:38 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 01, 2015 at 07:04:14PM +0200, Ard Biesheuvel wrote:
> There are a number of prerequisites for this series that have all been
> sent to the linux-arm-kernel mailing list at some point (and mostly
> ignored).
They've been ignored because they're UEFI and no one's said that it's
something that 32-bit ARM should get... until this series has come
along. It might help if Linaro was more engaging with developers who
aren't part of Linaro.
Now, I'm not going to suddenly drop what I'm working on to start trying
to gain an understanding of UEFI, and what its implications are for
32-bit ARM so that I can reasonably review these patches - let me put
that another way: don't expect me to review this stuff quickly and
come out with review comments on something I have very ltitle clue
about. I have precisely zero UEFI knowledge.
--
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM
2015-10-02 20:38 ` [PATCH 0/9] UEFI boot and runtime services support for 32-bit ARM Russell King - ARM Linux
@ 2015-10-02 20:49 ` Ard Biesheuvel
0 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2015-10-02 20:49 UTC (permalink / raw)
To: linux-arm-kernel
On 2 October 2015 at 22:38, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Thu, Oct 01, 2015 at 07:04:14PM +0200, Ard Biesheuvel wrote:
>> There are a number of prerequisites for this series that have all been
>> sent to the linux-arm-kernel mailing list at some point (and mostly
>> ignored).
>
> They've been ignored because they're UEFI and no one's said that it's
> something that 32-bit ARM should get... until this series has come
> along. It might help if Linaro was more engaging with developers who
> aren't part of Linaro.
>
Actually, the first iteration of this series was sent out by Roy more
than two years ago.
But I am fully aware that these patches and the prerequisite series
(plural) still need thorough review, I am just throwing this series
out there early since it ties all of that together, so it puts the
other stuff into context.
> Now, I'm not going to suddenly drop what I'm working on to start trying
> to gain an understanding of UEFI, and what its implications are for
> 32-bit ARM so that I can reasonably review these patches - let me put
> that another way: don't expect me to review this stuff quickly and
> come out with review comments on something I have very ltitle clue
> about. I have precisely zero UEFI knowledge.
>
I think the UEFI peculiarities are mostly covered by the common code
shared with x86 and arm64. What I would appreciate your input on is
the ARM specific thinks like early .data in the decompressor (even
before the GOT fixups), the early_ioremap addition and the changes to
create_mapping(). But no rush at all.
Thanks,
Ard.
^ permalink raw reply [flat|nested] 20+ messages in thread