Commit 7a05293a authored by Paul Cercueil's avatar Paul Cercueil Committed by Thomas Bogendoerfer
Browse files

MIPS: boot/compressed: Copy DTB to aligned address 



Since 5.12-rc1, the Device Tree blob must now be properly aligned.

Therefore, the decompress routine must be careful to copy the blob at
the next aligned address after the kernel image.

This commit fixes the kernel sometimes not booting with a Device Tree
blob appended to it.

Fixes: 79edff12 ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9")
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent a38fd874

arch/mips/boot/compressed/decompress.c

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <asm/addrspace.h>

#include <asm/unaligned.h>

#include <asm-generic/vmlinux.lds.h>



/*

 * These two variables specify the free mem region
@@ -120,6 +121,13 @@ void decompress_kernel(unsigned long boot_heap_start) 
		/* last four bytes is always image size in little endian */

		image_size = get_unaligned_le32((void *)&__image_end - 4);



		/* The device tree's address must be properly aligned  */

		image_size = ALIGN(image_size, STRUCT_ALIGNMENT);



		puts("Copy device tree to address  ");

		puthex(VMLINUX_LOAD_ADDRESS_ULL + image_size);

		puts("\n");



		/* copy dtb to where the booted kernel will expect it */

		memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,

		       __appended_dtb, dtb_size);

arch/mips/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ SECTIONS 
	}



#ifdef CONFIG_MIPS_ELF_APPENDED_DTB

	STRUCT_ALIGN();

	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {

		*(.appended_dtb)

		KEEP(*(.appended_dtb))
@@ -172,6 +173,7 @@ SECTIONS 
#endif



#ifdef CONFIG_MIPS_RAW_APPENDED_DTB

	STRUCT_ALIGN();

	__appended_dtb = .;

	/* leave space for appended DTB */

	. += 0x100000;