Commit 671df189 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dma-mapping updates from Christoph Hellwig:

 - add dma-mapping and block layer helpers to take care of IOMMU merging
   for mmc plus subsequent fixups (Yoshihiro Shimoda)

 - rework handling of the pgprot bits for remapping (me)

 - take care of the dma direct infrastructure for swiotlb-xen (me)

 - improve the dma noncoherent remapping infrastructure (me)

 - better defaults for ->mmap, ->get_sgtable and ->get_required_mask
   (me)

 - cleanup mmaping of coherent DMA allocations (me)

 - various misc cleanups (Andy Shevchenko, me)

* tag 'dma-mapping-5.4' of git://git.infradead.org/users/hch/dma-mapping: (41 commits)
  mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE
  mmc: queue: Fix bigger segments usage
  arm64: use asm-generic/dma-mapping.h
  swiotlb-xen: merge xen_unmap_single into xen_swiotlb_unmap_page
  swiotlb-xen: simplify cache maintainance
  swiotlb-xen: use the same foreign page check everywhere
  swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtable
  xen: remove the exports for xen_{create,destroy}_contiguous_region
  xen/arm: remove xen_dma_ops
  xen/arm: simplify dma_cache_maint
  xen/arm: use dev_is_dma_coherent
  xen/arm: consolidate page-coherent.h
  xen/arm: use dma-noncoherent.h calls for xen-swiotlb cache maintainance
  arm: remove wrappers for the generic dma remap helpers
  dma-mapping: introduce a dma_common_find_pages helper
  dma-mapping: always use VM_DMA_COHERENT for generic DMA remap
  vmalloc: lift the arm flag for coherent mappings to common code
  dma-mapping: provide a better default ->get_required_mask
  dma-mapping: remove the dma_declare_coherent_memory export
  remoteproc: don't allow modular build
  ...
parents c9fe5630 c7d9eccb

Documentation/DMA-API.txt

+8 −11
Original line number Diff line number Diff line
@@ -204,6 +204,14 @@ Returns the maximum size of a mapping for the device. The size parameter 
of the mapping functions like dma_map_single(), dma_map_page() and

others should not be larger than the returned value.



::



	unsigned long

	dma_get_merge_boundary(struct device *dev);



Returns the DMA merge boundary. If the device cannot merge any the DMA address

segments, the function returns 0.



Part Id - Streaming DMA mappings

--------------------------------
@@ -595,17 +603,6 @@ For reasons of efficiency, most platforms choose to track the declared 
region only at the granularity of a page.  For smaller allocations,

you should use the dma_pool() API.



::



	void

	dma_release_declared_memory(struct device *dev)



Remove the memory region previously declared from the system.  This

API performs *no* in-use checking for this region and will return

unconditionally having removed all the required structures.  It is the

driver's job to ensure that no parts of this memory region are

currently in use.



Part III - Debug drivers use of the DMA-API

-------------------------------------------

Documentation/x86/x86_64/boot-options.rst

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ IOMMU (input/output memory management unit) 
===========================================

Multiple x86-64 PCI-DMA mapping implementations exist, for example:



   1. <lib/dma-direct.c>: use no hardware/software IOMMU at all

   1. <kernel/dma/direct.c>: use no hardware/software IOMMU at all

      (e.g. because you have < 3 GB memory).

      Kernel boot message: "PCI-DMA: Disabling IOMMU"

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -793,9 +793,6 @@ config COMPAT_32BIT_TIME 
	  This is relevant on all 32-bit architectures, and 64-bit architectures

	  as part of compat syscall handling.



config ARCH_NO_COHERENT_DMA_MMAP

	bool



config ARCH_NO_PREEMPT

	bool

arch/alpha/kernel/pci_iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -955,5 +955,7 @@ const struct dma_map_ops alpha_pci_ops = { 
	.map_sg			= alpha_pci_map_sg,

	.unmap_sg		= alpha_pci_unmap_sg,

	.dma_supported		= alpha_pci_supported,

	.mmap			= dma_common_mmap,

	.get_sgtable		= dma_common_get_sgtable,

};

EXPORT_SYMBOL(alpha_pci_ops);

arch/arc/mm/dma.c

+0 −6
Original line number Diff line number Diff line
@@ -104,9 +104,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
	dev_info(dev, "use %scoherent DMA ops\n",

		 dev->dma_coherent ? "" : "non");

}
 


static int __init atomic_pool_init(void)

{

	return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL));

}

postcore_initcall(atomic_pool_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE