raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ARM: dma: Use dma_pfn_offset for dma address translation"

Browse Source 
This reverts commit 6ce0d20016.
This commit is contained in:
popcornmix
2014-08-07 02:03:50 +01:00
parent ba476b5b4e
commit a57016e22c
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/include/asm/dma-mapping.h
View File

@@ -58,37 +58,21 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
#ifndef __arch_pfn_to_dma #ifndef __arch_pfn_to_dma
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
{ {
if (dev)
pfn -= dev->dma_pfn_offset;
return (dma_addr_t)__pfn_to_bus(pfn); return (dma_addr_t)__pfn_to_bus(pfn);
} }
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
{ {
unsigned long pfn = __bus_to_pfn(addr); return __bus_to_pfn(addr);
if (dev)
pfn += dev->dma_pfn_offset;
return pfn;
} }
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
{ {
if (dev) {
unsigned long pfn = dma_to_pfn(dev, addr);
return phys_to_virt(__pfn_to_phys(pfn));
}
return (void *)__bus_to_virt((unsigned long)addr); return (void *)__bus_to_virt((unsigned long)addr);
} }
static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
{ {
if (dev)
return pfn_to_dma(dev, virt_to_pfn(addr));
return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
} }