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=-22.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 739EFC31E40 for ; Fri, 9 Aug 2019 22:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 436E92089E for ; Fri, 9 Aug 2019 22:03:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UAy9ZliJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728880AbfHIWDy (ORCPT ); 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-Google-Smtp-Source: APXvYqzyM1XJN7FOkuZaGwj9xH3x7cZlnraGtnkG5xN3p+7O5NNPZIyQr9Gfn94WugA8q8zgwEwvJofBRod2VyPs1Tc= 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 Content-Type: text/plain; charset="UTF-8" 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(-) 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__ */ -- 2.23.0.rc1.153.gdeed80330f-goog 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=-14.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 9D81FC433FF for ; Fri, 9 Aug 2019 22:07:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1962820C01 for ; Fri, 9 Aug 2019 22:07:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="UAy9ZliJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1962820C01 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 464zr34jYBzDrPt for ; Sat, 10 Aug 2019 08:07:31 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=flex--ndesaulniers.bounces.google.com (client-ip=2607:f8b0:4864:20::54a; helo=mail-pg1-x54a.google.com; envelope-from=3yo1nxqwkdms4uv9rb24zv89x55x2v.t532z4be66t-uvc2z9a9.5g2rs9.58x@flex--ndesaulniers.bounces.google.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="UAy9ZliJ"; dkim-atps=neutral Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 464zm3026mzDr6t for ; Sat, 10 Aug 2019 08:03:55 +1000 (AEST) Received: by mail-pg1-x54a.google.com with SMTP id n9so57025304pgq.4 for ; Fri, 09 Aug 2019 15:03:55 -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=fPPEqPK36tYKrpzV8M16Gm4z3Zz3BO8u4ezA64nq1FjN3P5xEf6LzYYmC3ObX1o18q 3V76iTpCnZz+2h0j64nK7mI61cwbuPFTD92X0pY/bwLM+Mc01V3y2rXzHdz6IG+FrdSb n7yS1BGn9oTHqAdGm2C8qn+LJuF1qvGpFAbPWQBPiqLmS8Eiy/Z7I/54FZaPYTPyV5dX wEQx465/nyhJUjVEgS7CbIl7HAGjYFMNWpOa+4n40vmlMkvJqBYTA09P4PvGFk/oudsl HxFqGwA2aMy4NTuQkyJV60phLbhk5Hj1pTGso5nwGzNWXNj8YdIrB/+9bl8wL9xJp6O1 o9jQ== X-Gm-Message-State: APjAAAWXkCjV+8rFbfEEsHNyK5sr4El2XmYQRoOc7WX1LLTHKcEpLWsG EJkNu1RHoRmX6DgSWj3Up9Xv3QI1A3jsETi54Vo= X-Google-Smtp-Source: APXvYqzyM1XJN7FOkuZaGwj9xH3x7cZlnraGtnkG5xN3p+7O5NNPZIyQr9Gfn94WugA8q8zgwEwvJofBRod2VyPs1Tc= 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 Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, Nick Desaulniers , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Paul Mackerras , Nathan Chancellor , linuxppc-dev@lists.ozlabs.org, kbuild test robot Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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(-) 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__ */ -- 2.23.0.rc1.153.gdeed80330f-goog