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

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

Pull DMA mapping updates from Christoph Hellwig:

 - remove the already broken support for NULL dev arguments to the DMA
   API calls

 - Kconfig tidyups

* tag 'dma-mapping-5.2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence
  dma-mapping: remove an unnecessary NULL check
  x86/dma: Remove the x86_dma_fallback_dev hack
  dma-mapping: remove leftover NULL device support
  arm: use a dummy struct device for ISA DMA use of the DMA API
  pxa3xx-gcu: pass struct device to dma_mmap_coherent
  gbefb: switch to managed version of the DMA allocator
  da8xx-fb: pass struct device to DMA API functions
  parport_ip32: pass struct device to DMA API functions
  dma: select GENERIC_ALLOCATOR for DMA_REMAP
parents e57ccca1 13bf5ced

Documentation/DMA-API-HOWTO.txt

+6 −7
Original line number Diff line number Diff line
@@ -365,13 +365,12 @@ __get_free_pages() (but takes size instead of a page order). If your 
driver needs regions sized smaller than a page, you may prefer using

the dma_pool interface, described below.



The consistent DMA mapping interfaces, for non-NULL dev, will by

default return a DMA address which is 32-bit addressable.  Even if the

device indicates (via DMA mask) that it may address the upper 32-bits,

consistent allocation will only return > 32-bit addresses for DMA if

the consistent DMA mask has been explicitly changed via

dma_set_coherent_mask().  This is true of the dma_pool interface as

well.

The consistent DMA mapping interfaces, will by default return a DMA address

which is 32-bit addressable.  Even if the device indicates (via the DMA mask)

that it may address the upper 32-bits, consistent allocation will only

return > 32-bit addresses for DMA if the consistent DMA mask has been

explicitly changed via dma_set_coherent_mask().  This is true of the

dma_pool interface as well.



dma_alloc_coherent() returns two values: the virtual address which you

can use to access it from the CPU and dma_handle which you pass to the

arch/arm/kernel/dma-isa.c

+7 −1
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ static int isa_get_dma_residue(unsigned int chan, dma_t *dma) 
	return chan < 4 ? count : (count << 1);

}



static struct device isa_dma_dev = {

	.init_name		= "fallback device",

	.coherent_dma_mask	= ~(dma_addr_t)0,

	.dma_mask		= &isa_dma_dev.coherent_dma_mask,

};



static void isa_enable_dma(unsigned int chan, dma_t *dma)

{

	if (dma->invalid) {
@@ -89,7 +95,7 @@ static void isa_enable_dma(unsigned int chan, dma_t *dma) 
			dma->sg = &dma->buf;

			dma->sgcount = 1;

			dma->buf.length = dma->count;

			dma->buf.dma_address = dma_map_single(NULL,

			dma->buf.dma_address = dma_map_single(&isa_dma_dev,

				dma->addr, dma->count,

				direction);

		}

arch/arm/mach-rpc/dma.c

+7 −1
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ static void iomd_free_dma(unsigned int chan, dma_t *dma) 
	free_irq(idma->irq, idma);

}



static struct device isa_dma_dev = {

	.init_name		= "fallback device",

	.coherent_dma_mask	= ~(dma_addr_t)0,

	.dma_mask		= &isa_dma_dev.coherent_dma_mask,

};



static void iomd_enable_dma(unsigned int chan, dma_t *dma)

{

	struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma);
@@ -168,7 +174,7 @@ static void iomd_enable_dma(unsigned int chan, dma_t *dma) 
			idma->dma.sg = &idma->dma.buf;

			idma->dma.sgcount = 1;

			idma->dma.buf.length = idma->dma.count;

			idma->dma.buf.dma_address = dma_map_single(NULL,

			idma->dma.buf.dma_address = dma_map_single(&isa_dma_dev,

				idma->dma.addr, idma->dma.count,

				idma->dma.dma_mode == DMA_MODE_READ ?

				DMA_FROM_DEVICE : DMA_TO_DEVICE);

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config ARM64 
	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_COHERENT_TO_PFN

	select ARCH_HAS_DMA_MMAP_PGPROT

	select ARCH_HAS_DMA_PREP_COHERENT

	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FAST_MULTIPLIER

arch/csky/Kconfig

+1 −0
Original line number Diff line number Diff line 
config CSKY

	def_bool y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_DMA_PREP_COHERENT

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_USE_BUILTIN_BSWAP

CRA Git | Maintained and supported by SUSTech CRA and CCSE