linux-mips
[Top] [All Lists]

[PATCH 4.19 156/170] MIPS: Fix a R10000_LLSC_WAR logic in atomic.h

To: linux-kernel@vger.kernel.org
Subject: [PATCH 4.19 156/170] MIPS: Fix a R10000_LLSC_WAR logic in atomic.h
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Jan 2019 13:33:03 +0100
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Huacai Chen <chenhc@lemote.com>, Paul Burton <paul.burton@mips.com>, Joshua Kinard <kumba@gentoo.org>, Ralf Baechle <ralf@linux-mips.org>, "Steven J . Hill" <Steven.Hill@cavium.com>, Fuxin Zhang <zhangfx@lemote.com>, Zhangjin Wu <wuzhangjin@gmail.com>, linux-mips@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546865912; bh=N+ocYKPM1xZJeMxI8adCcaDiSjDb9ck+USRjOrYyXGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dXDt1erCSc9AVZtyyL6/E5ERsK/CYBZBoKwRCv/puERg7++yrYfXWPzLZGeGl9vcL sUnMF8BA6T37edE1u7slCufFQWR/t0sJYu7qUWqyroKHKOigS3unrApXYS81TTpSsz s9Ula+Y/TtCI50yH3LERpnT2p7JOUHAmSzXyPSN4=
In-reply-to: <20190107104452.953560660@linuxfoundation.org>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20190107104452.953560660@linuxfoundation.org>
Sender: linux-mips-bounce@linux-mips.org
User-agent: quilt/0.65
4.19-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Huacai Chen <chenhc@lemote.com>

commit db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b upstream.

Commit 4936084c2ee2 ("MIPS: Cleanup R10000_LLSC_WAR logic in atomic.h")
introduce a mistake in atomic64_fetch_##op##_relaxed(), because it
forget to delete R10000_LLSC_WAR in the if-condition. So fix it.

Fixes: 4936084c2ee2 ("MIPS: Cleanup R10000_LLSC_WAR logic in atomic.h")
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Joshua Kinard <kumba@gentoo.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Steven J . Hill <Steven.Hill@cavium.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 4.19+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/include/asm/atomic.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -306,7 +306,7 @@ static __inline__ long atomic64_fetch_##
 {                                                                            \
        long result;                                                          \
                                                                              \
-       if (kernel_uses_llsc && R10000_LLSC_WAR) {                            \
+       if (kernel_uses_llsc) {                                               \
                long temp;                                                    \
                                                                              \
                __asm__ __volatile__(                                         \



<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 4.19 156/170] MIPS: Fix a R10000_LLSC_WAR logic in atomic.h, Greg Kroah-Hartman <=