lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 6 Mar 2014 17:19:57 +0800 From: Santosh Shilimkar <santosh.shilimkar@...com> To: <linux-kernel@...r.kernel.org> CC: <linux-arm-kernel@...ts.infradead.org>, <devicetree@...r.kernel.org>, Grygorii Strashko <grygorii.strashko@...com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Russell King <linux@....linux.org.uk>, Arnd Bergmann <arnd@...db.de>, Olof Johansson <olof@...om.net>, Grant Likely <grant.likely@...aro.org>, Rob Herring <robh+dt@...nel.org>, Catalin Marinas <catalin.marinas@....com>, Linus Walleij <linus.walleij@...aro.org>, Santosh Shilimkar <santosh.shilimkar@...com> Subject: [PATCH 6/7] ARM: dma: Use dma_pfn_offset for dma address translation From: Grygorii Strashko <grygorii.strashko@...com> In most of cases DMA addresses can be performed using offset value of Bus address space relatively to physical address space as following: PFN->DMA: __pfn_to_phys(pfn + [-]dma_pfn_offset) DMA->PFN: __phys_to_pfn(dma_addr) + [-]dma_pfn_offset Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Russell King <linux@....linux.org.uk> Cc: Arnd Bergmann <arnd@...db.de> Cc: Olof Johansson <olof@...om.net> Cc: Grant Likely <grant.likely@...aro.org> Cc: Rob Herring <robh+dt@...nel.org> Cc: Catalin Marinas <catalin.marinas@....com> Cc: Linus Walleij <linus.walleij@...aro.org> Signed-off-by: Grygorii Strashko <grygorii.strashko@...com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@...com> --- arch/arm/include/asm/dma-mapping.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index e701a4d..8c12149 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -58,22 +58,31 @@ static inline int dma_set_mask(struct device *dev, u64 mask) #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) { - return (dma_addr_t)__pfn_to_bus(pfn); + if (!dev) + return DMA_ERROR_CODE; + return (dma_addr_t)__pfn_to_bus(pfn - dev->dma_pfn_offset); } static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) { - return __bus_to_pfn(addr); + if (!dev) + return 0; + return __bus_to_pfn(addr) + dev->dma_pfn_offset; } static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) { - return (void *)__bus_to_virt((unsigned long)addr); + if (!dev) + return NULL; + return (void *)__bus_to_virt(__pfn_to_bus(dma_to_pfn(dev, addr))); } static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) { - return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); + if (!dev) + return DMA_ERROR_CODE; + return pfn_to_dma(dev, + __bus_to_pfn(__virt_to_bus((unsigned long)(addr)))); } #else -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists