From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C18DEC43603 for ; Tue, 10 Dec 2019 21:45:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95DDF205C9 for ; Tue, 10 Dec 2019 21:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576014316; bh=7luWAPNv9mYdC45do1SHB76UkQQSAucWj9Q/I9Fw/as=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WSnx674n6WF15WWSCx78y4fm7Btieh5txZ7RiCH3oV84oyz8WRfpetIceEhipXfJu xTDfomg+9XuaIj8mZ8PaiRdXyGBoZGR3vxAvuS0P7u6p4KsB3fBWJZ1sAjfd3YU3V/ dPnDRcQQkpHJVXOlTb4OzwXtyS/4mTZ0KGbHBQQ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729742AbfLJVpL (ORCPT ); Tue, 10 Dec 2019 16:45:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:37092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729627AbfLJVdF (ORCPT ); Tue, 10 Dec 2019 16:33:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3EF4722B48; Tue, 10 Dec 2019 21:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013585; bh=7luWAPNv9mYdC45do1SHB76UkQQSAucWj9Q/I9Fw/as=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELqvcOheXE2sLCYVjoepStoihV7oMhp6udyoEcCAQ2gpkxN9vCYR1OP8PlJk1aA4t d0vTnehnPwCgniCEKwaueteMJ68O/Ze0w8s+tqlqEorJ+ypaYTWO99KpaFfIBR/4JE KzpywOk+aCBoz8S4TWg6O+RIF/MVnK+gkh7E9yfs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paul Burton , linux-mips@vger.kernel.org, Huacai Chen , Jiaxun Yang , Sasha Levin Subject: [PATCH AUTOSEL 4.19 036/177] MIPS: syscall: Emit Loongson3 sync workarounds within asm Date: Tue, 10 Dec 2019 16:30:00 -0500 Message-Id: <20191210213221.11921-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Paul Burton [ Upstream commit e84957e6ae043bb83ad6ae7e949a1ce97b6bbfef ] Generate the sync instructions required to workaround Loongson3 LL/SC errata within inline asm blocks, which feels a little safer than doing it from C where strictly speaking the compiler would be well within its rights to insert a memory access between the separate asm statements we previously had, containing sync & ll instructions respectively. Signed-off-by: Paul Burton Cc: linux-mips@vger.kernel.org Cc: Huacai Chen Cc: Jiaxun Yang Cc: linux-kernel@vger.kernel.org Signed-off-by: Sasha Levin --- arch/mips/kernel/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 69c17b549fd3c..10990434bf946 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -135,6 +136,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) " .set "MIPS_ISA_ARCH_LEVEL" \n" " li %[err], 0 \n" "1: \n" + " " __SYNC(full, loongson3_war) " \n" user_ll("%[old]", "(%[addr])") " move %[tmp], %[new] \n" "2: \n" -- 2.20.1