Patch "metag: Fix __cmpxchg_u32 asm constraint for CMP" has been added to the 4.7-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-08-18 12:48:08
This is a note to let you know that I've just added the patch titled
metag: Fix __cmpxchg_u32 asm constraint for CMP
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
metag-fix-__cmpxchg_u32-asm-constraint-for-cmp.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 6154c187b97ee7513046bb4eb317a89f738f13ef Mon Sep 17 00:00:00 2001
From: James Hogan <redacted>
Date: Thu, 4 Aug 2016 17:36:08 +0100
Subject: metag: Fix __cmpxchg_u32 asm constraint for CMP
From: James Hogan <redacted>
commit 6154c187b97ee7513046bb4eb317a89f738f13ef upstream.
The LNKGET based atomic sequence in __cmpxchg_u32 has slightly incorrect
constraints for the return value which under certain circumstances can
allow an address unit register to be used as the first operand of a CMP
instruction. This isn't a valid instruction however as the encodings
only allow a data unit to be specified. This would result in an
assembler error like the following:
Error: failed to assemble instruction: "CMP A0.2,D0Ar6"
Fix by changing the constraint from "=&da" (assigned, early clobbered,
data or address unit register) to "=&d" (data unit register only).
The constraint for the second operand, "bd" (an op2 register where op1
is a data unit register and the instruction supports O2R) is already
correct assuming the first operand is a data unit register.
Other cases of CMP in inline asm have had their constraints checked, and
appear to all be fine.
Fixes: 6006c0d8ce94 ("metag: Atomics, locks and bitops")
Signed-off-by: James Hogan <redacted>
Cc: linux-metag@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/metag/include/asm/cmpxchg_lnkget.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/metag/include/asm/cmpxchg_lnkget.h
+++ b/arch/metag/include/asm/cmpxchg_lnkget.h@@ -73,7 +73,7 @@ static inline unsigned long __cmpxchg_u3 " DCACHE [%2], %0\n" #endif "2:\n" - : "=&d" (temp), "=&da" (retval) + : "=&d" (temp), "=&d" (retval) : "da" (m), "bd" (old), "da" (new) : "cc" );
Patches currently in stable-queue which might be from james.hogan@imgtec.com are queue-4.7/metag-fix-__cmpxchg_u32-asm-constraint-for-cmp.patch queue-4.7/mips-kvm-add-missing-gfn-range-check.patch queue-4.7/ftrace-recordmcount-work-around-for-addition-of-metag-magic-but-not-relocations.patch queue-4.7/mips-kvm-propagate-kseg0-mapped-tlb-fault-errors.patch queue-4.7/mips-kvm-fix-mapped-fault-broken-commpage-handling.patch queue-4.7/mips-kvm-fix-gfn-range-check-in-kseg0-tlb-faults.patch