From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753020AbcA2Lmk (ORCPT ); Fri, 29 Jan 2016 06:42:40 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:59666 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755812AbcA2Lk3 (ORCPT ); Fri, 29 Jan 2016 06:40:29 -0500 From: Arnd Bergmann To: David Miller Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/7] net: davinci_cpdma: use dma_addr_t for DMA address Date: Fri, 29 Jan 2016 12:39:10 +0100 Message-Id: <1454067557-3546883-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454067557-3546883-1-git-send-email-arnd@arndb.de> References: <1454067557-3546883-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:ZtkUFvbxz+X98nRbd6pwiTodY4xVkN0n1B8AqnGR7V+n/BV7u60 rXybdGahfMX1y5s/oQyD2SZcGMEA0jzw/R44M3l+Z0mxKPig4bu/vZqeDDuAGxYvUJjk0l9 gdpVgOLI8Im5H5jWwddYGqS6pYVjcvietGjqbMJiMuRPqqHc/9HyTFNAU7ZDmWZZtkF3kO6 ZgD4vIX96itBQXTgJ+F0Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:lVGydQBJtcc=:zMC06BjqXHaVeC5olPOX52 T/MVzt3oq6Sj/nsKU0hiTQ67Q4qZFAY5amLAV8Tb8bks4pNInWEWbpqMzb0hdNBOGdyXyNHS2 C+7e5g/VpX/PCgkAc1fpIpeF3GxhMesKELcIVPrIgB8AjKG5CZNFsfDtL5lkE32oboRTzH0l5 hnDVRGmV9dajwdtctFsXuu9AzkHomvFuD1/RYjTQHCIIMv+DQWYPJkiVzvKLhG9Eszy3H9r57 z2Ww7QgzkGiK1P/9Anczvpvx3TdWGxYUaiJkFVp6G3Rue87sCRcnmolW+NLU4TMcsFD5Yt6SH Z1X8wCX5ZaXnTFq7t3VqfEL1hCBxwDQKDPoFc4aSSkR2tm9+38qFyFaAe3y4x03ECFEMsvtMJ dr/P/54mKAGDGrH0a1KgmHsZv1YNfmqdcZobjRK7gnFoc92IhRMUVqsMc15oT2J5lw1WwRkFf RkbFPIxq9X3qFhTHD3POSM7TjUSybBROQbAbQw0DZ1onlc+KiqCja2f3gJSFSXCG7sf7TgPSQ GtqsNDD7F6D78Q8di+3GSB9gsLDFXzsLVs+8a0mDVV9ltTyCS3kHo1lWWGGDS9QVuFsK46PMq YxKafAaoPv9rBMqMY6DSuDvhejAxWKJ84TfXjakE1Vlb/0lKZkr6Iyo+pdx8kt5OQdsglLh7h Tw0JcGmCHfrQvGj0wqotdtNdxk24YGq7igWUHavYsko9dlQ4e9xN2bUooFL3ZSfn8Oiw= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The davinci_cpdma mixes up physical addresses as seen from the CPU and DMA addresses as seen from a DMA master, since it can operate on both normal memory or an on-chip buffer. If dma_addr_t is different from phys_addr_t, this means we get a compile-time warning about the type mismatch: ethernet/ti/davinci_cpdma.c: In function 'cpdma_desc_pool_create': ethernet/ti/davinci_cpdma.c:182:48: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] pool->cpumap = dma_alloc_coherent(dev, size, &pool->phys, In file included from ethernet/ti/davinci_cpdma.c:21:0: dma-mapping.h:398:21: note: expected 'dma_addr_t * {aka long long unsigned int *}' but argument is of type 'phys_addr_t * {aka unsigned int *}' static inline void *dma_alloc_coherent(struct device *dev, size_t size, This slightly restructures the code so the address we use for mapping RAM into a DMA address is always a dma_addr_t, avoiding the warning. The code is correct even if both types are 32-bit because the DMA master in this device only supports 32-bit addressing anyway, independent of the types that are used. We still assign this value to pool->phys, and that is wrong if the driver is ever used with an IOMMU, but that value appears to be never used, so there is no problem really. I've added a couple of comments about where we do things that are slightly violating the API. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/ti/davinci_cpdma.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 657b65bf5cac..18bf3a8fdc50 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -82,7 +82,7 @@ struct cpdma_desc { struct cpdma_desc_pool { phys_addr_t phys; - u32 hw_addr; + dma_addr_t hw_addr; void __iomem *iomap; /* ioremap map */ void *cpumap; /* dma_alloc map */ int desc_size, mem_size; @@ -152,7 +152,7 @@ struct cpdma_chan { * abstract out these details */ static struct cpdma_desc_pool * -cpdma_desc_pool_create(struct device *dev, u32 phys, u32 hw_addr, +cpdma_desc_pool_create(struct device *dev, u32 phys, dma_addr_t hw_addr, int size, int align) { int bitmap_size; @@ -176,13 +176,13 @@ cpdma_desc_pool_create(struct device *dev, u32 phys, u32 hw_addr, if (phys) { pool->phys = phys; - pool->iomap = ioremap(phys, size); + pool->iomap = ioremap(phys, size); /* should be memremap? */ pool->hw_addr = hw_addr; } else { - pool->cpumap = dma_alloc_coherent(dev, size, &pool->phys, + pool->cpumap = dma_alloc_coherent(dev, size, &pool->hw_addr, GFP_KERNEL); - pool->iomap = pool->cpumap; - pool->hw_addr = pool->phys; + pool->iomap = (void __iomem __force *)pool->cpumap; + pool->phys = pool->hw_addr; /* assumes no IOMMU, don't use this value */ } if (pool->iomap) -- 2.7.0