Merge branch 'master' of... (81b6b964) · Commits · 戴 / test

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux; tag 'dma-mapping-5.5' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping updates from Christoph Hellwig: - improve dma-debug scalability (Eric Dumazet) - tiny dma-debug cleanup (Dan Carpenter) - check for vmap memory in dma_map_single (Kees Cook) - check for dma_addr_t overflows in dma-direct when using DMA offsets (Nicolas Saenz Julienne) - switch the x86 sta2x11 SOC to use more generic DMA code (Nicolas Saenz Julienne) - fix arm-nommu dma-ranges handling (Vladimir Murzin) - use __initdata in CMA (Shyam Saini) - replace the bus dma mask with a limit (Nicolas Saenz Julienne) - merge the remapping helpers into the main dma-direct flow (me) - switch xtensa to the generic dma remap handling (me) - various cleanups around dma_capable (me) - remove unused dev arguments to various dma-noncoherent helpers (me) * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: * tag 'dma-mapping-5.5' of git://git.infradead.org/users/hch/dma-mapping: (22 commits) dma-mapping: treat dev->bus_dma_mask as a DMA limit dma-direct: exclude dma_direct_map_resource from the min_low_pfn check dma-direct: don't check swiotlb=force in dma_direct_map_resource dma-debug: clean up put_hash_bucket() powerpc: remove support for NULL dev in __phys_to_dma / __dma_to_phys dma-direct: avoid a forward declaration for phys_to_dma dma-direct: unify the dma_capable definitions dma-mapping: drop the dev argument to arch_sync_dma_for_* x86/PCI: sta2x11: use default DMA address translation dma-direct: check for overflows on 32 bit DMA addresses dma-debug: increase HASH_SIZE dma-debug: reorder struct dma_debug_entry fields xtensa: use the generic uncached segment support dma-mapping: merge the generic remapping helpers into dma-direct dma-direct: provide mmap and get_sgtable method overrides dma-direct: remove the dma_handle argument to __dma_direct_alloc_pages dma-direct: remove __dma_direct_free_pages usb: core: Remove redundant vmap checks kernel: dma-contiguous: mark CMA parameters __initdata/__initconst dma-debug: add a schedule point in debug_dma_dump_mappings() ...

arch/arc/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		config ARC
		def_bool y
		select ARC_TIMERS
		select ARCH_HAS_DMA_COHERENT_TO_PFN
		select ARCH_HAS_DMA_PREP_COHERENT
		select ARCH_HAS_PTE_SPECIAL
		select ARCH_HAS_SETUP_DMA_OPS

arch/arc/mm/dma.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -48,8 +48,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size)
		* upper layer functions (in include/linux/dma-mapping.h)
		*/

		void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
		size_t size, enum dma_data_direction dir)
		void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,
		enum dma_data_direction dir)
		{
		switch (dir) {
		case DMA_TO_DEVICE:
		@@ -69,8 +69,8 @@ void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
		}
		}

		void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
		size_t size, enum dma_data_direction dir)
		void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,
		enum dma_data_direction dir)
		{
		switch (dir) {
		case DMA_TO_DEVICE:

arch/arm/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ config ARM
		select ARCH_HAS_BINFMT_FLAT
		select ARCH_HAS_DEBUG_VIRTUAL if MMU
		select ARCH_HAS_DEVMEM_IS_ALLOWED
		select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
		select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
		select ARCH_HAS_ELF_RANDOMIZE
		select ARCH_HAS_FORTIFY_SOURCE

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -14,23 +14,4 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
		return __pfn_to_phys(dma_to_pfn(dev, dev_addr)) + offset;
		}

		static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
		{
		u64 limit, mask;

		if (!dev->dma_mask)
		return 0;

		mask = *dev->dma_mask;

		limit = (mask + 1) & ~mask;
		if (limit && size > limit)
		return 0;

		if ((addr \| (addr + size - 1)) & ~mask)
		return 0;

		return 1;
		}

		#endif /* ASM_ARM_DMA_DIRECT_H */

arch/arm/mm/dma-mapping-nommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ static void arm_nommu_dma_alloc(struct device dev, size_t size,
		unsigned long attrs)

		{
		void *ret = dma_alloc_from_global_coherent(size, dma_handle);
		void *ret = dma_alloc_from_global_coherent(dev, size, dma_handle);

		/*
		* dma_alloc_from_global_coherent() may fail because:

Admin message