Commit 9ae2a143 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dma-mapping updates from Christoph Hellwig:

 - do not zero buffer in set_memory_decrypted (Kirill A. Shutemov)

 - fix return value of dma-debug __setup handlers (Randy Dunlap)

 - swiotlb cleanups (Robin Murphy)

 - remove most remaining users of the pci-dma-compat.h API
   (Christophe JAILLET)

 - share the ABI header for the DMA map_benchmark with userspace
   (Tian Tao)

 - update the maintainer for DMA MAPPING BENCHMARK (Xiang Chen)

 - remove CONFIG_DMA_REMAP (me)

* tag 'dma-mapping-5.18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: extract a common header file for map_benchmark definition
  dma-debug: fix return value of __setup handlers
  dma-mapping: remove CONFIG_DMA_REMAP
  media: v4l2-pci-skeleton: Remove usage of the deprecated "pci-dma-compat.h" API
  rapidio/tsi721: Remove usage of the deprecated "pci-dma-compat.h" API
  sparc: Remove usage of the deprecated "pci-dma-compat.h" API
  agp/intel: Remove usage of the deprecated "pci-dma-compat.h" API
  alpha: Remove usage of the deprecated "pci-dma-compat.h" API
  MAINTAINERS: update maintainer list of DMA MAPPING BENCHMARK
  swiotlb: simplify array allocation
  swiotlb: tidy up includes
  swiotlb: simplify debugfs setup
  swiotlb: do not zero buffer in set_memory_decrypted()
parents 37fcacb5 8ddde07a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5880,7 +5880,7 @@ F: include/linux/dma-map-ops.h 
F:	kernel/dma/









DMA MAPPING BENCHMARK









M:	Barry Song <song.bao.hua@hisilicon.com>









M:	Xiang Chen <chenxiang66@hisilicon.com>









L:	iommu@lists.linux-foundation.org









F:	kernel/dma/map_benchmark.c









F:	tools/testing/selftests/dma/
































arch/alpha/include/asm/floppy.h



+4
−3






























Original line number
Diff line number
Diff line







@@ -43,17 +43,18 @@ alpha_fd_dma_setup(char *addr, unsigned long size, int mode, int io)







	static int prev_dir;









	int dir;



















	dir = (mode != DMA_MODE_READ) ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE;









	dir = (mode != DMA_MODE_READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;



















	if (bus_addr 









	    && (addr != prev_addr || size != prev_size || dir != prev_dir)) {









		/* different from last time -- unmap prev */









		pci_unmap_single(isa_bridge, bus_addr, prev_size, prev_dir);









		dma_unmap_single(&isa_bridge->dev, bus_addr, prev_size,









				 prev_dir);









		bus_addr = 0;









	}



















	if (!bus_addr)	/* need to map it */









		bus_addr = pci_map_single(isa_bridge, addr, size, dir);









		bus_addr = dma_map_single(&isa_bridge->dev, addr, size, dir);



















	/* remember this one as prev */









	prev_addr = addr;
































arch/alpha/kernel/pci_iommu.c



+6
−6






























Original line number
Diff line number
Diff line







@@ -333,7 +333,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page,







	struct pci_dev *pdev = alpha_gendev_to_pci(dev);









	int dac_allowed;



















	BUG_ON(dir == PCI_DMA_NONE);









	BUG_ON(dir == DMA_NONE);



















	dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; 









	return pci_map_single_1(pdev, (char *)page_address(page) + offset, 








@@ -356,7 +356,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,







	struct pci_iommu_arena *arena;









	long dma_ofs, npages;



















	BUG_ON(dir == PCI_DMA_NONE);









	BUG_ON(dir == DMA_NONE);



















	if (dma_addr >= __direct_map_base









	    && dma_addr < __direct_map_base + __direct_map_size) {








@@ -460,7 +460,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size,







				    unsigned long attrs)









{









	struct pci_dev *pdev = alpha_gendev_to_pci(dev);









	pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);









	dma_unmap_single(&pdev->dev, dma_addr, size, DMA_BIDIRECTIONAL);









	free_pages((unsigned long)cpu_addr, get_order(size));



















	DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n",








@@ -639,7 +639,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,







	dma_addr_t max_dma;









	int dac_allowed;



















	BUG_ON(dir == PCI_DMA_NONE);









	BUG_ON(dir == DMA_NONE);



















	dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;


















@@ -702,7 +702,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,







	/* Some allocation failed while mapping the scatterlist









	   entries.  Unmap them now.  */









	if (out > start)









		pci_unmap_sg(pdev, start, out - start, dir);









		dma_unmap_sg(&pdev->dev, start, out - start, dir);









	return -ENOMEM;









}


















@@ -722,7 +722,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,







	dma_addr_t max_dma;









	dma_addr_t fbeg, fend;



















	BUG_ON(dir == PCI_DMA_NONE);









	BUG_ON(dir == DMA_NONE);



















	if (! alpha_mv.mv_pci_tbi)









		return;
































arch/arm/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -49,7 +49,7 @@ config ARM







	select DMA_DECLARE_COHERENT









	select DMA_GLOBAL_POOL if !MMU









	select DMA_OPS









	select DMA_REMAP if MMU









	select DMA_NONCOHERENT_MMAP if MMU









	select EDAC_SUPPORT









	select EDAC_ATOMIC_SCRUB









	select GENERIC_ALLOCATOR
































arch/sparc/kernel/ioport.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -309,7 +309,7 @@ arch_initcall(sparc_register_ioport);







void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,









		enum dma_data_direction dir)









{









	if (dir != PCI_DMA_TODEVICE &&









	if (dir != DMA_TO_DEVICE &&









	    sparc_cpu_model == sparc_leon &&









	    !sparc_leon3_snooping_enabled())









		leon_flush_dcache_all();