On Tue, Jan 19, 2021 at 07:15:31PM +0800, Kevin Hao wrote: > 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") > Cc: stable@xxxxxxxxxxxxxxx > Suggested-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> > Signed-off-by: Kevin Hao <haokexin@xxxxxxxxx> > --- > arch/mips/cavium-octeon/setup.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) applied to mips-next. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]