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

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

Pull dma-mapping fixes from Christoph Hellwig:

 - fix the handling of the bus_dma_mask in dma_get_required_mask, which
   caused a regression in this merge window (Lucas Stach)

 - fix a regression in the handling of DMA_ATTR_NO_KERNEL_MAPPING (me)

 - fix dma_mmap_coherent to not cause page attribute mismatches on
   coherent architectures like x86 (me)

* tag 'dma-mapping-5.3-4' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: fix page attributes for dma_mmap_*
  dma-direct: don't truncate dma_required_mask to bus addressing capabilities
  dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING
parents b5e33e44 33dcb37c

arch/arm/mm/dma-mapping.c

+1 −3
Original line number Diff line number Diff line
@@ -2405,9 +2405,7 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr, 
pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,

		unsigned long attrs)

{

	if (!dev_is_dma_coherent(dev))

	return __get_dma_pgprot(attrs, prot);

	return prot;

}



void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,

arch/arm64/mm/dma-mapping.c

+1 −3
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ 
pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,

		unsigned long attrs)

{

	if (!dev_is_dma_coherent(dev) || (attrs & DMA_ATTR_WRITE_COMBINE))

	return pgprot_writecombine(prot);

	return prot;

}



void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ config PPC 
	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_MMAP_PGPROT

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

arch/powerpc/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ obj-y := cputable.o ptrace.o syscalls.o \ 
				   signal.o sysfs.o cacheinfo.o time.o \

				   prom.o traps.o setup-common.o \

				   udbg.o misc.o io.o misc_$(BITS).o \

				   of_platform.o prom_parse.o \

				   dma-common.o

				   of_platform.o prom_parse.o

obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \

				   signal_64.o ptrace32.o \

				   paca.o nvram_64.o firmware.o

arch/powerpc/kernel/dma-common.c

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Contains common dma routines for all powerpc platforms.

 *

 * Copyright (C) 2019 Shawn Anastasio.

 */



#include <linux/mm.h>

#include <linux/dma-noncoherent.h>



pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,

		unsigned long attrs)

{

	if (!dev_is_dma_coherent(dev))

		return pgprot_noncached(prot);

	return prot;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE