From patchwork Thu Jun 22 16:48:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 9805477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 621C660329 for ; Fri, 23 Jun 2017 01:05:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68E0E1FFEB for ; Fri, 23 Jun 2017 01:05:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CDE728405; Fri, 23 Jun 2017 01:05:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EE7D11FFEB for ; Fri, 23 Jun 2017 01:05:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E3C36E728; Fri, 23 Jun 2017 01:04:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ale.deltatee.com (ale.deltatee.com [207.54.116.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD7EB6E695 for ; Thu, 22 Jun 2017 16:49:23 +0000 (UTC) Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1dO5I7-0006MU-5c; Thu, 22 Jun 2017 10:49:13 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.84_2) (envelope-from ) id 1dO5IA-0006eY-Dg; Thu, 22 Jun 2017 10:49:14 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-ntb@googlegroups.com, linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Thu, 22 Jun 2017 10:48:13 -0600 Message-Id: <20170622164817.25515-4-logang@deltatee.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170622164817.25515-1-logang@deltatee.com> References: <20170622164817.25515-1-logang@deltatee.com> X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-ntb@googlegroups.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-crypto@vger.kernel.org, dri-devel@lists.freedesktop.org, arnd@arndb.de, gregkh@linuxfoundation.org, sbates@raithlin.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH 3/7] asm-generic/io.h: make ioread64 and iowrite64 universally available X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) X-Mailman-Approved-At: Fri, 23 Jun 2017 01:03:45 +0000 Cc: Greg Kroah-Hartman , Logan Gunthorpe , Arnd Bergmann , Stephen Bates X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently, ioread64 and iowrite64 are only available io CONFIG_64BIT=y and CONFIG_GENERIC_IOMAP=n. Thus, seeing the functions are not universally available, it makes them unusable for driver developers. This leads to ugly hacks such as those at the top of drivers/ntb/hw/intel/ntb_hw_intel.c This patch adds fallback implementations for when CONFIG_64BIT and CONFIG_GENERIC_IOMAP are not set. These functions use two io32 based calls to complete the operation. Note, we do not use the volatile keyword in these functions like the others in the same file. It is necessary to avoid a compiler warning on arm. Signed-off-by: Logan Gunthorpe Cc: Arnd Bergmann --- include/asm-generic/io.h | 54 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 7ef015eb3403..817edaa3da78 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -585,15 +585,24 @@ static inline u32 ioread32(const volatile void __iomem *addr) } #endif -#ifdef CONFIG_64BIT #ifndef ioread64 #define ioread64 ioread64 -static inline u64 ioread64(const volatile void __iomem *addr) +#ifdef readq +static inline u64 ioread64(const void __iomem *addr) { return readq(addr); } +#else +static inline u64 ioread64(const void __iomem *addr) +{ + u64 low, high; + + low = ioread32(addr); + high = ioread32(addr + sizeof(u32)); + return low | (high << 32); +} +#endif #endif -#endif /* CONFIG_64BIT */ #ifndef iowrite8 #define iowrite8 iowrite8 @@ -619,15 +628,21 @@ static inline void iowrite32(u32 value, volatile void __iomem *addr) } #endif -#ifdef CONFIG_64BIT #ifndef iowrite64 #define iowrite64 iowrite64 -static inline void iowrite64(u64 value, volatile void __iomem *addr) +#ifdef writeq +static inline void iowrite64(u64 value, void __iomem *addr) { writeq(value, addr); } +#else +static inline void iowrite64(u64 value, void __iomem *addr) +{ + iowrite32(value, addr); + iowrite32(value >> 32, addr + sizeof(u32)); +} +#endif #endif -#endif /* CONFIG_64BIT */ #ifndef ioread16be #define ioread16be ioread16be @@ -645,15 +660,24 @@ static inline u32 ioread32be(const volatile void __iomem *addr) } #endif -#ifdef CONFIG_64BIT #ifndef ioread64be #define ioread64be ioread64be -static inline u64 ioread64be(const volatile void __iomem *addr) +#ifdef readq +static inline u64 ioread64be(const void __iomem *addr) { return swab64(readq(addr)); } +#else +static inline u64 ioread64be(const void __iomem *addr) +{ + u64 low, high; + + low = ioread32be(addr + sizeof(u32)); + high = ioread32be(addr); + return low | (high << 32); +} +#endif #endif -#endif /* CONFIG_64BIT */ #ifndef iowrite16be #define iowrite16be iowrite16be @@ -671,15 +695,21 @@ static inline void iowrite32be(u32 value, volatile void __iomem *addr) } #endif -#ifdef CONFIG_64BIT #ifndef iowrite64be #define iowrite64be iowrite64be -static inline void iowrite64be(u64 value, volatile void __iomem *addr) +#ifdef writeq +static inline void iowrite64be(u64 value, void __iomem *addr) { writeq(swab64(value), addr); } +#else +static inline void iowrite64be(u64 value, void __iomem *addr) +{ + iowrite32be(value >> 32, addr); + iowrite32be(value, addr + sizeof(u32)); +} +#endif #endif -#endif /* CONFIG_64BIT */ #ifndef ioread8_rep #define ioread8_rep ioread8_rep