From patchwork Fri Aug 9 22:03:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 170986 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp10567642ile; Fri, 9 Aug 2019 15:03:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKUabQRyG7TMgLW5q1k4RO5fmZ4PKU7wSye4GTgHXEwkae953Z8yvx2pWijrzdtyHgCmIh X-Received: by 2002:a17:90a:8984:: with SMTP id v4mr11483199pjn.133.1565388235332; Fri, 09 Aug 2019 15:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565388235; cv=none; d=google.com; s=arc-20160816; b=EmfEj6uZMJtcEYwNdgt7fkegKfZkivIyfz3015HleYi5NRd8WDcKfPOcg/J2tGbFPA v8pyoGn1xTKdf9Nlh7Zq3GtT8lZ/Wno23UxgqoHyQ2u9lEt7odULP0UF7Fe1rhrN0Dc4 TOxA47LXd8md2wGzdan0GiSZTjRfjkYNzfP6zIvmuotg2FNQAHfzbjQtFHJPBYnLeZLM QsFBF42ZFGysAO5C3IOUUC0/beipTFKQBWggd+Z/4x+zJlSnIGzo7mLOZvWQApfh9GFk KqfQjvvC7N8Ykc3I9y8IXqJnlf/VU3wh84Vrw9PU0WJ7HfnmZ2Xj6TO2HD/5vySxcSrM Aq1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=u8woyYEIswYwSZI+RYUkZJav0hcCzSUKciws/3A8eFI=; b=vnmzpJj2ep6XPAIq/utkSb1+9LVK4HGT/c0dZqqYyIv9hSg99OlNBTXos9JbrZarE3 6VhhLgHFeCmxUBYXB/Em/+EGf9EWzSF4iC89Hm390N6+XFAZ5/A4afs88R9AAuynWtYo G4RTTZZueJzJw0er0ja35XDrHGsNjWvHZzlWUmXEI39ro2GT+WxlGPDn7mgLk8uI5LTR eQXvpWFlddNqrpQbjisAPDA0mRRJVVPt62SFCPDkSkENqyyTyT1QGenMlbtUmMgs95NI wt9ZwVPIDS5G2w9NpUJwVjkQdXHJXXBHLOUsOcsU5Ylm3l6KhJrCST0cuCO6wp/6CkO6 EUrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UAy9ZliJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j14si62386838pgk.107.2019.08.09.15.03.55; Fri, 09 Aug 2019 15:03:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UAy9ZliJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728880AbfHIWDy (ORCPT + 28 others); Fri, 9 Aug 2019 18:03:54 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:33695 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726053AbfHIWDx (ORCPT ); Fri, 9 Aug 2019 18:03:53 -0400 Received: by mail-pg1-f202.google.com with SMTP id a21so53591464pgv.0 for ; Fri, 09 Aug 2019 15:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=u8woyYEIswYwSZI+RYUkZJav0hcCzSUKciws/3A8eFI=; b=UAy9ZliJfC3GBJda6OupIsMHCFcE4vNQm2ZAXWx+g5D+Xc+o6gxSBXsGdAj1BhAOjY hSwd/IwvlqOvSdqSMQOmX9p/+rpqBYA08jtB9SYYVtWwVhP7F0S622nlMFQWmNLSOXa3 xK91hSiDK4QDyJzR0q2MhImhCKHoS3RNPrDf6KkCrCzwJ9qA7xvxtKRhQmrAjnEm4sf9 /2O4fsBnrhfr0f7F3ao8dLP9ZWeAKno01jBit4kG+8z8xxpdQrLtWxrKEPh5HqYs6E3a L6e15UPxTBSSjZnDQZBhDAF4sY05lkmSxhnOiLpve//mGS5PNXfR1Sq+Vwdl1F283s11 EXHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=u8woyYEIswYwSZI+RYUkZJav0hcCzSUKciws/3A8eFI=; b=FD0XAcyrh15UEM6P5Bth/7t3CWGdX9ZnuF+UXT1zyJSJUJnSYqu4ERGV4Yc9Zq5d2i Be4U/VsMIdBjL7MZLRFZsa83D++s2ARNadbSFiWB9+mHkc/g2kLabu0SPGPK7g23fq9Q ke8EhSVJuAqfUl+2obEsQJXmOsfsGKKPsQXEhaJNe/iXBKxmExRhUIqx75IIcTB6gSwM bm7nf0RYKDmZVG1u1GhhqMAq3vBdpRxLZEX2VM+AYRvnc9xdsEHgBnAZjdzsENTtYD5F NwOOYjMVqHnfBdVbzAyuPpUy2zlc77J7Y6pCGJzxI2/dGKL5rFei0iJMFcYyZCVLLzwJ 3Z9w== X-Gm-Message-State: APjAAAVcU6UHXobLxznPgfVvX1F3E3jCv3XfseW4pzNin8VX6Z50PS44 3DFCj1HcaQm3oBICA6STmmNhUfU4prwTyPtYv5M= X-Received: by 2002:a63:6a81:: with SMTP id f123mr19637717pgc.348.1565388232571; Fri, 09 Aug 2019 15:03:52 -0700 (PDT) Date: Fri, 9 Aug 2019 15:03:47 -0700 In-Reply-To: <20190809220301.Horde.AR6y4Bx4WGIq58V9K0En9g4@messagerie.si.c-s.fr> Message-Id: <20190809220348.127314-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190809220301.Horde.AR6y4Bx4WGIq58V9K0En9g4@messagerie.si.c-s.fr> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH v3] Revert "powerpc: slightly improve cache helpers" From: Nick Desaulniers To: mpe@ellerman.id.au Cc: christophe.leroy@c-s.fr, segher@kernel.crashing.org, arnd@arndb.de, Nick Desaulniers , Nathan Chancellor , kbuild test robot , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 6c5875843b87c3adea2beade9d1b8b3d4523900a. Work around Clang bug preventing ppc32 from booting. Link: https://bugs.llvm.org/show_bug.cgi?id=42762 Link: https://github.com/ClangBuiltLinux/linux/issues/593 Debugged-by: Nathan Chancellor Reported-by: Nathan Chancellor Reported-by: kbuild test robot Suggested-by: Christophe Leroy Signed-off-by: Nick Desaulniers --- Changes V2 -> V3: * Just revert, as per Christophe. Changes V1 -> V2: * Change to ouput paremeter. arch/powerpc/include/asm/cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.23.0.rc1.153.gdeed80330f-goog diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index b3388d95f451..45e3137ccd71 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -107,22 +107,22 @@ extern void _set_L3CR(unsigned long); static inline void dcbz(void *addr) { - __asm__ __volatile__ ("dcbz %y0" : : "Z"(*(u8 *)addr) : "memory"); + __asm__ __volatile__ ("dcbz 0, %0" : : "r"(addr) : "memory"); } static inline void dcbi(void *addr) { - __asm__ __volatile__ ("dcbi %y0" : : "Z"(*(u8 *)addr) : "memory"); + __asm__ __volatile__ ("dcbi 0, %0" : : "r"(addr) : "memory"); } static inline void dcbf(void *addr) { - __asm__ __volatile__ ("dcbf %y0" : : "Z"(*(u8 *)addr) : "memory"); + __asm__ __volatile__ ("dcbf 0, %0" : : "r"(addr) : "memory"); } static inline void dcbst(void *addr) { - __asm__ __volatile__ ("dcbst %y0" : : "Z"(*(u8 *)addr) : "memory"); + __asm__ __volatile__ ("dcbst 0, %0" : : "r"(addr) : "memory"); } #endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */