Hi Lucas.
On Mon, Dec 09, 2019 at 09:00:29AM +0100, Lucas Stach wrote:
> When using the RO_DATA_SECTION macro, all the individual components
> are put into the rodata section. As they now end up in the same
> section there is no alignment enforced between them anymore. This
> leads to unaligned start pointers when any of the components have a
> unaligned size. Enforce some alignment between them.
In the kernel we have:
#define ALIGN_FUNCTION() . = ALIGN(8)
#define STRUCT_ALIGNMENT 32
#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT)
Could we use something similar here?
Sam
>
> Fixes: c5d38e920101 (lds: Add and use RO_DATA_SECTION macro)
> Signed-off-by: Lucas Stach <d...@lynxeye.de>
> ---
> include/asm-generic/barebox.lds.h | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/include/asm-generic/barebox.lds.h
> b/include/asm-generic/barebox.lds.h
> index b6ca8eb2be27..113392d567fa 100644
> --- a/include/asm-generic/barebox.lds.h
> +++ b/include/asm-generic/barebox.lds.h
> @@ -17,6 +17,7 @@
> #endif
>
> #define BAREBOX_INITCALLS \
> + . = ALIGN(8); \
> __barebox_initcalls_start = .; \
> KEEP(*(.initcall.0)) \
> KEEP(*(.initcall.1)) \
> @@ -36,6 +37,7 @@
> __barebox_initcalls_end = .;
>
> #define BAREBOX_EXITCALLS \
> + . = ALIGN(8); \
> __barebox_exitcalls_start = .; \
> KEEP(*(.exitcall.0)) \
> KEEP(*(.exitcall.1)) \
> @@ -47,37 +49,44 @@
> __barebox_exitcalls_end = .;
>
> #define BAREBOX_CMDS \
> + . = ALIGN(8); \
> __barebox_cmd_start = .; \
> KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \
> __barebox_cmd_end = .;
>
> #define BAREBOX_RATP_CMDS \
> + . = ALIGN(8); \
> __barebox_ratp_cmd_start = .; \
> KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \
> __barebox_ratp_cmd_end = .;
>
> #define BAREBOX_SYMS \
> + . = ALIGN(8); \
> __usymtab_start = .; \
> KEEP(*(__usymtab)) \
> __usymtab_end = .;
>
> #define BAREBOX_MAGICVARS \
> + . = ALIGN(8); \
> __barebox_magicvar_start = .; \
> KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \
> __barebox_magicvar_end = .;
>
> #define BAREBOX_CLK_TABLE \
> + . = ALIGN(8); \
> __clk_of_table_start = .; \
> KEEP(*(.__clk_of_table)); \
> KEEP(*(.__clk_of_table_end)); \
> __clk_of_table_end = .;
>
> #define BAREBOX_DTB \
> + . = ALIGN(8); \
> __dtb_start = .; \
> KEEP(*(.dtb.rodata.*)); \
> __dtb_end = .;
>
> #define BAREBOX_IMD \
> + . = ALIGN(8); \
> KEEP(*(.barebox_imd_start)) \
> KEEP(*(.barebox_imd_1*)) \
> *(.barebox_imd_0*) \
> @@ -85,6 +94,7 @@
>
> #ifdef CONFIG_PCI
> #define BAREBOX_PCI_FIXUP \
> + . = ALIGN(8); \
> __start_pci_fixups_early = .; \
> KEEP(*(.pci_fixup_early)) \
> __end_pci_fixups_early = .; \
> @@ -99,6 +109,7 @@
> #endif
>
> #define BAREBOX_RSA_KEYS \
> + . = ALIGN(8); \
> __rsa_keys_start = .; \
> KEEP(*(.rsa_keys.rodata.*)); \
> __rsa_keys_end = .; \
> --
> 2.23.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
