Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2639361pxa; Mon, 17 Aug 2020 15:10:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiLwu09sRBwlc5pc6Xut5OJr21mx5s5pgp/DUrMFYLyYbccZwb1cltb0SdgcO7gzAk7TvT X-Received: by 2002:a17:906:3655:: with SMTP id r21mr17771229ejb.248.1597702248708; Mon, 17 Aug 2020 15:10:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597702248; cv=none; d=google.com; s=arc-20160816; b=usTIYX/R0dyrWojGgGnCznnOXdZG2r53RXZwg+nW07APlppg7/OI5K3a/Pptt6WNy5 SK9GkGCrcpwsCuTiQimQe1/B2GIv2Bk19HDiSyYXhaoWiHYlqsM/rmtlO08/POmr0mFy tMY/5qf6HDfU+dYImwIAIw/9RBl8u19OFJ7AEcct8u1QBhnEovc6ilPi9xnyxY3kQ812 avIIhq1/+xYPm7Mo1BEzy32fPvOOPC12n1LJwYw1MaDtpbj11vPoZpYvKGwXFauflWzU 98yzVpjzYk7+CM/su0E36TV2+9yC59sv1X/mhKBXgNSd8VSo542Id4drwrk4JxYSB8F9 bn9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+LD/Blm2S/HaH5+gbDLdnV/F+e2wxcHAOEaRe5ddddU=; b=yx+n7Ry8GVaP2KBqVSCwjNBdx0iHRPPpx813urz5BcEHUZ4z9k6BaxvK0I1K/dVr2f LUmEc/QUQufool81KrM3mqzwM1RTNvXp8L4xxQMEN2k91e5U3Yqor/y8D/dzjkQqE2cx er0LBIzKMQVRnm17IoCYuVJ+PIkFGPRuyNytrdH3cx3DbFzsZP5DnvYpEDrvLgMWfAQm 091K1mW9A45e3jC2zh7xoj4dgYF9Sdj3vKSfOX7tYfjd9CuDJ9RYdrARvhW3/g2vooDN 2JShNdrN831DTAlTTS4mIcby+ZUTYkTSjwt1WHbuKkrn7nxq/jZBeio1EM9OSDOR+HvN Q+sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=R0ZWXYyG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m7si12248593edq.314.2020.08.17.15.10.25; Mon, 17 Aug 2020 15:10:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=R0ZWXYyG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388879AbgHQQjx (ORCPT + 99 others); Mon, 17 Aug 2020 12:39:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:45614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388113AbgHQP6M (ORCPT ); Mon, 17 Aug 2020 11:58:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC0EF207FF; Mon, 17 Aug 2020 15:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679891; bh=E6OS2FT95VtV0/IV0WeRwCdybz7w+OojF51B7w+0eog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0ZWXYyG0aCK1XTw+b5BiUOmEpzwaGWTEFvyJMCOh+ff5GQSFrL+8VnNe8ICL/+NM 8NcQcBAdU0Ly+UgFYzgU1VHE3nX9/NfthsQmChh4kmqmxXFVN+7Kp8VVEMId/PLr32 4hY4NmnLfu6JU92NLXTZF/8+lP/fUh15k8OPH/Hw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.7 370/393] Revert "parisc: Drop LDCW barrier in CAS code when running UP" Date: Mon, 17 Aug 2020 17:17:00 +0200 Message-Id: <20200817143837.553240967@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Helge Deller commit 462fb756c7de1ffe5bc6099149136031c2d9c02a upstream. This reverts commit e6eb5fe9123f05dcbf339ae5c0b6d32fcc0685d5. We need to optimize it differently. A follow up patch will correct it. Signed-off-by: Helge Deller Cc: # v5.2+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/kernel/syscall.S | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -641,8 +641,7 @@ cas_action: 2: stw %r24, 0(%r26) /* Free lock */ #ifdef CONFIG_SMP -98: LDCW 0(%sr2,%r20), %r1 /* Barrier */ -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) + LDCW 0(%sr2,%r20), %r1 /* Barrier */ #endif stw %r20, 0(%sr2,%r20) #if ENABLE_LWS_DEBUG @@ -659,8 +658,7 @@ cas_action: /* Error occurred on load or store */ /* Free lock */ #ifdef CONFIG_SMP -98: LDCW 0(%sr2,%r20), %r1 /* Barrier */ -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) + LDCW 0(%sr2,%r20), %r1 /* Barrier */ #endif stw %r20, 0(%sr2,%r20) #if ENABLE_LWS_DEBUG @@ -864,8 +862,7 @@ cas2_action: cas2_end: /* Free lock */ #ifdef CONFIG_SMP -98: LDCW 0(%sr2,%r20), %r1 /* Barrier */ -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) + LDCW 0(%sr2,%r20), %r1 /* Barrier */ #endif stw %r20, 0(%sr2,%r20) /* Enable interrupts */ @@ -878,8 +875,7 @@ cas2_end: /* Error occurred on load or store */ /* Free lock */ #ifdef CONFIG_SMP -98: LDCW 0(%sr2,%r20), %r1 /* Barrier */ -99: ALTERNATIVE(98b, 99b, ALT_COND_NO_SMP, INSN_NOP) + LDCW 0(%sr2,%r20), %r1 /* Barrier */ #endif stw %r20, 0(%sr2,%r20) ssm PSW_SM_I, %r0