From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/RRQ+XpdWHPoja8oiDE+489mudh5xsNW1HtujtSjbJfZnFz5a5r0L+GtYCR8QBLMv76a74 ARC-Seal: i=1; a=rsa-sha256; t=1524406411; cv=none; d=google.com; s=arc-20160816; b=03CAqk8tfHBhRbFl2ELh0LHVwYGP+knwwAxNMu3DB2Lby2BJA2O/oJdJH5lBf+R7r+ BmoCupWkXxTNt91wPQwDljZmLMVJ2kSCKl1Rp21b9M6YxUP4qtdv8ZkjU0MoF89F/VJL fiT80DEsF5F8WdTLGxgJ6J4mbsKFAf11RM8ibgEkX20IxF4Z0qREpe7XyaHpSW9OrqD3 x543DBUGvEwHCka79ElFxDk3Bv22nwHVGIOrqKiMZ/qxoBsXuQ97e4Tq+TeTnFnTvSi/ 8kpW3QGoJtkWNO3CX1Yw/+lz5ZamM+8hcskF+tSPP76tteRjuW8dlEe1Zv1R0+5EKq+1 KEvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=D+4Ifjgw4oxW7jAkaTC9ojofva/Jq0tHleAX7iO0EIA=; b=f0uy5sporqE7jafU3JcjdNmac/B8Lravhst5RI3UakoNhgJ8FWyd/DmpLatETxb79g YSatrBCBkuWyUXjrSzPZ7ze18HyJEb+dQVMcQBvkZtQiVVcWNFaZjL+2x1I1MGEaMIjb oOPwLMRi40nTzDBdxIuwcXuSrq1U96KCghZruqvHld+gWNVi4axOYcm4E/CVbrEbEeqc fRDkM06jqKSLzLE0/hydrRMYqXDLn1s3yDUciWEwBfwBmrxSy4oBZmuc4oLveTct/1kB tA1zKceB8B0Zvty1phzwORtfVQfwDCpHdhfnqzVKK5gnybPY3eJVUfNv3NCU6IHjtFSW GbyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Michael Ellerman Subject: [PATCH 4.9 26/95] powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently Date: Sun, 22 Apr 2018 15:52:55 +0200 Message-Id: <20180422135211.500937731@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135210.432103639@linuxfoundation.org> References: <20180422135210.432103639@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598454950836257463?= X-GMAIL-MSGID: =?utf-8?q?1598455977018619767?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicholas Piggin commit 0bfdf598900fd62869659f360d3387ed80eb71cf upstream. asm/barrier.h is not always included after asm/synch.h, which meant it was missing __SUBARCH_HAS_LWSYNC, so in some files smp_wmb() would be eieio when it should be lwsync. kernel/time/hrtimer.c is one case. __SUBARCH_HAS_LWSYNC is only used in one place, so just fold it in to where it's used. Previously with my small simulator config, 377 instances of eieio in the tree. After this patch there are 55. Fixes: 46d075be585e ("powerpc: Optimise smp_wmb") Cc: stable@vger.kernel.org # v2.6.29+ Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/barrier.h | 3 ++- arch/powerpc/include/asm/synch.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) --- a/arch/powerpc/include/asm/barrier.h +++ b/arch/powerpc/include/asm/barrier.h @@ -34,7 +34,8 @@ #define rmb() __asm__ __volatile__ ("sync" : : : "memory") #define wmb() __asm__ __volatile__ ("sync" : : : "memory") -#ifdef __SUBARCH_HAS_LWSYNC +/* The sub-arch has lwsync */ +#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC) # define SMPWMB LWSYNC #else # define SMPWMB eieio --- a/arch/powerpc/include/asm/synch.h +++ b/arch/powerpc/include/asm/synch.h @@ -5,10 +5,6 @@ #include #include -#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC) -#define __SUBARCH_HAS_LWSYNC -#endif - #ifndef __ASSEMBLY__ extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup; extern void do_lwsync_fixups(unsigned long value, void *fixup_start,