Revert "MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y"
PATCH v2 1/1 Revert "MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y"
This reverts commit d9df9fb901d25b941ab2cfb5b570d91fb2abf7a3.
For the OCTEON boards, it need to patch the built-in DTB before using it. Previously it judges if it is a built-in DTB by checking fw_passed_dtb. But after commit 37e5c69ffd41 ("MIPS: head.S: Init fw_passed_dtb to builtin DTB", the fw_passed_dtb is initialized even when using built-in DTB. This causes the OCTEON boards boot broken due to an unpatched built-in DTB is used. Revert the commit d9df9fb901d2 to restore the codes before the fw_passed_dtb is used and then fix this issue.
Fixed: 37e5c69ffd41 ("MIPS: head.S: Init fw_passed_dtb to builtin DTB")
--- arch/mips/cavium-octeon/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/mips/cavium-octeon/setup.c +6 -3
@@ -1149,12 +1149,15 @@ void __init device_tree_init(void)bool do_prune;bool fill_mac; -if (fw_passed_dtb) { - fdt = (void *)fw_passed_dtb; +#ifdef CONFIG_MIPS_ELF_APPENDED_DTB +if (!fdt_check_header (&__appended_dtb)) { + fdt = &__appended_dtb; do_prune = false; fill_mac = true;pr_info ("Using appended Device Tree.\n" ); - }else if (octeon_bootinfo->minor_version >=3 && octeon_bootinfo->fdt_addr) { + } else +#endif +if (octeon_bootinfo->minor_version >=3 && octeon_bootinfo->fdt_addr) { fdt =phys_to_virt (octeon_bootinfo->fdt_addr);if (fdt_check_header (fdt))panic ("Corrupt Device Tree passed to kernel." );
Signature · 1 line
2.29.2
Quoted 11 lines · Kevin Hao
This reverts commit
d9df9fb901d25b941ab2cfb5b570d91fb2abf7a3.For the OCTEON boards, it need to patch the built-in DTB before using it. Previously it judges if it is a built-in DTB by checking
fw_passed_dtb. But after commit37e5c69ffd41("MIPS:head.S: Initfw_passed_dtbto builtin DTB", thefw_passed_dtbis initialized even when using built-in DTB. This causes the OCTEON boards boot broken due to an unpatched built-in DTB is used. Revert the commitd9df9fb901d2to restore the codes before thefw_passed_dtbis used and then fix this issue.
Quoted 7 lines
Fixed:
37e5c69ffd41("MIPS:head.S: Initfw_passed_dtbto builtin DTB")Suggested-by Thomas Bogendoerfer <[email protected]>Signed-off-by Kevin Hao <[email protected]>--- arch/mips/cavium-octeon/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]