Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25d8b92e authored by Karl Beldan's avatar Karl Beldan Committed by Ralf Baechle
Browse files

MIPS: head: Reorder instructions missing a delay slot



In this sequence the 'move' is assumed in the delay slot of the 'beq',
but head.S is in reorder mode and the former gets pushed one 'nop'
farther by the assembler.

The corrected behavior made booting with an UHI supplied dtb erratic.

Fixes: 15f37e15 ("MIPS: store the appended dtb address in a variable")
Signed-off-by: default avatarKarl Beldan <karl.beldan+oss@gmail.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/16614/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c0bc126f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ NESTED(kernel_entry, 16, sp) # kernel entry point
	beq		t0, t1, dtb_found
#endif
	li		t1, -2
	beq		a0, t1, dtb_found
	move		t2, a1
	beq		a0, t1, dtb_found

	li		t2, 0
dtb_found: