Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull ARM64 EFI update from Peter Anvin:
 "By agreement with the ARM64 EFI maintainers, we have agreed to make
  -tip the upstream for all EFI patches.  That is why this patchset
  comes from me :)

  This patchset enables EFI stub support for ARM64, like we already have
  on x86"

* 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arm64: efi: only attempt efi map setup if booting via EFI
  efi/arm64: ignore dtb= when UEFI SecureBoot is enabled
  doc: arm64: add description of EFI stub support
  arm64: efi: add EFI stub
  doc: arm: add UEFI support documentation
  arm64: add EFI runtime services
  efi: Add shared FDT related functions for ARM/ARM64
  arm64: Add function to create identity mappings
  efi: add helper function to get UEFI params from FDT
  doc: efi-stub.txt updates for ARM
  lib: add fdt_empty_tree.c

1 files changed, 47 insertions, 18 deletions

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 0a472c41a67f..4a829a210bb6 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -168,7 +168,8 @@ static void __init *early_alloc(unsigned long sz)
 }
 
 static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
-                                  unsigned long end, unsigned long pfn)
+                                  unsigned long end, unsigned long pfn,
+                                  pgprot_t prot)
 {
         pte_t *pte;
 
@@ -180,16 +181,28 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
 
         pte = pte_offset_kernel(pmd, addr);
         do {
-                set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));
+                set_pte(pte, pfn_pte(pfn, prot));
                 pfn++;
         } while (pte++, addr += PAGE_SIZE, addr != end);
 }
 
 static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
-                                  unsigned long end, phys_addr_t phys)
+                                  unsigned long end, phys_addr_t phys,
+                                  int map_io)
 {
         pmd_t *pmd;
         unsigned long next;
+        pmdval_t prot_sect;
+        pgprot_t prot_pte;
+
+        if (map_io) {
+                prot_sect = PMD_TYPE_SECT | PMD_SECT_AF |
+                            PMD_ATTRINDX(MT_DEVICE_nGnRE);
+                prot_pte = __pgprot(PROT_DEVICE_nGnRE);
+        } else {
+                prot_sect = prot_sect_kernel;
+                prot_pte = PAGE_KERNEL_EXEC;
+        }
 
         /*
          * Check for initial section mappings in the pgd/pud and remove them.
@@ -205,7 +218,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
                 /* try section mapping first */
                 if (((addr | next | phys) & ~SECTION_MASK) == 0) {
                         pmd_t old_pmd =*pmd;
-                        set_pmd(pmd, __pmd(phys | prot_sect_kernel));
+                        set_pmd(pmd, __pmd(phys | prot_sect));
                         /*
                          * Check for previous table entries created during
                          * boot (__create_page_tables) and flush them.
@@ -213,21 +226,23 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
                         if (!pmd_none(old_pmd))
                                 flush_tlb_all();
                 } else {
-                        alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys));
+                        alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys),
+                                       prot_pte);
                 }
                 phys += next - addr;
         } while (pmd++, addr = next, addr != end);
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
-                                  unsigned long end, unsigned long phys)
+                                  unsigned long end, unsigned long phys,
+                                  int map_io)
 {
         pud_t *pud = pud_offset(pgd, addr);
         unsigned long next;
 
         do {
                 next = pud_addr_end(addr, end);
-                alloc_init_pmd(pud, addr, next, phys);
+                alloc_init_pmd(pud, addr, next, phys, map_io);
                 phys += next - addr;
         } while (pud++, addr = next, addr != end);
 }
@@ -236,30 +251,44 @@ static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
  * Create the page directory entries and any necessary page tables for the
  * mapping specified by 'md'.
  */
-static void __init create_mapping(phys_addr_t phys, unsigned long virt,
-                                  phys_addr_t size)
+static void __init __create_mapping(pgd_t *pgd, phys_addr_t phys,
+                                    unsigned long virt, phys_addr_t size,
+                                    int map_io)
 {
         unsigned long addr, length, end, next;
-        pgd_t *pgd;
-
-        if (virt < VMALLOC_START) {
-                pr_warning("BUG: not creating mapping for 0x%016llx at 0x%016lx - outside kernel range\n",
-                           phys, virt);
-                return;
-        }
 
         addr = virt & PAGE_MASK;
         length = PAGE_ALIGN(size + (virt & ~PAGE_MASK));
 
-        pgd = pgd_offset_k(addr);
         end = addr + length;
         do {
                 next = pgd_addr_end(addr, end);
-                alloc_init_pud(pgd, addr, next, phys);
+                alloc_init_pud(pgd, addr, next, phys, map_io);
                 phys += next - addr;
         } while (pgd++, addr = next, addr != end);
 }
 
+static void __init create_mapping(phys_addr_t phys, unsigned long virt,
+                                  phys_addr_t size)
+{
+        if (virt < VMALLOC_START) {
+                pr_warn("BUG: not creating mapping for %pa at 0x%016lx - outside kernel range\n",
+                        &phys, virt);
+                return;
+        }
+        __create_mapping(pgd_offset_k(virt & PAGE_MASK), phys, virt, size, 0);
+}
+
+void __init create_id_mapping(phys_addr_t addr, phys_addr_t size, int map_io)
+{
+        if ((addr >> PGDIR_SHIFT) >= ARRAY_SIZE(idmap_pg_dir)) {
+                pr_warn("BUG: not creating id mapping for %pa\n", &addr);
+                return;
+        }
+        __create_mapping(&idmap_pg_dir[pgd_index(addr)],
+                         addr, addr, size, map_io);
+}
+
 static void __init map_mem(void)
 {
         struct memblock_region *reg;