From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031126AbcCQPu7 (ORCPT ); Thu, 17 Mar 2016 11:50:59 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:44044 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030409AbcCQPu4 (ORCPT ); Thu, 17 Mar 2016 11:50:56 -0400 From: Sinan Kaya To: linux-arm-kernel@lists.infradead.org, timur@codeaurora.org, cov@codeaurora.org, nwatters@codeaurora.org Cc: Sinan Kaya , Catalin Marinas , Will Deacon , Andrew Morton , Max Filippov , Joe Perches , "Suthikulpanit, Suravee" , Robin Murphy , Arnd Bergmann , Jisheng Zhang , Dean Nelson , "Suzuki K. Poulose" , Marek Szyprowski , linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dma-mapping: fix dma_to_phys API for IOMMU attached devices Date: Thu, 17 Mar 2016 11:50:29 -0400 Message-Id: <1458229833-4886-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch modifies dma_to_phys to call iommu_iova_to_phys to perform dma to phys conversions for IOMMU attached devices where dma and physical addresses often have distinct values. Signed-off-by: Nate Watterson Signed-off-by: Sinan Kaya --- arch/arm64/include/asm/dma-mapping.h | 5 +---- arch/arm64/mm/dma-mapping.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index ba437f0..a0a486c 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -69,10 +69,7 @@ static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) return (dma_addr_t)paddr; } -static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) -{ - return (phys_addr_t)dev_addr; -} +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr); static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 331c4ca..8252a92 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -989,3 +989,19 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->archdata.dma_coherent = coherent; __iommu_setup_dma_ops(dev, dma_base, size, iommu); } + +phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) +{ + phys_addr_t phys = (phys_addr_t)dev_addr; + +#ifdef CONFIG_IOMMU_DMA + struct iommu_domain *domain; + + domain = iommu_get_domain_for_dev(dev); + if (domain) + phys = iommu_iova_to_phys(domain, dev_addr); +#endif + + return phys; +} +EXPORT_SYMBOL(dma_to_phys); -- 1.8.2.1