| Message ID | 1458252137-24497-3-git-send-email-okaya@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17/03/16 22:02, Sinan Kaya wrote: > 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 <okaya@codeaurora.org> > --- > 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/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 > Could the default definition not be pushed all the way down into swiotlb.c (or at least swiotlb.h)? Robin.
On 3/18/2016 7:31 AM, Robin Murphy wrote: > On 17/03/16 22:02, Sinan Kaya wrote: >> 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 <okaya@codeaurora.org> >> --- >> 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/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 >> > > Could the default definition not be pushed all the way down into swiotlb.c (or at least swiotlb.h)? I can do that but then we lose the inlining capability of the compiler. This could cost performance penalty on architectures using it. I tried moving it to swiotlb.h. swiotlb.h seems to be only used by swiotlb.c file. I could try including it into dma-mapping.h and then moving the definitions into swiotlb.h file. Let me give this a try. > > Robin. >
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
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 <okaya@codeaurora.org> --- 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(-)