Re: [PATCH 1/2] MIPS: remove unnecessary platform dma helper functions

[David Daney <ddaney.cavm@xxxxxxxxx>]

That's a mighty thin changelog there.

You are changing the semantics in the 
asm/mach-cavium-octeon/dma-coherence.h case.

Have you verified that all in-tree cases really are NOPs?

David Daney


On 08/12/2013 04:22 AM, Felix Fietkau wrote:
> Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
> ---
>   arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h | 12 ------------
>   arch/mips/include/asm/mach-generic/dma-coherence.h       | 10 ----------
>   arch/mips/include/asm/mach-ip27/dma-coherence.h          | 10 ----------
>   arch/mips/include/asm/mach-ip32/dma-coherence.h          | 11 -----------
>   arch/mips/include/asm/mach-jazz/dma-coherence.h          | 10 ----------
>   arch/mips/include/asm/mach-loongson/dma-coherence.h      | 10 ----------
>   arch/mips/include/asm/mach-powertv/dma-coherence.h       | 10 ----------
>   arch/mips/mm/dma-default.c                               |  4 +---
>   8 files changed, 1 insertion(+), 76 deletions(-)
>
> diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
> index 47fb247..f9f4486 100644
> --- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
> @@ -52,23 +52,11 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 0;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -	BUG();
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 1;
>   }
>
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	BUG();
> -	return 0;
> -}
> -
>   dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
>   phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
>
> diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h
> index 74cb992..a9e8f6b 100644
> --- a/arch/mips/include/asm/mach-generic/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
> @@ -47,16 +47,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   #ifdef CONFIG_DMA_COHERENT
> diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h
> index 06c4419..4ffddfd 100644
> --- a/arch/mips/include/asm/mach-ip27/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h
> @@ -58,16 +58,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 1;		/* IP27 non-cohernet mode is unsupported */
> diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h
> index 073f0c4..104cfbc 100644
> --- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
> @@ -80,17 +80,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -	return;
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 0;		/* IP32 is non-cohernet */
> diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h
> index 9fc1e9a..949003e 100644
> --- a/arch/mips/include/asm/mach-jazz/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h
> @@ -48,16 +48,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 0;
> diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h
> index e143305..aeb2c05 100644
> --- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
> @@ -53,16 +53,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 0;
> diff --git a/arch/mips/include/asm/mach-powertv/dma-coherence.h b/arch/mips/include/asm/mach-powertv/dma-coherence.h
> index f831672..5d4c3fe 100644
> --- a/arch/mips/include/asm/mach-powertv/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h
> @@ -99,16 +99,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
>   	return 1;
>   }
>
> -static inline void plat_extra_sync_for_device(struct device *dev)
> -{
> -}
> -
> -static inline int plat_dma_mapping_error(struct device *dev,
> -					 dma_addr_t dma_addr)
> -{
> -	return 0;
> -}
> -
>   static inline int plat_device_is_coherent(struct device *dev)
>   {
>   	return 0;
> diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
> index aaccf1c..63e45d6 100644
> --- a/arch/mips/mm/dma-default.c
> +++ b/arch/mips/mm/dma-default.c
> @@ -292,7 +292,6 @@ static void mips_dma_sync_single_for_cpu(struct device *dev,
>   static void mips_dma_sync_single_for_device(struct device *dev,
>   	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
>   {
> -	plat_extra_sync_for_device(dev);
>   	if (!plat_device_is_coherent(dev))
>   		__dma_sync(dma_addr_to_page(dev, dma_handle),
>   			   dma_handle & ~PAGE_MASK, size, direction);
> @@ -326,7 +325,7 @@ static void mips_dma_sync_sg_for_device(struct device *dev,
>
>   int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
>   {
> -	return plat_dma_mapping_error(dev, dma_addr);
> +	return 0;
>   }
>
>   int mips_dma_supported(struct device *dev, u64 mask)
> @@ -339,7 +338,6 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
>   {
>   	BUG_ON(direction == DMA_NONE);
>
> -	plat_extra_sync_for_device(dev);
>   	if (!plat_device_is_coherent(dev))
>   		__dma_sync_virtual(vaddr, size, direction);
>   }