From patchwork Thu Mar 17 22:02:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 8614631 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 372979F6E1 for ; Thu, 17 Mar 2016 22:13:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0774E202AE for ; Thu, 17 Mar 2016 22:13:21 +0000 (UTC) Received: from bombadil.infradead.org (unknown [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 DD3F02026F for ; Thu, 17 Mar 2016 22:13:19 +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 1agg16-0006qX-Lh; Thu, 17 Mar 2016 22:03:40 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1agg0w-0006ef-HL for linux-arm-kernel@lists.infradead.org; Thu, 17 Mar 2016 22:03:33 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id C9D12611E2; Thu, 17 Mar 2016 22:03:13 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C0EFA60F37; Thu, 17 Mar 2016 22:03:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RDNS_NONE,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4E0DD60316; Thu, 17 Mar 2016 22:03:09 +0000 (UTC) From: Sinan Kaya To: linux-arm-kernel@lists.infradead.org, timur@codeaurora.org, cov@codeaurora.org, nwatters@codeaurora.org Subject: [PATCH 3/3] dma-mapping: move swiotlb dma-phys functions to common header Date: Thu, 17 Mar 2016 18:02:17 -0400 Message-Id: <1458252137-24497-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1458252137-24497-1-git-send-email-okaya@codeaurora.org> References: <1458252137-24497-1-git-send-email-okaya@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160317_150330_953816_BEE788BA X-CRM114-Status: GOOD ( 12.20 ) 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: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-xtensa@linux-xtensa.org, Catalin Marinas , Will Deacon , Sinan Kaya , Max Filippov , Chris Metcalf , "H. Peter Anvin" , Guan Xuetao , Florian Fainelli , x86@kernel.org, Ingo Molnar , Guenter Roeck , Fenghua Yu , Denys Vlasenko , Arnd Bergmann , Akinobu Mita , Geliang Tang , Zhen Lei , Thomas Gleixner , Valentin Rothberg , Chris Zankel , Tony Luck , linux-kernel@vger.kernel.org, Ralf Baechle , "Suthikulpanit, Suravee" , Joe Perches , Andrew Morton , Robin Murphy MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Moving the default implementation of swiotlb_dma_to_phys and swiotlb_phys_to_dma functions to dma-mapping.h so that we can get rid of the duplicate code in multiple ARCH. Signed-off-by: Sinan Kaya --- arch/arm64/include/asm/dma-mapping.h | 14 -------------- arch/ia64/include/asm/dma-mapping.h | 14 -------------- arch/mips/include/asm/mach-generic/dma-coherence.h | 16 ---------------- arch/tile/include/asm/dma-mapping.h | 14 -------------- arch/unicore32/include/asm/dma-mapping.h | 14 -------------- arch/x86/include/asm/dma-mapping.h | 13 ------------- arch/xtensa/include/asm/dma-mapping.h | 14 -------------- include/linux/dma-mapping.h | 14 ++++++++++++++ 8 files changed, 14 insertions(+), 99 deletions(-) diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 39f21e8..5654357 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -64,20 +64,6 @@ static inline bool is_device_dma_coherent(struct device *dev) return dev->archdata.dma_coherent; } -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return (dma_addr_t)paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t dev_addr) -{ - return (phys_addr_t)dev_addr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys - static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { if (!dev->dma_mask) diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h index a8736b9..e6dd1f7 100644 --- a/arch/ia64/include/asm/dma-mapping.h +++ b/arch/ia64/include/asm/dma-mapping.h @@ -33,20 +33,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) return addr + size - 1 <= *dev->dma_mask; } -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys - static inline void dma_cache_sync (struct device *dev, void *vaddr, size_t size, enum dma_data_direction dir) diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h index 54fde22..7bb5de0 100644 --- a/arch/mips/include/asm/mach-generic/dma-coherence.h +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h @@ -58,20 +58,4 @@ static inline void plat_post_dma_flush(struct device *dev) } #endif -#ifdef CONFIG_SWIOTLB -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys -#endif - #endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */ diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h index 87c205a..c9cc14e 100644 --- a/arch/tile/include/asm/dma-mapping.h +++ b/arch/tile/include/asm/dma-mapping.h @@ -47,20 +47,6 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off) dev->archdata.dma_offset = off; } -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys - static inline void dma_mark_clean(void *addr, size_t size) {} static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) diff --git a/arch/unicore32/include/asm/dma-mapping.h b/arch/unicore32/include/asm/dma-mapping.h index 762cdd8..c629aa5 100644 --- a/arch/unicore32/include/asm/dma-mapping.h +++ b/arch/unicore32/include/asm/dma-mapping.h @@ -36,20 +36,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) return 1; } -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys - static inline void dma_mark_clean(void *addr, size_t size) {} static inline void dma_cache_sync(struct device *dev, void *vaddr, diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index be8b76e..fd5c7de 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -71,19 +71,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) return addr + size - 1 <= *dev->dma_mask; } -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys #endif /* CONFIG_X86_DMA_REMAP */ static inline void diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index b0d725d..4e6ff4d 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -31,18 +31,4 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); -static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, - phys_addr_t paddr) -{ - return (dma_addr_t)paddr; -} -#define swiotlb_phys_to_dma swiotlb_phys_to_dma - -static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, - dma_addr_t daddr) -{ - return (phys_addr_t)daddr; -} -#define swiotlb_dma_to_phys swiotlb_dma_to_phys - #endif /* _XTENSA_DMA_MAPPING_H */ diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 728ef07..871d620 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -683,4 +683,18 @@ static inline int dma_mmap_writecombine(struct device *dev, #define dma_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) #endif +#ifndef swiotlb_phys_to_dma +static inline dma_addr_t swiotlb_phys_to_dma(struct device *dev, phys_addr_t paddr) +{ + return paddr; +} +#endif + +#ifndef swiotlb_dma_to_phys +static inline phys_addr_t swiotlb_dma_to_phys(struct device *dev, dma_addr_t daddr) +{ + return daddr; +} +#endif + #endif