Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2635510pxa; Mon, 17 Aug 2020 15:04:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8OwuB2lY0C0AvXHc4HeJw0K4dlFIagJYSB99aP0gzw0Cl5Xz9zP/enRJvz/5aQhf7hQJr X-Received: by 2002:a50:ee04:: with SMTP id g4mr16507460eds.117.1597701861351; Mon, 17 Aug 2020 15:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597701861; cv=none; d=google.com; s=arc-20160816; b=aS7dC+D437z8s/+NdxTHexqy30NTR8k+Ehe/i/Y5fTPu4vZBDtiCv5PLvgb5Vf8ien E660LxKdjKu3g6UTgci+w+MO60zvMAS3DdZQqJrdIxzuVYaOyRdKr/BoqgxLjjHdJp1u Bkeg6NCwtksdTDoFKsgCb4p/HGvE0Ep0bClO4i27t9gYxSfFZX0jwuBheTJ8YRviEEUe JWL6cA5KEmlb7bF6GnmdiBWbojkP+lq/VhmqUgBsgutXvgVonUu7JxzZf/PhTbVnIIGH d3LKYEgaQK+UYm8J2xFoCXpslNiSWsWMArsg0nWOveo+W9Ev4yM/dYn3DWlU4S05LNJM fFPA== 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=GcacnjdeN3JDG5lqLrFi4q9l5j4jxtc1j4CJiWOPoBgsUi1AFIpWI9NxzPbArVb2H7 xFPz+3xx9xfAl9zKu+4Zg8cMqelfuRPPOT3xQ+0Y1ucI9xIr7kQK3holtuqdHuo9bCce 0tSnow6QBYb/FMr7tb3JrE90at1k4T+hgXF4js8CMbd/LW+XI6gtwaXBth45j9+Js7UT 8ixc5RmdMgf3lH7wjP1mXoGEG4w8o9LtM0og4Y1GAW4YGQ1hKkwQl04QnUnP8xEs2tu9 hWn2Vc2kufK8iIqp9kujsgSrYIPxCCzKsza9TXSnNp1LD5Aui3kacnq4cIDJmuEAtmai rRXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="mHm/tNdp"; 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 gl25si12350963ejb.424.2020.08.17.15.03.56; Mon, 17 Aug 2020 15:04:21 -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="mHm/tNdp"; 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 S1730557AbgHQPuC (ORCPT + 99 others); Mon, 17 Aug 2020 11:50:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:47746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730636AbgHQPjO (ORCPT ); Mon, 17 Aug 2020 11:39:14 -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 8906723343; Mon, 17 Aug 2020 15:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678754; bh=E6OS2FT95VtV0/IV0WeRwCdybz7w+OojF51B7w+0eog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mHm/tNdptJIz12BRN/cmdJWcidzBeYM44zV2sW18IUIcnKZTTv1G9mIQJsMui5TCN Ohzz5pYPilh1SotAVbnx9x45vq6dSGEoHdCrgVaG6G7qE0JxqoP8XF6bZPsi6MXZht YufgLLLK0Vh5TN1RH/3fS8rOftr3OJj8ic85GcSk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.8 442/464] Revert "parisc: Drop LDCW barrier in CAS code when running UP" Date: Mon, 17 Aug 2020 17:16:35 +0200 Message-Id: <20200817143854.949467109@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@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