Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452e06af authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

dma-mapping: consolidate dma_set_mask 



Almost everyone implements dma_set_mask the same way, although some time
that's hidden in ->set_dma_mask methods.

This patch consolidates those into a common implementation that either
calls ->set_dma_mask if present or otherwise uses the default
implementation.  Some architectures used to only call ->set_dma_mask
after the initial checks, and those instance have been fixed to do the
full work.  h8300 implemented dma_set_mask bogusly as a no-ops and has
been fixed.

Unfortunately some architectures overload unrelated semantics like changing
the dma_ops into it so we still need to allow for an architecture override
for now.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee196371

arch/alpha/include/asm/dma-mapping.h

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 


#include <asm-generic/dma-mapping-common.h>



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	return get_dma_ops(dev)->set_dma_mask(dev, mask);

}



#define dma_cache_sync(dev, va, size, dir)		  ((void)0)



#endif	/* _ALPHA_DMA_MAPPING_H */

arch/alpha/kernel/pci-noop.c

+0 −10
Original line number Diff line number Diff line
@@ -166,15 +166,6 @@ static int alpha_noop_supported(struct device *dev, u64 mask) 
	return mask < 0x00ffffffUL ? 0 : 1;

}



static int alpha_noop_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

		return -EIO;



	*dev->dma_mask = mask;

	return 0;

}



struct dma_map_ops alpha_noop_ops = {

	.alloc			= alpha_noop_alloc_coherent,

	.free			= alpha_noop_free_coherent,
@@ -182,7 +173,6 @@ struct dma_map_ops alpha_noop_ops = { 
	.map_sg			= alpha_noop_map_sg,

	.mapping_error		= alpha_noop_mapping_error,

	.dma_supported		= alpha_noop_supported,

	.set_dma_mask		= alpha_noop_set_mask,

};



struct dma_map_ops *dma_ops = &alpha_noop_ops;

arch/alpha/kernel/pci_iommu.c

+0 −11
Original line number Diff line number Diff line
@@ -939,16 +939,6 @@ static int alpha_pci_mapping_error(struct device *dev, dma_addr_t dma_addr) 
	return dma_addr == 0;

}



static int alpha_pci_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask ||

	    !pci_dma_supported(alpha_gendev_to_pci(dev), mask))

		return -EIO;



	*dev->dma_mask = mask;

	return 0;

}



struct dma_map_ops alpha_pci_ops = {

	.alloc			= alpha_pci_alloc_coherent,

	.free			= alpha_pci_free_coherent,
@@ -958,7 +948,6 @@ struct dma_map_ops alpha_pci_ops = { 
	.unmap_sg		= alpha_pci_unmap_sg,

	.mapping_error		= alpha_pci_mapping_error,

	.dma_supported		= alpha_pci_supported,

	.set_dma_mask		= alpha_pci_set_mask,

};



struct dma_map_ops *dma_ops = &alpha_pci_ops;

arch/arm/include/asm/dma-mapping.h

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ extern int dma_supported(struct device *dev, u64 mask); 
 */

#include <asm-generic/dma-mapping-common.h>



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	return get_dma_ops(dev)->set_dma_mask(dev, mask);

}



#ifdef __arch_page_to_dma

#error Please update to __arch_pfn_to_dma

#endif

arch/arm64/include/asm/dma-mapping.h

+0 −9
Original line number Diff line number Diff line
@@ -84,15 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) 
	return (phys_addr_t)dev_addr;

}



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

		return -EIO;

	*dev->dma_mask = mask;



	return 0;

}



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	if (!dev->dma_mask)