Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609eaf07 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

arm/efi: Replace open coded constants with symbolic ones 



Replace the various open coded constants in the EFI PE/COFF header with
definitions from pe.h, or expressions based on local symbols.

Signed-off-by: default avatarArd 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-11-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 574cea72

arch/arm/boot/compressed/efi-header.S

+67 −61
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2015 Linaro Ltd

 * Copyright (C) 2013-2017 Linaro Ltd

 * Authors: Roy Franz <roy.franz@linaro.org>

 *          Ard Biesheuvel <ard.biesheuvel@linaro.org>

 *
@@ -8,6 +8,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/pe.h>

#include <linux/sizes.h>



		.macro	__nop

#ifdef CONFIG_EFI_STUB

		@ This is almost but not quite a NOP, since it does clobber the
@@ -15,7 +18,7 @@ 
		@ 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

		.inst	MZ_MAGIC | (0x1310 << 16)	@ tstne r0, #0x4d000

#else

 AR_CLASS(	mov	r0, r0		)

  M_CLASS(	nop.w			)
@@ -37,24 +40,22 @@ 
		.long	pe_header - start		@ Offset to the PE header.



pe_header:

		.ascii	"PE\0\0"

		.long	PE_MAGIC



coff_header:

		.short	0x01c2			@ ARM or Thumb

		.short	1			@ nr_sections

		.short	IMAGE_FILE_MACHINE_THUMB	@ Machine

		.short	section_count			@ NumberOfSections

		.long	0 				@ TimeDateStamp

		.long	0				@ PointerToSymbolTable

		.long	0				@ 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

		.short	section_table - optional_header	@ SizeOfOptionalHeader

		.short	IMAGE_FILE_32BIT_MACHINE | \

			IMAGE_FILE_DEBUG_STRIPPED | \

			IMAGE_FILE_EXECUTABLE_IMAGE | \

			IMAGE_FILE_LINE_NUMS_STRIPPED	@ Characteristics



optional_header:

		.short	0x10b			@ PE32 format

		.short	PE_OPT_MAGIC_PE32		@ PE32 format

		.byte	0x02				@ MajorLinkerVersion

		.byte	0x14				@ MinorLinkerVersion

		.long	_end - __efi_start		@ SizeOfCode
@@ -62,14 +63,14 @@ optional_header: 
		.long	0				@ SizeOfUninitializedData

		.long	efi_stub_entry - start		@ AddressOfEntryPoint

		.long	start_offset			@ BaseOfCode

		.long	0			@ data

		.long	0				@ BaseOfData



extra_header_fields:

		.long	0				@ ImageBase

		.long	0x200			@ SectionAlignment

		.long	0x200			@ FileAlignment

		.short	0			@ MajorOperatingSystemVersion

		.short	0			@ MinorOperatingSystemVersion

		.long	SZ_512				@ SectionAlignment

		.long	SZ_512				@ FileAlignment

		.short	0				@ MajorOsVersion

		.short	0				@ MinorOsVersion

		.short	0				@ MajorImageVersion

		.short	0				@ MinorImageVersion

		.short	0				@ MajorSubsystemVersion
@@ -79,14 +80,14 @@ extra_header_fields: 
		.long	_end - start			@ SizeOfImage

		.long	start_offset			@ SizeOfHeaders

		.long	0				@ CheckSum

		.short	0xa			@ Subsystem (EFI application)

		.short	IMAGE_SUBSYSTEM_EFI_APPLICATION	@ Subsystem

		.short	0				@ DllCharacteristics

		.long	0				@ SizeOfStackReserve

		.long	0				@ SizeOfStackCommit

		.long	0				@ SizeOfHeapReserve

		.long	0				@ SizeOfHeapCommit

		.long	0				@ LoaderFlags

		.long	0x6			@ NumberOfRvaAndSizes

		.long	(section_table - .) / 8		@ NumberOfRvaAndSizes



		.quad	0				@ ExportTable

		.quad	0				@ ImportTable
@@ -105,7 +106,12 @@ section_table: 
		.long	0				@ PointerToLineNumbers

		.short	0				@ NumberOfRelocations

		.short	0				@ NumberOfLineNumbers

		.long	0xe0000020		@ Characteristics

		.long	IMAGE_SCN_CNT_CODE | \

			IMAGE_SCN_MEM_READ | \

			IMAGE_SCN_MEM_WRITE | \

			IMAGE_SCN_MEM_EXECUTE		@ Characteristics



		.set	section_count, (. - section_table) / 40



		.align	9

__efi_start: