[Top] [All Lists]

[PATCH] MIPS: Enable interrupts before WAIT instruction.

Subject: [PATCH] MIPS: Enable interrupts before WAIT instruction.
From: David Daney <>
Date: Thu, 2 May 2013 13:48:12 -0700
Cc: Linus Torvalds <>,, David Daney <>, Thomas Gleixner <>, Jonas Gorski <>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed;; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=5maUXPnDKS1DfnlypYrkitKfZ4D/HNh5ZKLOc1/hOFw=; b=Y/4ftL9QwjTj/oBxPkZ5Bn5QrF7RoEDVx2zKza9Gqo3eSb32VdFcmDAYi2bOcN+cr/ LZX86H3o0Wj+IGWIzr1Efx7fO9PyfBgnSgg46DI+bPOZ8X7UWMcudCNerPi7RvKz4y0X elK8TQNqfoUP3v4zy9EKMPy2m0I/lWW09tXg+o6exIc1AYZEMRqVVdWTxL0u0O4HR/9F LrXrim4eabSMPEEPVBkLwzLB180Oob7qj7J+oA7ykxz59h264coTae1z+TUKOjM/7tZR K10acTKICzUq9F8HkdNfbexBHUwkbzqkwW1MX/epwJ80x4NG8tmsHGMriiCDv1ra3ALq ckwQ==
In-reply-to: <>
List-archive: <>
List-help: <>
List-id: linux-mips <>
List-owner: <>
List-post: <>
List-software: Ecartis version 1.0.0
List-subscribe: <>
List-unsubscribe: <>
Original-recipient: rfc822;
References: <>
From: David Daney <>

As noted by Thomas Gleixner:

   commit cdbedc61c8 (mips: Use generic idle loop) broke MIPS as I did
   not realize that MIPS wants to invoke the wait instructions with
   interrupts enabled.

Instead of enabling interrupts in arch_cpu_idle() as Thomas' initial
patch does, we follow Linus' suggestion of doing it in the assembly
code to prevent the compiler from rearranging things.

Signed-off-by: David Daney <>
Reported-by: EunBong Song <>
Cc: Thomas Gleixner <>
Cc: Jonas Gorski <>

This is only very lightly tested, we need more testing before
declaring it the definitive fix.

 arch/mips/kernel/genex.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index ecb347c..57cda9a 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -132,12 +132,13 @@ LEAF(r4k_wait)
        .set    noreorder
        /* start of rollback region */
        LONG_L  t0, TI_FLAGS($28)
-       nop
        andi    t0, _TIF_NEED_RESCHED
        bnez    t0, 1f
-       nop
-       nop
+       /* Enable interrupts so WAIT will complete */
+       mfc0    t0, CP0_STATUS
+       ori     t0, ST0_IE
+       mtc0    t0, CP0_STATUS
        .set    mips3
        /* end of rollback region (the region size must be power of two) */

<Prev in Thread] Current Thread [Next in Thread>