diff options
| author | Karl Beldan <[email protected]> | 2017-06-27 19:22:16 +0000 |
|---|---|---|
| committer | Ralf Baechle <[email protected]> | 2017-06-27 23:35:21 +0200 |
| commit | 25d8b92e0af75d72ce8b99e63e5a449cc0888efa (patch) | |
| tree | 72fa5534d97c8d3b7d03570278a7529cfc370aab | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
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: 15f37e158892 ("MIPS: store the appended dtb address in a variable")
Signed-off-by: Karl Beldan <[email protected]>
Reviewed-by: James Hogan <[email protected]>
Cc: Jonas Gorski <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/16614/
Signed-off-by: Ralf Baechle <[email protected]>
| -rw-r--r-- | arch/mips/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index cf052204eb0a..d1bb506adc10 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -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: |