From patchwork Fri Feb 5 16:20:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8236811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA6559F3CD for ; Fri, 5 Feb 2016 16:23:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0ED120395 for ; Fri, 5 Feb 2016 16:23:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 951EA2027D for ; Fri, 5 Feb 2016 16:23:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRj8v-0001tj-Hx; Fri, 05 Feb 2016 16:21:57 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRj8h-0001hE-5j for linux-arm-kernel@lists.infradead.org; Fri, 05 Feb 2016 16:21:47 +0000 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0Mh8jt-1af9QA3pq5-00MIrp; Fri, 05 Feb 2016 17:21:24 +0100 From: Arnd Bergmann To: Imre Kaloz , Krzysztof Halasa Subject: [PATCH 3/3] ARM: ixp4xx: move indirect I/O into common-pci.c Date: Fri, 5 Feb 2016 17:20:50 +0100 Message-Id: <1454689262-613421-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454689262-613421-1-git-send-email-arnd@arndb.de> References: <1454689262-613421-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:rfcCc3JC/ffllu+eZs61WSl7pvbLyPnGZThjW29JsqY3WtVdFzF kIPOvtQkTFzOFT50MD2tc9eYd+zyb/U9b++u8SyyIiKZYJrwjlLccb30d9mm5P4G57ps3pr /79BfPkny4zTtEVcW7N7ny+MkKnzY53hM+eLBabsGL6+Vq15rB3kYSIS/sGcFrsThfKtOS1 i3VBQRD1PeQy+ka84QZyA== X-UI-Out-Filterresults: notjunk:1; V01:K0:/SRpgQ0RMWg=:ydChwU7sE4nXrfVK6538xm k5IxhL6GpNLRnK7dvnfTfsbLAtp3eSEG/+H7hFtytHKnHOXCJsS8AY2RrVA8RO3INBNir3xML CWrvB9O2VstBQlF0WoOFCnPCLoxTgMGzietQUzX1GdVPWVMottqY8X2tqFSEpVYln9N/bCFQ4 i9l0SEt5kZK+imRtOC0V+dKrg4a0S2SoISemiwfhAZDQ0657vvaqITWoewtlYGcSrRM417Zkt 837UVvi0REZ6sS5eBW+SnwtGO2gTq3XnnJ5TpWCCagzbIUh+zImRvFyjRrvQ6sV8VKhGsJnKu fklklnv5cxhP3r+P+dSQEVlfzeJyjaYmAkbQtX2VBc8pUFtC78giQrJGM5beCiXI8Qxxp2WNO ygUPQt6BC0Yu+EWkBwHMiqiGVX3YXg1EbB5ysNShEkNY7pISTURdf/00nUvl4KPj1WpBeODe8 sUMIrahauunxPpxNcgZCOY8uTy/6BsdhgWWElsW+V4qy5PYvf/zdZILI3FqWTAimMJ2BHDFYh +FxOu2PV6qRcw1osh3hxJk6jmtyXzLrWs7vZLv99toWOThMOU9bnUb26svncYoXgqx3s6VNks Z5wEzy8APMpmkRNJbl2mlhkmEoUfz2yhyXLKNGqttl4czxwO1qS8IQvJoHk3vhXq6Wf8O8F+n qr5ulbzG8WHlkpa64htQtA/W5fYF308xk4SzQghcLkSMW7ozboFA+4Qdaq7YV8/4XNXo= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160205_082143_808874_96B95B15 X-CRM114-Status: GOOD ( 14.52 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The pointer comparison in is_pci_memory() confuses gcc, so it starts throwing bogus warnings about the use of possibly uninitialized variables: drivers/ata/ahci_qoriq.c: In function 'ahci_qoriq_hardreset': arch/arm/include/asm/io.h:101:2: error: 'px_is' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/crypto/ixp4xx_crypto.c: In function 'aead_perform': drivers/crypto/ixp4xx_crypto.c:1072:5: error: 'lastlen' may be used uninitialized in this function [-Werror=maybe-uninitialized] The code is that gets warned about is correct, and we should not warn about this. Moving the code into a .c file makes the object files smaller and avoids the warnings. Signed-off-by: Arnd Bergmann Acked-by: Krzysztof Ha?asa --- arch/arm/mach-ixp4xx/common-pci.c | 98 ++++++++++++++++++++++++++++++++++ arch/arm/mach-ixp4xx/include/mach/io.h | 95 +++----------------------------- 2 files changed, 104 insertions(+), 89 deletions(-) diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 4977296f0c78..6f5d92f88062 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c @@ -166,6 +166,104 @@ int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data) return retval; } +#ifdef CONFIG_IXP4XX_INDIRECT_PCI +void __indirect_writeb(u8 value, volatile void __iomem *p) +{ + u32 addr = (u32)p; + u32 n, byte_enables, data; + + if (!is_pci_memory(addr)) { + __raw_writeb(value, p); + return; + } + + n = addr % 4; + byte_enables = (0xf & ~BIT(n)) << IXP4XX_PCI_NP_CBE_BESL; + data = value << (8*n); + ixp4xx_pci_write(addr, byte_enables | NP_CMD_MEMWRITE, data); +} +EXPORT_SYMBOL(__indirect_writeb); + +void __indirect_writew(u16 value, volatile void __iomem *p) +{ + u32 addr = (u32)p; + u32 n, byte_enables, data; + + if (!is_pci_memory(addr)) { + __raw_writew(value, p); + return; + } + + n = addr % 4; + byte_enables = (0xf & ~(BIT(n) | BIT(n+1))) << IXP4XX_PCI_NP_CBE_BESL; + data = value << (8*n); + ixp4xx_pci_write(addr, byte_enables | NP_CMD_MEMWRITE, data); +} +EXPORT_SYMBOL(__indirect_writew); + +void __indirect_writel(u32 value, volatile void __iomem *p) +{ + u32 addr = (__force u32)p; + + if (!is_pci_memory(addr)) { + __raw_writel(value, p); + return; + } + + ixp4xx_pci_write(addr, NP_CMD_MEMWRITE, value); +} +EXPORT_SYMBOL(__indirect_writel); + +u8 __indirect_readb(const volatile void __iomem *p) +{ + u32 addr = (u32)p; + u32 n, byte_enables, data; + + if (!is_pci_memory(addr)) + return __raw_readb(p); + + n = addr % 4; + byte_enables = (0xf & ~BIT(n)) << IXP4XX_PCI_NP_CBE_BESL; + if (ixp4xx_pci_read(addr, byte_enables | NP_CMD_MEMREAD, &data)) + return 0xff; + + return data >> (8*n); +} +EXPORT_SYMBOL(__indirect_readb); + +u16 __indirect_readw(const volatile void __iomem *p) +{ + u32 addr = (u32)p; + u32 n, byte_enables, data; + + if (!is_pci_memory(addr)) + return __raw_readw(p); + + n = addr % 4; + byte_enables = (0xf & ~(BIT(n) | BIT(n+1))) << IXP4XX_PCI_NP_CBE_BESL; + if (ixp4xx_pci_read(addr, byte_enables | NP_CMD_MEMREAD, &data)) + return 0xffff; + + return data>>(8*n); +} +EXPORT_SYMBOL(__indirect_readw); + +u32 __indirect_readl(const volatile void __iomem *p) +{ + u32 addr = (__force u32)p; + u32 data; + + if (!is_pci_memory(addr)) + return __raw_readl(p); + + if (ixp4xx_pci_read(addr, NP_CMD_MEMREAD, &data)) + return 0xffffffff; + + return data; +} +EXPORT_SYMBOL(__indirect_readl); +#endif + static u32 ixp4xx_config_addr(u8 bus_num, u16 devfn, int where) { u32 addr; diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index d8c2a4dc54d7..e770858b490a 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -78,21 +78,12 @@ static inline int is_pci_memory(u32 addr) #define readsw(p, v, l) __indirect_readsw(p, v, l) #define readsl(p, v, l) __indirect_readsl(p, v, l) -static inline void __indirect_writeb(u8 value, volatile void __iomem *p) -{ - u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (!is_pci_memory(addr)) { - __raw_writeb(value, p); - return; - } - - n = addr % 4; - byte_enables = (0xf & ~BIT(n)) << IXP4XX_PCI_NP_CBE_BESL; - data = value << (8*n); - ixp4xx_pci_write(addr, byte_enables | NP_CMD_MEMWRITE, data); -} +void __indirect_writeb(u8 value, volatile void __iomem *p); +void __indirect_writew(u16 value, volatile void __iomem *p); +void __indirect_writel(u32 value, volatile void __iomem *p); +u8 __indirect_readb(const volatile void __iomem *p); +u16 __indirect_readw(const volatile void __iomem *p); +u32 __indirect_readl(const volatile void __iomem *p); static inline void __indirect_writesb(volatile void __iomem *bus_addr, const void *p, int count) @@ -103,22 +94,6 @@ static inline void __indirect_writesb(volatile void __iomem *bus_addr, writeb(*vaddr++, bus_addr); } -static inline void __indirect_writew(u16 value, volatile void __iomem *p) -{ - u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (!is_pci_memory(addr)) { - __raw_writew(value, p); - return; - } - - n = addr % 4; - byte_enables = (0xf & ~(BIT(n) | BIT(n+1))) << IXP4XX_PCI_NP_CBE_BESL; - data = value << (8*n); - ixp4xx_pci_write(addr, byte_enables | NP_CMD_MEMWRITE, data); -} - static inline void __indirect_writesw(volatile void __iomem *bus_addr, const void *p, int count) { @@ -128,18 +103,6 @@ static inline void __indirect_writesw(volatile void __iomem *bus_addr, writew(*vaddr++, bus_addr); } -static inline void __indirect_writel(u32 value, volatile void __iomem *p) -{ - u32 addr = (__force u32)p; - - if (!is_pci_memory(addr)) { - __raw_writel(value, p); - return; - } - - ixp4xx_pci_write(addr, NP_CMD_MEMWRITE, value); -} - static inline void __indirect_writesl(volatile void __iomem *bus_addr, const void *p, int count) { @@ -148,22 +111,6 @@ static inline void __indirect_writesl(volatile void __iomem *bus_addr, writel(*vaddr++, bus_addr); } -static inline u8 __indirect_readb(const volatile void __iomem *p) -{ - u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (!is_pci_memory(addr)) - return __raw_readb(p); - - n = addr % 4; - byte_enables = (0xf & ~BIT(n)) << IXP4XX_PCI_NP_CBE_BESL; - if (ixp4xx_pci_read(addr, byte_enables | NP_CMD_MEMREAD, &data)) - return 0xff; - - return data >> (8*n); -} - static inline void __indirect_readsb(const volatile void __iomem *bus_addr, void *p, u32 count) { @@ -173,22 +120,6 @@ static inline void __indirect_readsb(const volatile void __iomem *bus_addr, *vaddr++ = readb(bus_addr); } -static inline u16 __indirect_readw(const volatile void __iomem *p) -{ - u32 addr = (u32)p; - u32 n, byte_enables, data; - - if (!is_pci_memory(addr)) - return __raw_readw(p); - - n = addr % 4; - byte_enables = (0xf & ~(BIT(n) | BIT(n+1))) << IXP4XX_PCI_NP_CBE_BESL; - if (ixp4xx_pci_read(addr, byte_enables | NP_CMD_MEMREAD, &data)) - return 0xffff; - - return data>>(8*n); -} - static inline void __indirect_readsw(const volatile void __iomem *bus_addr, void *p, u32 count) { @@ -198,20 +129,6 @@ static inline void __indirect_readsw(const volatile void __iomem *bus_addr, *vaddr++ = readw(bus_addr); } -static inline u32 __indirect_readl(const volatile void __iomem *p) -{ - u32 addr = (__force u32)p; - u32 data; - - if (!is_pci_memory(addr)) - return __raw_readl(p); - - if (ixp4xx_pci_read(addr, NP_CMD_MEMREAD, &data)) - return 0xffffffff; - - return data; -} - static inline void __indirect_readsl(const volatile void __iomem *bus_addr, void *p, u32 count) {