From patchwork Tue Sep 6 12:59:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101862 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp534662qgf; Tue, 6 Sep 2016 06:00:08 -0700 (PDT) X-Received: by 10.98.65.139 with SMTP id g11mr30478892pfd.145.1473166808581; Tue, 06 Sep 2016 06:00:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h28si35388492pfd.271.2016.09.06.06.00.08; Tue, 06 Sep 2016 06:00:08 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934845AbcIFNAG (ORCPT + 27 others); Tue, 6 Sep 2016 09:00:06 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:63807 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754925AbcIFNAE (ORCPT ); Tue, 6 Sep 2016 09:00:04 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0M8n1M-1bmi272rMK-00C6Wt; Tue, 06 Sep 2016 14:59:59 +0200 From: Arnd Bergmann To: Martyn Welch , Manohar Vanga , Greg Kroah-Hartman Cc: Arnd Bergmann , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] vme: fake: fix build for 64-bit dma_addr_t Date: Tue, 6 Sep 2016 14:59:41 +0200 Message-Id: <20160906130013.1616803-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:YtV1b3hTrcuAGfsuWskfLa5hi3cSMbTbmBanRAF54eByl+qwv6V PmmUTJufZszah6n5tsuCSHIuRWAVaEgBVQ9obTl0MdPLIBGc5HHZBPkq+ArgOIobx5FERd5 bFjx9gh6sGacG/tx1nQAFN1gb3AgqCLGNFl3MKiW9gDJsL9r9VRf63dVbu47YXAbbmQ88Fw W29+DFwXzvxPU3BtBW8Sg== X-UI-Out-Filterresults: notjunk:1; V01:K0:oq91vj8l2B0=:JifLv3qMSOGUnAeE9iVB32 A0wR3R+3XyxYmKaaee3tH26F3n70bCYCSohc8lX0l+wCX9KG7Vq8wicT5pwY7xLK9jSlezRHr y9k8MD/SrLA0wdB1IYGDjm/9A61vbxNwOkpZcrmxgC/HbhTVuvnTCKS2/fdKlvyC6BrPG07B3 32QOXrrR37OeSXgKhOtk7ZyQoyXzC2FL1v40/F+dfbV+oRrhH0XPH/9spocGTvVMaAb91GlNf l+15eGzGb0MQsVdtIGzjHhpbiHxyPyH9CVmVubQRBOEpeorg4/0f017N/CAgn9HM2RzSszqxf 7z0xJxexKNVOhrKXaew96vjv43iA1VZkeEyloIvjWAncSziLzHImSJ3WRZotYodUyKLT6gKhM JRIU8ckpOBhA/6z/5g5lJwhLMH5G5e1p2INUe0IFRyAUgs+jsIkMJxw1a+TkFeamKHblWXTjX ianWhrnDoryKrrrVi4nc6TUtAanSJww58nFZvTnw6ay/eZ0fZiMAjnXBLtH7UjTyqRb78Qt8r 7/HMjnkmx9VwyyHGJFXMB0MbdZKlEanVyGyJOf/oJk/H5moKJp+EtWtgH6Gv4vbnleOk+mY+b 6dGRpO/mRkCxR6ORDgFl1HNoIZPk9snjGrFLhQQoDabCthouMJ8WuIa/XrZTcXjtq/QYcnWQ+ NCJK6YBgTkJeFv3eDUoHhmx2dH1TTx9avdMv09U0i1HcP7d8XTR9eBr0ZxNt05mrGzcc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org casting between dma_addr_t and a pointer is generally tricky, as they might not be the same size and almost never point into the same address space. With 32-bit ARM systems and LPAE, we get this warning for the vme_fake driver that stores a pointer in a dma_addr_t variable: drivers/vme/bridges/vme_fake.c: In function 'fake_slave_set': drivers/vme/bridges/vme_fake.c:204:29: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] To make this clearer while fixing the warning, I'm adding a set of helper functions for the type conversion. Signed-off-by: Arnd Bergmann --- drivers/vme/bridges/vme_fake.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/vme/bridges/vme_fake.c b/drivers/vme/bridges/vme_fake.c index 7ef298b289f4..ebf35d305321 100644 --- a/drivers/vme/bridges/vme_fake.c +++ b/drivers/vme/bridges/vme_fake.c @@ -48,7 +48,7 @@ struct fake_slave_window { int enabled; unsigned long long vme_base; unsigned long long size; - dma_addr_t buf_base; + void *buf_base; u32 aspace; u32 cycle; }; @@ -114,6 +114,16 @@ static void fake_irq_set(struct vme_bridge *fake_bridge, int level, /* Nothing to do */ } +static void *fake_pci_to_ptr(dma_addr_t addr) +{ + return (void *)(uintptr_t)addr; +} + +static dma_addr_t fake_ptr_to_pci(void *addr) +{ + return (dma_addr_t)(uintptr_t)addr; +} + /* * Generate a VME bus interrupt at the requested level & vector. Wait for * interrupt to be acked. @@ -202,7 +212,7 @@ static int fake_slave_set(struct vme_slave_resource *image, int enabled, bridge->slaves[i].enabled = enabled; bridge->slaves[i].vme_base = vme_base; bridge->slaves[i].size = size; - bridge->slaves[i].buf_base = buf_base; + bridge->slaves[i].buf_base = fake_pci_to_ptr(buf_base); bridge->slaves[i].aspace = aspace; bridge->slaves[i].cycle = cycle; @@ -230,7 +240,7 @@ static int fake_slave_get(struct vme_slave_resource *image, int *enabled, *enabled = bridge->slaves[i].enabled; *vme_base = bridge->slaves[i].vme_base; *size = bridge->slaves[i].size; - *buf_base = bridge->slaves[i].buf_base; + *buf_base = fake_ptr_to_pci(bridge->slaves[i].buf_base); *aspace = bridge->slaves[i].aspace; *cycle = bridge->slaves[i].cycle; @@ -431,7 +441,7 @@ static u8 fake_vmeread8(struct fake_driver *bridge, unsigned long long addr, if ((addr >= start) && (addr < end)) { offset = addr - bridge->slaves[i].vme_base; - loc = (u8 *)((void *)bridge->slaves[i].buf_base + offset); + loc = (u8 *)(bridge->slaves[i].buf_base + offset); retval = *loc; break; @@ -463,7 +473,7 @@ static u16 fake_vmeread16(struct fake_driver *bridge, unsigned long long addr, if ((addr >= start) && ((addr + 1) < end)) { offset = addr - bridge->slaves[i].vme_base; - loc = (u16 *)((void *)bridge->slaves[i].buf_base + offset); + loc = (u16 *)(bridge->slaves[i].buf_base + offset); retval = *loc; break; @@ -495,7 +505,7 @@ static u32 fake_vmeread32(struct fake_driver *bridge, unsigned long long addr, if ((addr >= start) && ((addr + 3) < end)) { offset = addr - bridge->slaves[i].vme_base; - loc = (u32 *)((void *)bridge->slaves[i].buf_base + offset); + loc = (u32 *)(bridge->slaves[i].buf_base + offset); retval = *loc; break; @@ -997,7 +1007,7 @@ static void *fake_alloc_consistent(struct device *parent, size_t size, void *alloc = kmalloc(size, GFP_KERNEL); if (alloc != NULL) - *dma = (dma_addr_t)(unsigned long)alloc; + *dma = fake_ptr_to_pci(alloc); return alloc; } @@ -1031,7 +1041,7 @@ static int fake_crcsr_init(struct vme_bridge *fake_bridge) /* Allocate mem for CR/CSR image */ bridge->crcsr_kernel = kzalloc(VME_CRCSR_BUF_SIZE, GFP_KERNEL); - bridge->crcsr_bus = (dma_addr_t)bridge->crcsr_kernel; + bridge->crcsr_bus = fake_ptr_to_pci(bridge->crcsr_kernel); if (bridge->crcsr_kernel == NULL) return -ENOMEM;