Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbdF0TW3 (ORCPT ); Tue, 27 Jun 2017 15:22:29 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33231 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbdF0TWZ (ORCPT ); Tue, 27 Jun 2017 15:22:25 -0400 From: Karl Beldan X-Google-Original-From: Karl Beldan To: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org, Karl Beldan , stable@vger.kernel.org, Ralf Baechle , Jonas Gorski Subject: [RESEND PATCH] MIPS: head: Reorder instructions missing a delay slot Date: Tue, 27 Jun 2017 19:22:16 +0000 Message-Id: <20170627192216.29364-1-karl.beldan+oss@gmail.com> X-Mailer: git-send-email 2.10.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 927 Lines: 31 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") Cc: Cc: Ralf Baechle Cc: Jonas Gorski Signed-off-by: Karl Beldan --- arch/mips/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index cf05220..d1bb506 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: -- 2.10.1