diff options
author | Mark Salter <msalter@redhat.com> | 2014-04-15 22:47:52 -0400 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2014-04-30 14:57:04 -0400 |
commit | 3c7f255039a2ad6ee1e3890505caf0d029b22e29 (patch) | |
tree | 30fdbf23554e3a4aaf7ebd082f96aa71ec6a54c5 /arch | |
parent | e1977464e8403b4d7ed23d6bdb3358e78b311aa0 (diff) |
arm64: efi: add EFI stub
This patch adds PE/COFF header fields to the start of the kernel
Image so that it appears as an EFI application to UEFI firmware.
An EFI stub is included to allow direct booting of the kernel
Image.
Signed-off-by: Mark Salter <msalter@redhat.com>
[Add support in PE/COFF header for signed images]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm64/kernel/Makefile | 4 | ||||
-rw-r--r-- | arch/arm64/kernel/efi-entry.S | 109 | ||||
-rw-r--r-- | arch/arm64/kernel/efi-stub.c | 81 | ||||
-rw-r--r-- | arch/arm64/kernel/head.S | 112 |
5 files changed, 308 insertions, 3 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 82e21de5db3b..6c71f122638d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -290,8 +290,9 @@ config EFI | |||
290 | help | 290 | help |
291 | This option provides support for runtime services provided | 291 | This option provides support for runtime services provided |
292 | by UEFI firmware (such as non-volatile variables, realtime | 292 | by UEFI firmware (such as non-volatile variables, realtime |
293 | clock, and platform reset). This is only useful on systems | 293 | clock, and platform reset). A UEFI stub is also provided to |
294 | that have UEFI firmware. | 294 | allow the kernel to be booted as an EFI application. This |
295 | is only useful on systems that have UEFI firmware. | ||
295 | 296 | ||
296 | endmenu | 297 | endmenu |
297 | 298 | ||
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f57ccd755886..db63a0a25810 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile | |||
@@ -4,6 +4,8 @@ | |||
4 | 4 | ||
5 | CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET) | 5 | CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET) |
6 | AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) | 6 | AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) |
7 | CFLAGS_efi-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) \ | ||
8 | -I$(src)/../../../scripts/dtc/libfdt | ||
7 | 9 | ||
8 | # Object file lists. | 10 | # Object file lists. |
9 | arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ | 11 | arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ |
@@ -22,7 +24,7 @@ arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | |||
22 | arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND) += sleep.o suspend.o | 24 | arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND) += sleep.o suspend.o |
23 | arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o | 25 | arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o |
24 | arm64-obj-$(CONFIG_KGDB) += kgdb.o | 26 | arm64-obj-$(CONFIG_KGDB) += kgdb.o |
25 | arm64-obj-$(CONFIG_EFI) += efi.o | 27 | arm64-obj-$(CONFIG_EFI) += efi.o efi-stub.o efi-entry.o |
26 | 28 | ||
27 | obj-y += $(arm64-obj-y) vdso/ | 29 | obj-y += $(arm64-obj-y) vdso/ |
28 | obj-m += $(arm64-obj-m) | 30 | obj-m += $(arm64-obj-m) |
diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S new file mode 100644 index 000000000000..66716c9b9e5f --- /dev/null +++ b/arch/arm64/kernel/efi-entry.S | |||
@@ -0,0 +1,109 @@ | |||
1 | /* | ||
2 | * EFI entry point. | ||
3 | * | ||
4 | * Copyright (C) 2013, 2014 Red Hat, Inc. | ||
5 | * Author: Mark Salter <msalter@redhat.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | */ | ||
12 | #include <linux/linkage.h> | ||
13 | #include <linux/init.h> | ||
14 | |||
15 | #include <asm/assembler.h> | ||
16 | |||
17 | #define EFI_LOAD_ERROR 0x8000000000000001 | ||
18 | |||
19 | __INIT | ||
20 | |||
21 | /* | ||
22 | * We arrive here from the EFI boot manager with: | ||
23 | * | ||
24 | * * CPU in little-endian mode | ||
25 | * * MMU on with identity-mapped RAM | ||
26 | * * Icache and Dcache on | ||
27 | * | ||
28 | * We will most likely be running from some place other than where | ||
29 | * we want to be. The kernel image wants to be placed at TEXT_OFFSET | ||
30 | * from start of RAM. | ||
31 | */ | ||
32 | ENTRY(efi_stub_entry) | ||
33 | /* | ||
34 | * Create a stack frame to save FP/LR with extra space | ||
35 | * for image_addr variable passed to efi_entry(). | ||
36 | */ | ||
37 | stp x29, x30, [sp, #-32]! | ||
38 | |||
39 | /* | ||
40 | * Call efi_entry to do the real work. | ||
41 | * x0 and x1 are already set up by firmware. Current runtime | ||
42 | * address of image is calculated and passed via *image_addr. | ||
43 | * | ||
44 | * unsigned long efi_entry(void *handle, | ||
45 | * efi_system_table_t *sys_table, | ||
46 | * unsigned long *image_addr) ; | ||
47 | */ | ||
48 | adrp x8, _text | ||
49 | add x8, x8, #:lo12:_text | ||
50 | add x2, sp, 16 | ||
51 | str x8, [x2] | ||
52 | bl efi_entry | ||
53 | cmn x0, #1 | ||
54 | b.eq efi_load_fail | ||
55 | |||
56 | /* | ||
57 | * efi_entry() will have relocated the kernel image if necessary | ||
58 | * and we return here with device tree address in x0 and the kernel | ||
59 | * entry point stored at *image_addr. Save those values in registers | ||
60 | * which are callee preserved. | ||
61 | */ | ||
62 | mov x20, x0 // DTB address | ||
63 | ldr x0, [sp, #16] // relocated _text address | ||
64 | mov x21, x0 | ||
65 | |||
66 | /* | ||
67 | * Flush dcache covering current runtime addresses | ||
68 | * of kernel text/data. Then flush all of icache. | ||
69 | */ | ||
70 | adrp x1, _text | ||
71 | add x1, x1, #:lo12:_text | ||
72 | adrp x2, _edata | ||
73 | add x2, x2, #:lo12:_edata | ||
74 | sub x1, x2, x1 | ||
75 | |||
76 | bl __flush_dcache_area | ||
77 | ic ialluis | ||
78 | |||
79 | /* Turn off Dcache and MMU */ | ||
80 | mrs x0, CurrentEL | ||
81 | cmp x0, #PSR_MODE_EL2t | ||
82 | ccmp x0, #PSR_MODE_EL2h, #0x4, ne | ||
83 | b.ne 1f | ||
84 | mrs x0, sctlr_el2 | ||
85 | bic x0, x0, #1 << 0 // clear SCTLR.M | ||
86 | bic x0, x0, #1 << 2 // clear SCTLR.C | ||
87 | msr sctlr_el2, x0 | ||
88 | isb | ||
89 | b 2f | ||
90 | 1: | ||
91 | mrs x0, sctlr_el1 | ||
92 | bic x0, x0, #1 << 0 // clear SCTLR.M | ||
93 | bic x0, x0, #1 << 2 // clear SCTLR.C | ||
94 | msr sctlr_el1, x0 | ||
95 | isb | ||
96 | 2: | ||
97 | /* Jump to kernel entry point */ | ||
98 | mov x0, x20 | ||
99 | mov x1, xzr | ||
100 | mov x2, xzr | ||
101 | mov x3, xzr | ||
102 | br x21 | ||
103 | |||
104 | efi_load_fail: | ||
105 | mov x0, #EFI_LOAD_ERROR | ||
106 | ldp x29, x30, [sp], #32 | ||
107 | ret | ||
108 | |||
109 | ENDPROC(efi_stub_entry) | ||
diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c new file mode 100644 index 000000000000..60e98a639ac5 --- /dev/null +++ b/arch/arm64/kernel/efi-stub.c | |||
@@ -0,0 +1,81 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2013, 2014 Linaro Ltd; <roy.franz@linaro.org> | ||
3 | * | ||
4 | * This file implements the EFI boot stub for the arm64 kernel. | ||
5 | * Adapted from ARM version by Mark Salter <msalter@redhat.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | */ | ||
12 | #include <linux/efi.h> | ||
13 | #include <linux/libfdt.h> | ||
14 | #include <asm/sections.h> | ||
15 | #include <generated/compile.h> | ||
16 | #include <generated/utsrelease.h> | ||
17 | |||
18 | /* | ||
19 | * AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from | ||
20 | * start of kernel and may not cross a 2MiB boundary. We set alignment to | ||
21 | * 2MiB so we know it won't cross a 2MiB boundary. | ||
22 | */ | ||
23 | #define EFI_FDT_ALIGN SZ_2M /* used by allocate_new_fdt_and_exit_boot() */ | ||
24 | #define MAX_FDT_OFFSET SZ_512M | ||
25 | |||
26 | #define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__) | ||
27 | |||
28 | static void efi_char16_printk(efi_system_table_t *sys_table_arg, | ||
29 | efi_char16_t *str); | ||
30 | |||
31 | static efi_status_t efi_open_volume(efi_system_table_t *sys_table, | ||
32 | void *__image, void **__fh); | ||
33 | static efi_status_t efi_file_close(void *handle); | ||
34 | |||
35 | static efi_status_t | ||
36 | efi_file_read(void *handle, unsigned long *size, void *addr); | ||
37 | |||
38 | static efi_status_t | ||
39 | efi_file_size(efi_system_table_t *sys_table, void *__fh, | ||
40 | efi_char16_t *filename_16, void **handle, u64 *file_sz); | ||
41 | |||
42 | /* Include shared EFI stub code */ | ||
43 | #include "../../../drivers/firmware/efi/efi-stub-helper.c" | ||
44 | #include "../../../drivers/firmware/efi/fdt.c" | ||
45 | #include "../../../drivers/firmware/efi/arm-stub.c" | ||
46 | |||
47 | |||
48 | static efi_status_t handle_kernel_image(efi_system_table_t *sys_table, | ||
49 | unsigned long *image_addr, | ||
50 | unsigned long *image_size, | ||
51 | unsigned long *reserve_addr, | ||
52 | unsigned long *reserve_size, | ||
53 | unsigned long dram_base, | ||
54 | efi_loaded_image_t *image) | ||
55 | { | ||
56 | efi_status_t status; | ||
57 | unsigned long kernel_size, kernel_memsize = 0; | ||
58 | |||
59 | /* Relocate the image, if required. */ | ||
60 | kernel_size = _edata - _text; | ||
61 | if (*image_addr != (dram_base + TEXT_OFFSET)) { | ||
62 | kernel_memsize = kernel_size + (_end - _edata); | ||
63 | status = efi_relocate_kernel(sys_table, image_addr, | ||
64 | kernel_size, kernel_memsize, | ||
65 | dram_base + TEXT_OFFSET, | ||
66 | PAGE_SIZE); | ||
67 | if (status != EFI_SUCCESS) { | ||
68 | pr_efi_err(sys_table, "Failed to relocate kernel\n"); | ||
69 | return status; | ||
70 | } | ||
71 | if (*image_addr != (dram_base + TEXT_OFFSET)) { | ||
72 | pr_efi_err(sys_table, "Failed to alloc kernel memory\n"); | ||
73 | efi_free(sys_table, kernel_memsize, *image_addr); | ||
74 | return EFI_ERROR; | ||
75 | } | ||
76 | *image_size = kernel_memsize; | ||
77 | } | ||
78 | |||
79 | |||
80 | return EFI_SUCCESS; | ||
81 | } | ||
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 0fd565000772..738291b5be29 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S | |||
@@ -108,8 +108,18 @@ | |||
108 | /* | 108 | /* |
109 | * DO NOT MODIFY. Image header expected by Linux boot-loaders. | 109 | * DO NOT MODIFY. Image header expected by Linux boot-loaders. |
110 | */ | 110 | */ |
111 | #ifdef CONFIG_EFI | ||
112 | efi_head: | ||
113 | /* | ||
114 | * This add instruction has no meaningful effect except that | ||
115 | * its opcode forms the magic "MZ" signature required by UEFI. | ||
116 | */ | ||
117 | add x13, x18, #0x16 | ||
118 | b stext | ||
119 | #else | ||
111 | b stext // branch to kernel start, magic | 120 | b stext // branch to kernel start, magic |
112 | .long 0 // reserved | 121 | .long 0 // reserved |
122 | #endif | ||
113 | .quad TEXT_OFFSET // Image load offset from start of RAM | 123 | .quad TEXT_OFFSET // Image load offset from start of RAM |
114 | .quad 0 // reserved | 124 | .quad 0 // reserved |
115 | .quad 0 // reserved | 125 | .quad 0 // reserved |
@@ -120,7 +130,109 @@ | |||
120 | .byte 0x52 | 130 | .byte 0x52 |
121 | .byte 0x4d | 131 | .byte 0x4d |
122 | .byte 0x64 | 132 | .byte 0x64 |
133 | #ifdef CONFIG_EFI | ||
134 | .long pe_header - efi_head // Offset to the PE header. | ||
135 | #else | ||
123 | .word 0 // reserved | 136 | .word 0 // reserved |
137 | #endif | ||
138 | |||
139 | #ifdef CONFIG_EFI | ||
140 | .align 3 | ||
141 | pe_header: | ||
142 | .ascii "PE" | ||
143 | .short 0 | ||
144 | coff_header: | ||
145 | .short 0xaa64 // AArch64 | ||
146 | .short 2 // nr_sections | ||
147 | .long 0 // TimeDateStamp | ||
148 | .long 0 // PointerToSymbolTable | ||
149 | .long 1 // NumberOfSymbols | ||
150 | .short section_table - optional_header // SizeOfOptionalHeader | ||
151 | .short 0x206 // Characteristics. | ||
152 | // IMAGE_FILE_DEBUG_STRIPPED | | ||
153 | // IMAGE_FILE_EXECUTABLE_IMAGE | | ||
154 | // IMAGE_FILE_LINE_NUMS_STRIPPED | ||
155 | optional_header: | ||
156 | .short 0x20b // PE32+ format | ||
157 | .byte 0x02 // MajorLinkerVersion | ||
158 | .byte 0x14 // MinorLinkerVersion | ||
159 | .long _edata - stext // SizeOfCode | ||
160 | .long 0 // SizeOfInitializedData | ||
161 | .long 0 // SizeOfUninitializedData | ||
162 | .long efi_stub_entry - efi_head // AddressOfEntryPoint | ||
163 | .long stext - efi_head // BaseOfCode | ||
164 | |||
165 | extra_header_fields: | ||
166 | .quad 0 // ImageBase | ||
167 | .long 0x20 // SectionAlignment | ||
168 | .long 0x8 // FileAlignment | ||
169 | .short 0 // MajorOperatingSystemVersion | ||
170 | .short 0 // MinorOperatingSystemVersion | ||
171 | .short 0 // MajorImageVersion | ||
172 | .short 0 // MinorImageVersion | ||
173 | .short 0 // MajorSubsystemVersion | ||
174 | .short 0 // MinorSubsystemVersion | ||
175 | .long 0 // Win32VersionValue | ||
176 | |||
177 | .long _edata - efi_head // SizeOfImage | ||
178 | |||
179 | // Everything before the kernel image is considered part of the header | ||
180 | .long stext - efi_head // SizeOfHeaders | ||
181 | .long 0 // CheckSum | ||
182 | .short 0xa // Subsystem (EFI application) | ||
183 | .short 0 // DllCharacteristics | ||
184 | .quad 0 // SizeOfStackReserve | ||
185 | .quad 0 // SizeOfStackCommit | ||
186 | .quad 0 // SizeOfHeapReserve | ||
187 | .quad 0 // SizeOfHeapCommit | ||
188 | .long 0 // LoaderFlags | ||
189 | .long 0x6 // NumberOfRvaAndSizes | ||
190 | |||
191 | .quad 0 // ExportTable | ||
192 | .quad 0 // ImportTable | ||
193 | .quad 0 // ResourceTable | ||
194 | .quad 0 // ExceptionTable | ||
195 | .quad 0 // CertificationTable | ||
196 | .quad 0 // BaseRelocationTable | ||
197 | |||
198 | // Section table | ||
199 | section_table: | ||
200 | |||
201 | /* | ||
202 | * The EFI application loader requires a relocation section | ||
203 | * because EFI applications must be relocatable. This is a | ||
204 | * dummy section as far as we are concerned. | ||
205 | */ | ||
206 | .ascii ".reloc" | ||
207 | .byte 0 | ||
208 | .byte 0 // end of 0 padding of section name | ||
209 | .long 0 | ||
210 | .long 0 | ||
211 | .long 0 // SizeOfRawData | ||
212 | .long 0 // PointerToRawData | ||
213 | .long 0 // PointerToRelocations | ||
214 | .long 0 // PointerToLineNumbers | ||
215 | .short 0 // NumberOfRelocations | ||
216 | .short 0 // NumberOfLineNumbers | ||
217 | .long 0x42100040 // Characteristics (section flags) | ||
218 | |||
219 | |||
220 | .ascii ".text" | ||
221 | .byte 0 | ||
222 | .byte 0 | ||
223 | .byte 0 // end of 0 padding of section name | ||
224 | .long _edata - stext // VirtualSize | ||
225 | .long stext - efi_head // VirtualAddress | ||
226 | .long _edata - stext // SizeOfRawData | ||
227 | .long stext - efi_head // PointerToRawData | ||
228 | |||
229 | .long 0 // PointerToRelocations (0 for executables) | ||
230 | .long 0 // PointerToLineNumbers (0 for executables) | ||
231 | .short 0 // NumberOfRelocations (0 for executables) | ||
232 | .short 0 // NumberOfLineNumbers (0 for executables) | ||
233 | .long 0xe0500020 // Characteristics (section flags) | ||
234 | .align 5 | ||
235 | #endif | ||
124 | 236 | ||
125 | ENTRY(stext) | 237 | ENTRY(stext) |
126 | mov x21, x0 // x21=FDT | 238 | mov x21, x0 // x21=FDT |