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

Commit e37e0ee0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping updates from Christoph Hellwig:

 - turn dma_cache_sync into a dma_map_ops instance and remove
   implementation that purely are dead because the architecture doesn't
   support noncoherent allocations

 - add a flag for busses that need DMA configuration (Robin Murphy)

* tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: turn dma_cache_sync into a dma_map_ops method
  sh: make dma_cache_sync a no-op
  xtensa: make dma_cache_sync a no-op
  unicore32: make dma_cache_sync a no-op
  powerpc: make dma_cache_sync a no-op
  mn10300: make dma_cache_sync a no-op
  microblaze: make dma_cache_sync a no-op
  ia64: make dma_cache_sync a no-op
  frv: make dma_cache_sync a no-op
  x86: make dma_cache_sync a no-op
  floppy: consolidate the dummy fd_cacheflush definition
  drivers: flag buses which demand DMA configuration
parents 23c25876 c9eb6172

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

+0 −2
Original line number Diff line number Diff line
@@ -9,6 +9,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return dma_ops;

}



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



#endif	/* _ALPHA_DMA_MAPPING_H */

arch/alpha/include/asm/floppy.h

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count)

#define fd_enable_irq()         enable_irq(FLOPPY_IRQ)

#define fd_disable_irq()        disable_irq(FLOPPY_IRQ)

#define fd_cacheflush(addr,size) /* nothing */

#define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt,\

					    0, "floppy", NULL)

#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL)
@@ -62,7 +61,6 @@ alpha_fd_dma_setup(char *addr, unsigned long size, int mode, int io) 
	prev_dir = dir;



	fd_clear_dma_ff();

	fd_cacheflush(addr, size);

	fd_set_dma_mode(mode);

	set_dma_addr(FLOPPY_DMA, bus_addr);

	fd_set_dma_count(size);

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

+0 −6
Original line number Diff line number Diff line
@@ -17,10 +17,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
}

#endif



static inline void

dma_cache_sync(struct device *dev, void *vaddr, size_t size,

	       enum dma_data_direction direction)

{

}



#endif

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

+0 −7
Original line number Diff line number Diff line
@@ -15,11 +15,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return &frv_dma_ops;

}



static inline

void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

		    enum dma_data_direction direction)

{

	flush_write_buffers();

}



#endif  /* _ASM_DMA_MAPPING_H */

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

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return dma_ops;

}



extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

			   enum dma_data_direction direction);



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

{

	if (!dev->dma_mask)