| Message ID | 1405955785-13477-5-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, 21 Jul, at 05:16:19PM, Ard Biesheuvel wrote: > Similar to how text offset and kernel size are mangled to produce little > endian constants for the Image header regardless of the endianness of the > kernel, this adds a number of constants used in the EFI PE/COFF header which > can only be calculated (and byte swapped) by the linker. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > arch/arm64/kernel/image.h | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) Where is this file? I can't find it in Linus' tree.
On 30 July 2014 16:18, Matt Fleming <matt@console-pimps.org> wrote: > On Mon, 21 Jul, at 05:16:19PM, Ard Biesheuvel wrote: >> Similar to how text offset and kernel size are mangled to produce little >> endian constants for the Image header regardless of the endianness of the >> kernel, this adds a number of constants used in the EFI PE/COFF header which >> can only be calculated (and byte swapped) by the linker. >> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> --- >> arch/arm64/kernel/image.h | 16 +++++++++++++++- >> 1 file changed, 15 insertions(+), 1 deletion(-) > > Where is this file? I can't find it in Linus' tree. > Apologies, I failed to mention that this series depends on arm64 for-next/core https://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/log/?h=for-next/core
On Wed, Jul 30, 2014 at 03:18:05PM +0100, Matt Fleming wrote: > On Mon, 21 Jul, at 05:16:19PM, Ard Biesheuvel wrote: > > Similar to how text offset and kernel size are mangled to produce little > > endian constants for the Image header regardless of the endianness of the > > kernel, this adds a number of constants used in the EFI PE/COFF header which > > can only be calculated (and byte swapped) by the linker. > > > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > --- > > arch/arm64/kernel/image.h | 16 +++++++++++++++- > > 1 file changed, 15 insertions(+), 1 deletion(-) > > Where is this file? I can't find it in Linus' tree. It's queued in the arm64 tree for 3.17 (should also appear in -next at the moment). See commit a2c1d73b94ed ("arm64: Update the Image header"). Will
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index 8fae0756e175..f5a2f298810d 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -37,8 +37,10 @@ (((data) & 0x0000ff0000000000) >> 24) | \ (((data) & 0x00ff000000000000) >> 40) | \ (((data) & 0xff00000000000000) >> 56)) +#define DATA_LE32(data) (DATA_LE64(data) >> 32) #else #define DATA_LE64(data) ((data) & 0xffffffffffffffff) +#define DATA_LE32(data) ((data) & 0xffffffff) #endif #ifdef CONFIG_CPU_BIG_ENDIAN @@ -57,6 +59,18 @@ #define HEAD_SYMBOLS \ _kernel_size_le = DATA_LE64(_end - _text); \ _kernel_offset_le = DATA_LE64(TEXT_OFFSET); \ - _kernel_flags_le = DATA_LE64(__HEAD_FLAGS); + _kernel_flags_le = DATA_LE64(__HEAD_FLAGS); \ + EFI_HEAD_SYMBOLS + +#ifdef CONFIG_EFI +#define EFI_HEAD_SYMBOLS \ + _efi_stext_offset_le = DATA_LE32(stext_offset); \ + _efi_code_virtsize_le = DATA_LE32(_end - _text - stext_offset); \ + _efi_code_rawsize_le = DATA_LE32(_edata - _text - stext_offset); \ + _efi_image_size_le = DATA_LE32(_end - _text); \ + _efi_entry_point_le = DATA_LE32(efi_stub_entry - _text); +#else +#define EFI_HEAD_SYMBOLS +#endif #endif /* __ASM_IMAGE_H */
Similar to how text offset and kernel size are mangled to produce little endian constants for the Image header regardless of the endianness of the kernel, this adds a number of constants used in the EFI PE/COFF header which can only be calculated (and byte swapped) by the linker. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/kernel/image.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)