From patchwork Sun Nov 25 21:14:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 1002929 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43339828nPz9s29 for ; Mon, 26 Nov 2018 08:29:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4333980sktzDqnZ for ; Mon, 26 Nov 2018 08:29:48 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=stevens-zone.net (client-ip=212.227.17.13; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net X-Greylist: delayed 786 seconds by postgrey-1.36 at bilbo; Mon, 26 Nov 2018 08:28:13 AEDT Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43337K67CxzDqmK for ; Mon, 26 Nov 2018 08:28:12 +1100 (AEDT) Received: from mintppc.lan ([80.189.87.228]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.179]) with ESMTPA (Nemesis) id 1Mv2tK-1faR5Q0bk8-00r2fO for ; Sun, 25 Nov 2018 22:14:52 +0100 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org Date: Sun, 25 Nov 2018 21:14:49 +0000 (GMT) Message-ID: <4ceed1989a9.364d3263@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH] powerpc/kernel: Remove gcc 4 workaround from include/asm/io.h MIME-Version: 1.0 X-Provags-ID: V03:K1:jjVxogdmgu0vT3c3rD/Bb5WgThmKHhqWX2Ck30PpewrewLr2U+y /49Cxpy4ZwYgOmB0Ce2afPFDIRbgjLH/xNFbjkNr7b9W4/dRnK/Zcj1QSokhiBeuZ4PrEkX 9IeiK9d+kNDmJEXmiWBo6MWlUh1Igo7Tyr0p+5syr20iidpi9MNWieDOIWXXshae2PYbOWB UzIsw8vIl0cTg2cvT1x/g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:oK9gXavKzLE=:KrlxLrfifTj/Iy1q8cDUQF dX+T0zPI/u9iJ6Hy71wKpjxmkyHVJSulplWkME8jwkvqB9kiDOXdWAusIIWyBYLiDfHdvzPYt AWvXdSDzwM5i9s6DpL4WMjJwxLCNjo5DbA3tRnEdZP8G60X3Yatar9sf1qy1G2HoBzXp6U2eV Jmha92LOtDCG+gyajGelbJVAbI2KG+u8eFXr4Q1XPkPNiOfdfLIPpeQxw4P4g9Jqq9HeodgOS 4arAA8PgeXjE/kJlK59lMkwfCBPm6OEdJ57wxTJ5+CGo67nJCxKB6bffCiWIUjRvlMoi8VVZ7 Z/K8Y18myXOmJ4XMIAptvk8tMYjoGsCQabsnibFPXnVDyd8hYFqhCIY/1ibluLV2KSH+mW33m Md7DFWR0cwz4jU0ur6oHjigRquUBW13wLlmBKmGA51WDgJ1ZaCNLuTzIDesT60vfymIqhebGD pah1A4JusjZzh5Sse/3R9UncAl9jxmh5R5ag7QfnZx0uFOG1+qrRZHzNQxdp3X87HSqrWDNva osWnPLOVbzifH6b/E+v70l6A3GD9zR9uU4P7r1POwz0xTN/Qd8Z2nAyMB0YDmubHdA33vaIj8 k2sNY4TuJJ+Woexg2F+4lrlITlNsg2DoSQe1Vul+iA81MQokKGcUaBKyM2CNbbO3J0IQJn+TJ qCdX6jCVTx5xc+AET05CtScKWDtQsSLtgBwDO0EZrx3FqWkk0eh3nWAECZAtBo+GxY0JKZfjH v4rFeA46xiMLqjXMJz+XLFUDryrwmrUs29FVornO0CWaUkUhW2d2QbRoUZUdUmXzyNIUdRGpK nxblAt7ylrMd/AVMQcp6pJknOgqgw== 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: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" There are verions of DEF_MMIO_IN_X and DEF_MMIO_OUT_X in asm/io.h that contain a workaround for a limitation in gcc <=4.0, but the minimum supported version of gcc is now 4.6, so these can be safely removed. Signed-off-by: Darren Stevens diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index e0331e7..4433477 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -108,25 +108,6 @@ #define IO_SET_SYNC_FLAG() #endif -/* gcc 4.0 and older doesn't have 'Z' constraint */ -#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0) -#define DEF_MMIO_IN_X(name, size, insn) \ -static inline u##size name(const volatile u##size __iomem *addr) \ -{ \ - u##size ret; \ - __asm__ __volatile__("sync;"#insn" %0,0,%1;twi 0,%0,0;isync" \ - : "=r" (ret) : "r" (addr), "m" (*addr) : "memory"); \ - return ret; \ -} - -#define DEF_MMIO_OUT_X(name, size, insn) \ -static inline void name(volatile u##size __iomem *addr, u##size val) \ -{ \ - __asm__ __volatile__("sync;"#insn" %1,0,%2" \ - : "=m" (*addr) : "r" (val), "r" (addr) : "memory"); \ - IO_SET_SYNC_FLAG(); \ -} -#else /* newer gcc */ #define DEF_MMIO_IN_X(name, size, insn) \ static inline u##size name(const volatile u##size __iomem *addr) \ { \ @@ -143,7 +124,6 @@ static inline void name(volatile u##size __iomem *addr, u##size val) \ : "=Z" (*addr) : "r" (val) : "memory"); \ IO_SET_SYNC_FLAG(); \ } -#endif #define DEF_MMIO_IN_D(name, size, insn) \ static inline u##size name(const volatile u##size __iomem *addr) \