2015-09-24 11:17:54 +08:00
|
|
|
/*
|
|
|
|
|
* 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
|
ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nop
Commit 06a4b6d009a1 ("ARM: 8677/1: boot/compressed: fix decompressor
header layout for v7-M") fixed an issue in the layout of the header
of the compressed kernel image that was caused by the assembler
emitting narrow opcodes for 'mov r0, r0', and for this reason, the
mnemonic was updated to use the W() macro, which will append the .w
suffix (which forces a wide encoding) if required, i.e., when building
the kernel in Thumb2 mode.
However, this failed to take into account that on Thumb2 kernels built
for CPUs that are also ARM capable, the entry point is entered in ARM
mode, and so the instructions emitted here will be ARM instructions
that only exist in a wide encoding to begin with, which is why the
assembler rejects the .w suffix here and aborts the build with the
following message:
head.S: Assembler messages:
head.S:132: Error: width suffixes are invalid in ARM mode -- `mov.w r0,r0'
So replace the W(mov) with separate ARM and Thumb2 instructions, where
the latter will only be used for THUMB2_ONLY builds.
Fixes: 06a4b6d009a1 ("ARM: 8677/1: boot/compressed: fix decompressor ...")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2017-06-09 17:14:53 +08:00
|
|
|
AR_CLASS( mov r0, r0 )
|
|
|
|
|
M_CLASS( nop.w )
|
2015-09-24 11:17:54 +08:00
|
|
|
#endif
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
.macro __EFI_HEADER
|
|
|
|
|
#ifdef CONFIG_EFI_STUB
|
|
|
|
|
.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
|
arm/efi: Remove pointless dummy .reloc section
The kernel's EFI PE/COFF header contains a dummy .reloc section, and
an explanatory comment that claims that this is required for the EFI
application loader to accept the Image as a relocatable image (i.e.,
one that can be loaded at any offset and fixed up in place)
This was inherited from the x86 implementation, which has elaborate host
tooling to mangle the PE/COFF header post-link time, and which populates
the .reloc section with a single dummy base relocation. On ARM, no such
tooling exists, and the .reloc section remains empty, and is never even
exposed via the BaseRelocationTable directory entry, which is where the
PE/COFF loader looks for it.
The PE/COFF spec is unclear about relocatable images that do not require
any fixups, but the EDK2 implementation, which is the de facto reference
for PE/COFF in the UEFI space, clearly does not care, and explicitly
mentions (in a comment) that relocatable images with no base relocations
are perfectly fine, as long as they don't have the RELOCS_STRIPPED
attribute set (which is not the case for our PE/COFF image)
So simply remove the .reloc section altogether.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20170818194947.19347-10-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-08-19 03:49:42 +08:00
|
|
|
.short 1 @ nr_sections
|
2015-09-24 11:17:54 +08:00
|
|
|
.long 0 @ TimeDateStamp
|
|
|
|
|
.long 0 @ PointerToSymbolTable
|
2017-08-19 03:49:41 +08:00
|
|
|
.long 0 @ NumberOfSymbols
|
2015-09-24 11:17:54 +08:00
|
|
|
.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:
|
|
|
|
|
.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
|
2017-08-19 03:49:41 +08:00
|
|
|
.long 0xe0000020 @ Characteristics
|
2015-09-24 11:17:54 +08:00
|
|
|
|
|
|
|
|
.align 9
|
|
|
|
|
__efi_start:
|
|
|
|
|
#endif
|
|
|
|
|
.endm
|