All of
 help / color / mirror / Atom feed
From: Thomas Bogendoerfer <>
To: Kevin Hao <>
Subject: Re: [PATCH] MIPS: OCTEON: Fix the boot broken when using built-in DTB
Date: Mon, 18 Jan 2021 19:24:19 +0100	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Sat, Jan 09, 2021 at 07:49:58PM +0800, Kevin Hao wrote:
> 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. Add more checks to judge if we
> really use built-in DTB or not.
> Fixed: 37e5c69ffd41 ("MIPS: head.S: Init fw_passed_dtb to builtin DTB")
> Cc:
> Signed-off-by: Kevin Hao <>
> ---
>  arch/mips/cavium-octeon/setup.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
> index 982826ba0ef7..41d9c80e9666 100644
> --- a/arch/mips/cavium-octeon/setup.c
> +++ b/arch/mips/cavium-octeon/setup.c
> @@ -1149,7 +1149,8 @@ void __init device_tree_init(void)
>  	bool do_prune;
>  	bool fill_mac;
> -	if (fw_passed_dtb) {
> +	if (fw_passed_dtb && (fw_passed_dtb != (ulong)&__dtb_octeon_68xx_begin) &&
> +	    (fw_passed_dtb != (ulong)&__dtb_octeon_3xxx_begin)) {

well, if someone add a third dtb do the builtin DTBs, this might fail
again. Let's fix it for real...

>  		fdt = (void *)fw_passed_dtb;
>  		do_prune = false;
>  		fill_mac = true;

.... IMHO the real bug is d9df9fb901d2 MIPS: Octeon: Remove special handling
of CONFIG_MIPS_ELF_APPENDED_DTB=y. I'm tending to simply revert that commit.
A different option would be to not place the two __dtb_octeon dtbs into the
builtin dtb section, which looks like more work for not much gain...


Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

  reply	other threads:[~2021-01-18 18:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-09 11:49 [PATCH] MIPS: OCTEON: Fix the boot broken when using built-in DTB Kevin Hao
2021-01-18 18:24 ` Thomas Bogendoerfer [this message]
2021-01-19 10:56   ` Kevin Hao
2021-01-20 17:39     ` Thomas Bogendoerfer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.