efi_loader: fix SectionAlignment, FileAlignment

The alignment of sections in the EFI binaries generated by U-Boot is
incorrect.

According to the PE-COFF specification [1] the minimum value for
FileAlignment is 512. If the value of SectionAlignment is
less then the page size, it must equal FileAlignment.

Let's set both values to 512 for the ARM and RISC-V architectures.

[1] https://docs.microsoft.com/en-us/windows/win32/debug/pe-format

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S
index 492195f..7f38465 100644 (file)
--- a/arch/arm/lib/crt0_aarch64_efi.S
+++ b/arch/arm/lib/crt0_aarch64_efi.S
@@ -47,8 +47,8 @@ optional_header:
 
 extra_header_fields:
        .quad   0                               /* ImageBase */
-       .long   0x20                            /* SectionAlignment */
-       .long   0x8                             /* FileAlignment */
+       .long   0x200                           /* SectionAlignment */
+       .long   0x200                           /* FileAlignment */
        .short  0                               /* MajorOperatingSystemVersion */
        .short  0                               /* MinorOperatingSystemVersion */
        .short  0                               /* MajorImageVersion */
@@ -117,6 +117,7 @@ section_table:
        .short  0               /* NumberOfLineNumbers  (0 for executables) */
        .long   0xe0500020      /* Characteristics (section flags) */
 
+       .align          9
 _start:
        stp             x29, x30, [sp, #-32]!
        mov             x29, sp

diff --git a/arch/arm/lib/crt0_arm_efi.S b/arch/arm/lib/crt0_arm_efi.S
index cc8a115..75ee37b 100644 (file)
--- a/arch/arm/lib/crt0_arm_efi.S
+++ b/arch/arm/lib/crt0_arm_efi.S
@@ -47,8 +47,8 @@ optional_header:
 
 extra_header_fields:
        .long   0                               /* image_base */
-       .long   0x20                            /* SectionAlignment */
-       .long   0x8                             /* FileAlignment */
+       .long   0x200                           /* SectionAlignment */
+       .long   0x200                           /* FileAlignment */
        .short  0                               /* MajorOperatingSystemVersion */
        .short  0                               /* MinorOperatingSystemVersion */
        .short  0                               /* MajorImageVersion */
@@ -115,6 +115,7 @@ section_table:
        .short  0               /* NumberOfLineNumbers  (0 for executables) */
        .long   0xe0500020      /* Characteristics (section flags) */
 
+       .align          9
 _start:
        stmfd           sp!, {r0-r2, lr}
 

diff --git a/arch/arm/lib/elf_aarch64_efi.lds b/arch/arm/lib/elf_aarch64_efi.lds
index 90af469..c0604da 100644 (file)
--- a/arch/arm/lib/elf_aarch64_efi.lds
+++ b/arch/arm/lib/elf_aarch64_efi.lds
@@ -18,7 +18,7 @@ SECTIONS
                *(.gnu.linkonce.t.*)
                *(.srodata)
                *(.rodata*)
-               . = ALIGN(16);
+               . = ALIGN(512);
        }
        _etext = .;
        _text_size = . - _text;
@@ -44,7 +44,7 @@ SECTIONS
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(16);
+               . = ALIGN(512);
                _bss_end = .;
                _edata = .;
        }

diff --git a/arch/arm/lib/elf_arm_efi.lds b/arch/arm/lib/elf_arm_efi.lds
index d6d742e..767ebda 100644 (file)
--- a/arch/arm/lib/elf_arm_efi.lds
+++ b/arch/arm/lib/elf_arm_efi.lds
@@ -18,7 +18,7 @@ SECTIONS
                *(.gnu.linkonce.t.*)
                *(.srodata)
                *(.rodata*)
-               . = ALIGN(16);
+               . = ALIGN(512);
        }
        _etext = .;
        _text_size = . - _text;
@@ -44,7 +44,7 @@ SECTIONS
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(16);
+               . = ALIGN(512);
                _bss_end = .;
                _edata = .;
        }

diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S
index 3e62e8e..a01e08a 100644 (file)
--- a/arch/riscv/lib/crt0_riscv_efi.S
+++ b/arch/riscv/lib/crt0_riscv_efi.S
@@ -71,8 +71,8 @@ extra_header_fields:
 #else
        .quad   0                               /* ImageBase */
 #endif
-       .long   0x20                            /* SectionAlignment */
-       .long   0x8                             /* FileAlignment */
+       .long   0x200                           /* SectionAlignment */
+       .long   0x200                           /* FileAlignment */
        .short  0                               /* MajorOperatingSystemVersion */
        .short  0                               /* MinorOperatingSystemVersion */
        .short  1                               /* MajorImageVersion */
@@ -148,6 +148,7 @@ section_table:
        .short  0               /* NumberOfLineNumbers  (0 for executables) */
        .long   0xe0500020      /* Characteristics (section flags) */
 
+       .align  9
 _start:
        addi            sp, sp, -(SIZE_LONG * 3)
        SAVE_LONG(a0, 0)

diff --git a/arch/riscv/lib/elf_riscv32_efi.lds b/arch/riscv/lib/elf_riscv32_efi.lds
index 629705f..c3e0d20 100644 (file)
--- a/arch/riscv/lib/elf_riscv32_efi.lds
+++ b/arch/riscv/lib/elf_riscv32_efi.lds
@@ -20,7 +20,7 @@ SECTIONS
                *(.gnu.linkonce.t.*)
                *(.srodata)
                *(.rodata*)
-               . = ALIGN(16);
+               . = ALIGN(512);
        }
        _etext = .;
        _text_size = . - _text;
@@ -46,7 +46,7 @@ SECTIONS
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(16);
+               . = ALIGN(512);
                _bss_end = .;
                _edata = .;
        }

diff --git a/arch/riscv/lib/elf_riscv64_efi.lds b/arch/riscv/lib/elf_riscv64_efi.lds
index aece030..ecb9139 100644 (file)
--- a/arch/riscv/lib/elf_riscv64_efi.lds
+++ b/arch/riscv/lib/elf_riscv64_efi.lds
@@ -20,7 +20,7 @@ SECTIONS
                *(.gnu.linkonce.t.*)
                *(.srodata)
                *(.rodata*)
-               . = ALIGN(16);
+               . = ALIGN(512);
        }
        _etext = .;
        _text_size = . - _text;
@@ -46,7 +46,7 @@ SECTIONS
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(16);
+               . = ALIGN(512);
                _bss_end = .;
                _edata = .;
        }