]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
MIPS: head: Reorder instructions missing a delay slot
authorKarl Beldan <karl.beldan@gmail.com>
Tue, 27 Jun 2017 19:22:16 +0000 (19:22 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Jul 2017 12:41:38 +0000 (14:41 +0200)
commit9de0e07dfb9d6d479a3d48492902d8b9bb59eb4d
tree5e4ec64eb25f2ab5a507b1ff46717fc7f7f17cd7
parentc806e0188da8a36c141219bc7cf02de7803f974f
MIPS: head: Reorder instructions missing a delay slot

commit 25d8b92e0af75d72ce8b99e63e5a449cc0888efa upstream.

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: 15f37e158892 ("MIPS: store the appended dtb address in a variable")
Signed-off-by: Karl Beldan <karl.beldan+oss@gmail.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/16614/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/kernel/head.S