clean up the DMA mapping headers
Subsystems (54)
Hi all,
this series cleans up the dma-mapping headers by moving everything not required by normal drivers out of <linux/dma-mapping.h> into a new <linux/dma-map-ops.h> and then folding most other DMA mapping related headers either into the new dma-map-ops.h one, or by moving them to kernel/dma/ and thus out of the global scope. A bunch of cleanups for the DMA CMA code are thrown in as well, as they help keeping the exposed bits in the header small.
Diffstat:
arch/arm/include/asm/dma-contiguous.h | 15 b/Documentation/admin-guide/kernel-parameters.txt | 2 b/MAINTAINERS | 2 b/arch/alpha/kernel/pci_iommu.c | 2 b/arch/arc/mm/dma.c | 2 b/arch/arm/common/dmabounce.c | 1 b/arch/arm/include/asm/dma-iommu.h | 1 b/arch/arm/include/asm/dma-mapping.h | 1 b/arch/arm/mach-davinci/devices-da8xx.c | 18 - b/arch/arm/mach-highbank/highbank.c | 2 b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 b/arch/arm/mach-imx/mach-mx31moboard.c | 2 b/arch/arm/mach-mvebu/coherency.c | 2 b/arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 b/arch/arm/mm/dma-mapping-nommu.c | 1 b/arch/arm/mm/dma-mapping.c | 5 b/arch/arm/mm/init.c | 2 b/arch/arm/xen/mm.c | 2 b/arch/arm64/mm/dma-mapping.c | 2 b/arch/arm64/mm/init.c | 3 b/arch/c6x/mm/dma-coherent.c | 2 b/arch/csky/kernel/setup.c | 2 b/arch/csky/mm/dma-mapping.c | 4 b/arch/hexagon/kernel/dma.c | 2 b/arch/ia64/hp/common/sba_iommu.c | 2 b/arch/ia64/kernel/dma-mapping.c | 2 b/arch/ia64/mm/init.c | 2 b/arch/m68k/kernel/dma.c | 2 b/arch/microblaze/kernel/dma.c | 3 b/arch/microblaze/mm/consistent.c | 2 b/arch/microblaze/mm/init.c | 2 b/arch/mips/jazz/jazzdma.c | 2 b/arch/mips/kernel/setup.c | 2 b/arch/mips/mm/dma-noncoherent.c | 3 b/arch/nds32/kernel/dma.c | 2 b/arch/openrisc/kernel/dma.c | 2 b/arch/parisc/kernel/drivers.c | 1 b/arch/parisc/kernel/pci-dma.c | 2 b/arch/powerpc/include/asm/iommu.h | 2 b/arch/powerpc/include/asm/pci.h | 2 b/arch/powerpc/mm/dma-noncoherent.c | 2 b/arch/powerpc/platforms/ps3/system-bus.c | 2 b/arch/powerpc/platforms/pseries/ibmebus.c | 2 b/arch/powerpc/platforms/pseries/vio.c | 2 b/arch/s390/kernel/setup.c | 2 b/arch/s390/pci/pci_dma.c | 2 b/arch/sh/boards/mach-ap325rxa/setup.c | 1 b/arch/sh/boards/mach-ecovec24/setup.c | 1 b/arch/sh/boards/mach-kfr2r09/setup.c | 2 b/arch/sh/boards/mach-migor/setup.c | 2 b/arch/sh/boards/mach-se/7724/setup.c | 1 b/arch/sh/drivers/pci/fixups-dreamcast.c | 2 b/arch/sh/drivers/pci/pci.c | 1 b/arch/sh/kernel/dma-coherent.c | 2 b/arch/sparc/kernel/iommu.c | 2 b/arch/sparc/kernel/ioport.c | 2 b/arch/sparc/kernel/pci_sun4v.c | 1 b/arch/sparc/mm/io-unit.c | 2 b/arch/sparc/mm/iommu.c | 2 b/arch/x86/include/asm/dma-mapping.h | 2 b/arch/x86/kernel/amd_gart_64.c | 1 b/arch/x86/kernel/pci-dma.c | 2 b/arch/x86/kernel/setup.c | 2 b/arch/x86/xen/pci-swiotlb-xen.c | 2 b/arch/xtensa/kernel/pci-dma.c | 3 b/arch/xtensa/mm/init.c | 2 b/drivers/acpi/arm64/iort.c | 2 b/drivers/acpi/scan.c | 2 b/drivers/base/dd.c | 2 b/drivers/dma-buf/heaps/cma_heap.c | 2 b/drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 b/drivers/gpu/drm/msm/msm_gem.c | 1 b/drivers/iommu/amd/iommu.c | 3 b/drivers/iommu/dma-iommu.c | 3 b/drivers/iommu/intel/iommu.c | 4 b/drivers/media/platform/exynos4-is/fimc-is.c | 1 b/drivers/misc/mic/bus/mic_bus.c | 1 b/drivers/misc/mic/bus/scif_bus.c | 2 b/drivers/misc/mic/bus/scif_bus.h | 2 b/drivers/misc/mic/bus/vop_bus.c | 2 b/drivers/misc/mic/host/mic_boot.c | 1 b/drivers/of/device.c | 1 b/drivers/parisc/ccio-dma.c | 1 b/drivers/parisc/sba_iommu.c | 1 b/drivers/pci/pci-driver.c | 1 b/drivers/pci/xen-pcifront.c | 1 b/drivers/remoteproc/remoteproc_core.c | 1 b/drivers/remoteproc/remoteproc_virtio.c | 2 b/drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 b/drivers/xen/swiotlb-xen.c | 2 b/include/asm-generic/Kbuild | 1 b/include/linux/dma-direct.h | 108 ------- b/include/linux/dma-map-ops.h | 339 ++++++++++++++++++++++ b/include/linux/dma-mapping.h | 172 ----------- b/kernel/dma/Kconfig | 2 b/kernel/dma/coherent.c | 1 b/kernel/dma/contiguous.c | 42 ++ b/kernel/dma/debug.c | 5 b/kernel/dma/debug.h | 44 -- b/kernel/dma/direct.c | 4 b/kernel/dma/direct.h | 119 +++++++ b/kernel/dma/dummy.c | 2 b/kernel/dma/mapping.c | 5 b/kernel/dma/ops_helpers.c | 3 b/kernel/dma/pool.c | 3 b/kernel/dma/swiotlb.c | 2 b/kernel/dma/virt.c | 2 b/mm/memory.c | 1 include/asm-generic/dma-contiguous.h | 10 include/linux/dma-contiguous.h | 182 ----------- include/linux/dma-noncoherent.h | 109 ------- 111 files changed, 620 insertions(+), 737 deletions(-)
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 1/9 dma-mapping: split <linux/dma-mapping.h>
Split out all the bits that are purely for dma_map_ops implementations and related code into a new <linux/dma-map-ops.h> header so that they don't get pulled into all the drivers. That also means the architecture specific <asm/dma-mapping.h> is not pulled in by <linux/dma-mapping.h> any more, which leads to a missing includes that were pulled in by the x86 or arm versions in a few not overly portable drivers.
--- MAINTAINERS | 1 + arch/alpha/kernel/pci_iommu.c | 2 +- arch/arc/mm/dma.c | 1 + arch/arm/common/dmabounce.c | 1 + arch/arm/mach-highbank/highbank.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-mx31moboard.c | 2 +- arch/arm/mach-mvebu/coherency.c | 2 +- arch/arm/mm/dma-mapping-nommu.c | 1 + arch/arm/mm/dma-mapping.c | 2 +- arch/arm64/mm/dma-mapping.c | 1 + arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/kernel/dma-mapping.c | 2 +- arch/mips/jazz/jazzdma.c | 1 + arch/mips/mm/dma-noncoherent.c | 1 + arch/parisc/kernel/drivers.c | 1 + arch/powerpc/include/asm/iommu.h | 2 +- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 2 +- arch/powerpc/platforms/pseries/ibmebus.c | 2 +- arch/powerpc/platforms/pseries/vio.c | 2 +- arch/s390/pci/pci_dma.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 1 + arch/sh/boards/mach-ecovec24/setup.c | 1 + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 1 + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- arch/sparc/kernel/iommu.c | 2 +- arch/sparc/kernel/pci_sun4v.c | 1 + arch/sparc/mm/io-unit.c | 2 +- arch/sparc/mm/iommu.c | 2 +- arch/x86/kernel/amd_gart_64.c | 1 + arch/x86/kernel/pci-dma.c | 1 + arch/x86/kernel/setup.c | 2 + arch/x86/xen/pci-swiotlb-xen.c | 2 +- drivers/acpi/arm64/iort.c | 2 +- drivers/acpi/scan.c | 2 +- drivers/base/dd.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 1 + drivers/iommu/dma-iommu.c | 1 + drivers/iommu/intel/iommu.c | 2 +- drivers/misc/mic/bus/mic_bus.c | 1 + drivers/misc/mic/bus/scif_bus.c | 2 +- drivers/misc/mic/bus/scif_bus.h | 2 +- drivers/misc/mic/bus/vop_bus.c | 2 +- drivers/misc/mic/host/mic_boot.c | 1 + drivers/of/device.c | 1 + drivers/parisc/ccio-dma.c | 1 + drivers/parisc/sba_iommu.c | 1 + drivers/pci/xen-pcifront.c | 1 + drivers/remoteproc/remoteproc_core.c | 1 + drivers/remoteproc/remoteproc_virtio.c | 2 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- drivers/xen/swiotlb-xen.c | 1 + include/linux/dma-map-ops.h | 158 ++++++++++++++++++ include/linux/dma-mapping.h | 168 +------------------- kernel/dma/coherent.c | 1 + kernel/dma/direct.c | 1 + kernel/dma/dummy.c | 2 +- kernel/dma/mapping.c | 2 +- kernel/dma/ops_helpers.c | 1 + kernel/dma/virt.c | 2 +- 64 files changed, 223 insertions(+), 200 deletions(-) create mode 100644 include/linux/dma-map-ops.h
MAINTAINERS +1 -0
@@ -5202,6 +5202,7 @@ T: git git://git.infradead.org/users/hch/dma-mapping.git F: include/asm-generic/dma-mapping.h F: include/linux/dma-direct.h F: include/linux/dma-mapping.h +F: include/linux/dma-map-ops.h F: include/linux/dma-noncoherent.h F: kernel/dma/
arch/alpha/kernel/pci_iommu.c +1 -1
@@ -11,7 +11,7 @@#include <linux/export.h> #include <linux/scatterlist.h> #include <linux/log2.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/iommu-helper.h> #include <asm/io.h>
arch/arc/mm/dma.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) */ +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <asm/cache.h> #include <asm/cacheflush.h>
arch/arm/common/dmabounce.c +1 -0
@@ -25,6 +25,7 @@#include <linux/page-flags.h> #include <linux/device.h> #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> #include <linux/dmapool.h> #include <linux/list.h> #include <linux/scatterlist.h>
arch/arm/mach-highbank/highbank.c +1 -1
@@ -5,7 +5,7 @@#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clocksource.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/input.h> #include <linux/io.h> #include <linux/irqchip.h>
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -1
@@ -16,7 +16,7 @@#include <linux/input.h> #include <linux/gpio.h> #include <linux/delay.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> #include <sound/tlv320aic32x4.h>
arch/arm/mach-imx/mach-mx31moboard.c +1 -1
@@ -4,7 +4,7 @@*/ #include <linux/delay.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/gfp.h> #include <linux/gpio.h> #include <linux/init.h>
arch/arm/mach-mvebu/coherency.c +1 -1
@@ -25,7 +25,7 @@#include <linux/of_address.h> #include <linux/io.h> #include <linux/smp.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/mbus.h>
arch/arm/mm/dma-mapping-nommu.c +1 -0
@@ -8,6 +8,7 @@#include <linux/export.h> #include <linux/mm.h> #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <asm/cachetype.h>
arch/arm/mm/dma-mapping.c +1 -1
@@ -15,7 +15,7 @@#include <linux/init.h> #include <linux/device.h> #include <linux/dma-direct.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/dma-contiguous.h> #include <linux/highmem.h>
arch/arm64/mm/dma-mapping.c +1 -0
@@ -6,6 +6,7 @@#include <linux/gfp.h> #include <linux/cache.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/dma-iommu.h> #include <xen/xen.h>
arch/ia64/hp/common/sba_iommu.c +1 -1
@@ -33,7 +33,7 @@#include <linux/bitops.h> /* hweight64() */ #include <linux/crash_dump.h> #include <linux/iommu-helper.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/prefetch.h> #include <linux/swiotlb.h>
arch/ia64/kernel/dma-mapping.c +1 -1
@@ -1,5 +1,5 @@// SPDX-License-Identifier: GPL-2.0 -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/export.h> /* Set this to 1 if there is a HW IOMMU in the system */
arch/mips/jazz/jazzdma.c +1 -0
@@ -16,6 +16,7 @@#include <linux/memblock.h> #include <linux/spinlock.h> #include <linux/gfp.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <asm/mipsregs.h> #include <asm/jazz.h>
arch/mips/mm/dma-noncoherent.c +1 -0
@@ -5,6 +5,7 @@* swiped from i386, and cloned for MIPS by Geert, polished by Ralf. */ #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/dma-contiguous.h> #include <linux/highmem.h>
arch/parisc/kernel/drivers.c +1 -0
@@ -30,6 +30,7 @@#include <linux/spinlock.h> #include <linux/string.h> #include <linux/export.h> +#include <linux/dma-map-ops.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/pdc.h>
arch/powerpc/include/asm/iommu.h +1 -1
@@ -12,7 +12,7 @@#include <linux/compiler.h> #include <linux/spinlock.h> #include <linux/device.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/bitops.h> #include <asm/machdep.h> #include <asm/types.h>
arch/powerpc/include/asm/pci.h +1 -1
@@ -9,7 +9,7 @@#include <linux/types.h> #include <linux/slab.h> #include <linux/string.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <asm/machdep.h>
arch/powerpc/platforms/ps3/system-bus.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/export.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/err.h> #include <linux/slab.h>
arch/powerpc/platforms/pseries/ibmebus.c +1 -1
@@ -40,7 +40,7 @@#include <linux/export.h> #include <linux/console.h> #include <linux/kobject.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/interrupt.h> #include <linux/of.h> #include <linux/slab.h>
arch/powerpc/platforms/pseries/vio.c +1 -1
@@ -20,7 +20,7 @@#include <linux/console.h> #include <linux/export.h> #include <linux/mm.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/kobject.h> #include <asm/iommu.h>
arch/s390/pci/pci_dma.c +1 -1
@@ -10,7 +10,7 @@#include <linux/slab.h> #include <linux/export.h> #include <linux/iommu-helper.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/vmalloc.h> #include <linux/pci.h> #include <asm/pci_dma.h>
arch/sh/boards/mach-ap325rxa/setup.c +1 -0
@@ -13,6 +13,7 @@#include <cpu/sh7723.h> +#include <linux/dma-map-ops.h> #include <linux/clkdev.h> #include <linux/delay.h> #include <linux/device.h>
arch/sh/boards/mach-ecovec24/setup.c +1 -0
@@ -36,6 +36,7 @@#include <linux/usb/r8a66597.h> #include <linux/usb/renesas_usbhs.h> #include <linux/videodev2.h> +#include <linux/dma-map-ops.h> #include <media/drv-intf/renesas-ceu.h> #include <media/i2c/mt9t112.h>
arch/sh/boards/mach-kfr2r09/setup.c +1 -1
@@ -14,7 +14,6 @@#include <linux/clkdev.h> #include <linux/delay.h> -#include <linux/dma-mapping.h> #include <linux/gpio.h> #include <linux/gpio/machine.h> #include <linux/i2c.h>
@@ -33,6 +32,7 @@#include <linux/sh_intc.h> #include <linux/usb/r8a66597.h> #include <linux/videodev2.h> +#include <linux/dma-map-ops.h> #include <mach/kfr2r09.h>
arch/sh/boards/mach-migor/setup.c +1 -1
@@ -5,7 +5,7 @@* Copyright (C) 2008 Magnus Damm */ #include <linux/clkdev.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/interrupt.h>
arch/sh/boards/mach-se/7724/setup.c +1 -0
@@ -32,6 +32,7 @@#include <linux/smc91x.h> #include <linux/usb/r8a66597.h> #include <linux/videodev2.h> +#include <linux/dma-map-ops.h> #include <mach-se/mach/se7724.h> #include <media/drv-intf/renesas-ceu.h>
arch/sh/drivers/pci/fixups-dreamcast.c +1 -1
@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/irq.h> #include <linux/pci.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <asm/io.h> #include <asm/irq.h>
arch/sparc/kernel/iommu.c +1 -1
@@ -10,7 +10,7 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/device.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/errno.h> #include <linux/iommu-helper.h> #include <linux/bitmap.h>
arch/sparc/kernel/pci_sun4v.c +1 -0
@@ -16,6 +16,7 @@#include <linux/export.h> #include <linux/log2.h> #include <linux/of_device.h> +#include <linux/dma-map-ops.h> #include <asm/iommu-common.h> #include <asm/iommu.h>
arch/sparc/mm/io-unit.c +1 -1
@@ -11,7 +11,7 @@#include <linux/spinlock.h> #include <linux/mm.h> #include <linux/bitops.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/of.h> #include <linux/of_device.h>
arch/sparc/mm/iommu.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/mm.h> #include <linux/slab.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/of.h> #include <linux/of_device.h>
arch/x86/kernel/amd_gart_64.c +1 -0
@@ -32,6 +32,7 @@#include <linux/gfp.h> #include <linux/atomic.h> #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> #include <asm/mtrr.h> #include <asm/proto.h> #include <asm/iommu.h>
arch/x86/kernel/pci-dma.c +1 -0
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> #include <linux/dma-debug.h> #include <linux/iommu.h>
arch/x86/kernel/setup.c +2 -0
@@ -7,6 +7,7 @@*/ #include <linux/console.h> #include <linux/crash_dump.h> +#include <linux/dma-contiguous.h> #include <linux/dmi.h> #include <linux/efi.h> #include <linux/init_ohci1394_dma.h>
@@ -19,6 +20,7 @@#include <linux/hugetlb.h> #include <linux/tboot.h> #include <linux/usb/xhci-dbgp.h> +#include <linux/swiotlb.h> #include <uapi/linux/mount.h>
arch/x86/xen/pci-swiotlb-xen.c +1 -1
@@ -2,7 +2,7 @@/* Glue code to lib/swiotlb-xen.c */ -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/pci.h> #include <xen/swiotlb-xen.h>
drivers/acpi/arm64/iort.c +1 -1
@@ -18,7 +18,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #define IORT_TYPE_MASK (type) (1 << (type))#define IORT_MSI_TYPE (1 << ACPI_IORT_NODE_ITS_GROUP)
drivers/acpi/scan.c +1 -1
@@ -13,7 +13,7 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/platform_data/x86/apple.h> #include <linux/pgtable.h>
drivers/base/dd.c +1 -1
@@ -19,7 +19,7 @@#include <linux/debugfs.h> #include <linux/device.h> #include <linux/delay.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/init.h> #include <linux/module.h> #include <linux/kthread.h>
drivers/gpu/drm/exynos/exynos_drm_dma.c +1 -1
@@ -5,7 +5,7 @@// Author: Andrzej Hajda <[email protected]> #include <linux/dma-iommu.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/iommu.h> #include <linux/platform_device.h>
drivers/gpu/drm/msm/msm_gem.c +1 -0
@@ -4,6 +4,7 @@* Author: Rob Clark <[email protected]> */ +#include <linux/dma-map-ops.h> #include <linux/spinlock.h> #include <linux/shmem_fs.h> #include <linux/dma-buf.h>
drivers/iommu/dma-iommu.c +1 -0
@@ -10,6 +10,7 @@#include <linux/acpi_iort.h> #include <linux/device.h> +#include <linux/dma-map-ops.h> #include <linux/dma-contiguous.h> #include <linux/dma-iommu.h> #include <linux/dma-noncoherent.h>
drivers/iommu/intel/iommu.c +1 -1
@@ -23,7 +23,7 @@#include <linux/spinlock.h> #include <linux/pci.h> #include <linux/dmar.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/mempool.h> #include <linux/memory.h> #include <linux/cpu.h>
drivers/misc/mic/bus/mic_bus.c +1 -0
@@ -9,6 +9,7 @@* This implementation is very similar to the the virtio bus driver * implementation @ drivers/virtio/virtio.c */ +#include <linux/dma-map-ops.h> #include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h>
drivers/misc/mic/bus/scif_bus.c +1 -1
@@ -9,7 +9,7 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include "scif_bus.h"
drivers/misc/mic/bus/scif_bus.h +1 -1
@@ -12,7 +12,7 @@* Everything a scif driver needs to work with any particular scif * hardware abstraction layer. */ -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/mic_common.h> #include "../common/mic_dev.h"
drivers/misc/mic/bus/vop_bus.c +1 -1
@@ -9,7 +9,7 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include "vop_bus.h"
drivers/misc/mic/host/mic_boot.c +1 -0
@@ -10,6 +10,7 @@#include <linux/firmware.h> #include <linux/pci.h> #include <linux/kmod.h> +#include <linux/dma-map-ops.h> #include <linux/mic_common.h> #include <linux/mic_bus.h> #include "../bus/scif_bus.h"
drivers/of/device.c +1 -0
@@ -6,6 +6,7 @@#include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/dma-direct.h> /* for bus_dma_region */ +#include <linux/dma-map-ops.h> #include <linux/init.h> #include <linux/module.h> #include <linux/mod_devicetable.h>
drivers/parisc/ccio-dma.c +1 -0
@@ -39,6 +39,7 @@#include <linux/reboot.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/iommu-helper.h> #include <linux/export.h>
drivers/parisc/sba_iommu.c +1 -0
@@ -25,6 +25,7 @@#include <linux/mm.h> #include <linux/string.h> #include <linux/pci.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/iommu-helper.h>
drivers/pci/xen-pcifront.c +1 -0
@@ -22,6 +22,7 @@#include <linux/bitops.h> #include <linux/time.h> #include <linux/ktime.h> +#include <linux/swiotlb.h> #include <xen/platform_pci.h> #include <asm/xen/swiotlb-xen.h>
drivers/remoteproc/remoteproc_core.c +1 -0
@@ -22,6 +22,7 @@#include <linux/device.h> #include <linux/slab.h> #include <linux/mutex.h> +#include <linux/dma-map-ops.h> #include <linux/dma-mapping.h> #include <linux/dma-direct.h> /* XXX: pokes into bus_dma_range */ #include <linux/firmware.h>
drivers/remoteproc/remoteproc_virtio.c +1 -1
@@ -9,7 +9,7 @@* Brian Swetland <[email protected]> */ -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/export.h> #include <linux/of_reserved_mem.h> #include <linux/remoteproc.h>
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -1
@@ -18,7 +18,7 @@#include <linux/wait.h> #include <linux/uuid.h> #include <linux/iommu.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/sysfs.h> #include <linux/file.h> #include <linux/etherdevice.h>
drivers/xen/swiotlb-xen.c +1 -0
@@ -27,6 +27,7 @@#define pr_fmt (fmt) "xen:" KBUILD_MODNAME ": " fmt#include <linux/memblock.h> +#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> #include <linux/dma-noncoherent.h> #include <linux/export.h>
include/linux/dma-map-ops.h new file +158 -0
158 lines not on this page · raw message
include/linux/dma-mapping.h +2 -166
199 lines not on this page · raw message
kernel/dma/coherent.c +1 -0
@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> struct dma_coherent_mem {void *virt_base;
kernel/dma/direct.c +1 -0
@@ -8,6 +8,7 @@#include <linux/export.h> #include <linux/mm.h> #include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/dma-contiguous.h> #include <linux/pfn.h>
kernel/dma/dummy.c +1 -1
@@ -2,7 +2,7 @@/* * Dummy DMA ops that always fail. */ -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> static int dma_dummy_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size,
kernel/dma/mapping.c +1 -1
@@ -8,7 +8,7 @@#include <linux/memblock.h> /* for max_pfn */ #include <linux/acpi.h> #include <linux/dma-direct.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/export.h> #include <linux/gfp.h> #include <linux/of_device.h>
kernel/dma/ops_helpers.c +1 -0
@@ -4,6 +4,7 @@* the allocated memory contains normal pages in the direct kernel mapping. */ #include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> /*
kernel/dma/virt.c +1 -1
@@ -4,7 +4,7 @@*/ #include <linux/export.h> #include <linux/mm.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/scatterlist.h> static void *dma_virt_alloc(struct device *dev, size_t size,
Signature · 7 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 1/9] dma-mapping: split <linux/dma-mapping.h>
Quoted 8 lines · Christoph Hellwig
Split out all the bits that are purely for
dma_map_opsimplementations and related code into a new <linux/dma-map-ops.h> header so that they don't get pulled into all the drivers. That also means the architecture specific <asm/dma-mapping.h> is not pulled in by <linux/dma-mapping.h> any more, which leads to a missing includes that were pulled in by the x86 or arm versions in a few not overly portable drivers.Signed-off-by Christoph Hellwig <[email protected]>
This patch results in the following build error.
Building arm:ixp4xx_defconfig ... failed
--------------
Error log:arch/arm/mach-ixp4xx/common.c: In function 'ixp4xx_platform_notify_remove':arch/arm/mach-ixp4xx/common.c:291:3: error: implicit declaration of function 'dmabounce_unregister_dev' [-Werror=implicit-function-declaration]
291 | dmabounce_unregister_dev(dev);
| ^~~~~~~~~~~~~~~~~~~~~~~~arch/arm/mach-ixp4xx/common.c: In function 'ixp4xx_platform_notify':arch/arm/mach-ixp4xx/common.c:307:3: error: implicit declaration of function 'dmabounce_register_dev' [-Werror=implicit-function-declaration]
307 | dmabounce_register_dev(dev, 2048, 4096, ixp4xx_needs_bounce);
Bisect log attached.
Guenter
---
# bad: [d67bc7812221606e1886620a357b13f906814af7] Add linux-next specific files for 20201009
# good: [549738f15da0e5a00275977623be199fbbf7df50] Linux 5.9-rc8
git bisect start 'HEAD' 'v5.9-rc8'
# bad: [b71be15b496cc71a3434a198fc1a1b9e08af6c57] Merge remote-tracking branch 'bpf-next/master' into master git bisect bad b71be15b496cc71a3434a198fc1a1b9e08af6c57
# bad: [6be11f939f380ef14bc94242cb0262197ce2a054] Merge remote-tracking branch 'i2c/i2c/for-next' into master git bisect bad 6be11f939f380ef14bc94242cb0262197ce2a054
# bad: [c03a115d8ad8a87b6d275c3c91c13bc111217bf6] Merge remote-tracking branch 'samsung-krzk/for-next' into master git bisect bad c03a115d8ad8a87b6d275c3c91c13bc111217bf6
# good: [4f7233567480421eab9c622f395854bfd925f9f2] Merge branch 'arm/dt' into for-next
git bisect good 4f7233567480421eab9c622f395854bfd925f9f2
# bad: [0fa3d3941f0f9fc9b39621af3309b5fdf0c1a6cb] Merge remote-tracking branch 'arm/for-next' into master git bisect bad 0fa3d3941f0f9fc9b39621af3309b5fdf0c1a6cb
# good: [1357d119df6c359a2903a46522c2511d990db9bb] Merge remote-tracking branch 'sound-current/for-linus' into master git bisect good 1357d119df6c359a2903a46522c2511d990db9bb
# good: [bd02811392faa248d95f8559498c03933eb7d78b] Merge remote-tracking branch 'kspp-gustavo/for-next/kspp' into master git bisect good bd02811392faa248d95f8559498c03933eb7d78b
# bad: [0b1abd1fb7efafc25231c54a67c6fbb3d3127efd] dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h> git bisect bad 0b1abd1fb7efafc25231c54a67c6fbb3d3127efd
# good: [b9bb694b9f62f4b31652223ed3ca38cf98bbb370] iommu/io-pgtable-arm: Clean up faulty sanity check git bisect good b9bb694b9f62f4b31652223ed3ca38cf98bbb370
# good: [ed4bc1890b4984d0af447ad3cc1f93541623f8f3] hal2: convert to dma_alloc_noncoherent
git bisect good ed4bc1890b4984d0af447ad3cc1f93541623f8f3
# good: [e8d39a903cc680c8c1ab5e528428f182f42b8a35] dma-iommu: implement ->alloc_noncoherent
git bisect good e8d39a903cc680c8c1ab5e528428f182f42b8a35
# bad: [0a0f0d8be76dcd4390ff538e7060fda34db79717] dma-mapping: split <linux/dma-mapping.h>
git bisect bad 0a0f0d8be76dcd4390ff538e7060fda34db79717
# good: [0de327969b61a245e3a47b60009eae73fe513cef] cma: decrease CMA_ALIGNMENT lower limit to 2
git bisect good 0de327969b61a245e3a47b60009eae73fe513cef
# first bad commit: [0a0f0d8be76dcd4390ff538e7060fda34db79717] dma-mapping: split <linux/dma-mapping.h>
Re: [PATCH 1/9] dma-mapping: split <linux/dma-mapping.h>
Thanks for the report, I've commited the obvious fix.
PATCH 2/9 dma-contiguous: remove dma_declare_contiguous
In reply to Christoph Hellwigdma_declare_contiguous is a trivial wrapper around dma_contiguous_reserve_area and just has a single caller.
--- arch/arm/mach-davinci/devices-da8xx.c | 16 +++++++++----- include/linux/dma-contiguous.h | 32 --------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)
arch/arm/mach-davinci/devices-da8xx.c +10 -6
@@ -884,6 +884,7 @@ early_param("rproc_mem", early_rproc_mem);void __init da8xx_rproc_reserve_cma (void ) { +struct cma *cma;int ret;if (!rproc_base || !rproc_size) {
@@ -897,13 +898,16 @@ void __init da8xx_rproc_reserve_cma(void)pr_info ("%s: reserving 0x%lx @ 0x%lx...\n" , __func__, rproc_size, (unsigned long )rproc_base); - ret =dma_declare_contiguous (&da8xx_dsp.dev, rproc_size, rproc_base,0 ); -if (ret) -pr_err ("%s: dma_declare_contiguous failed %d\n" , __func__, ret); -else - rproc_mem_inited = true; + ret =dma_contiguous_reserve_area (rproc_size, rproc_base,0 , &cma, + true); +if (ret) { +pr_err ("%s: dma_contiguous_reserve_area failed %d\n" , + __func__, ret); +return ; + } +dev_set_cma_area (&da8xx_dsp.dev, cma); + rproc_mem_inited = true; } -#else void __init da8xx_rproc_reserve_cma (void )
include/linux/dma-contiguous.h +0 -32
@@ -83,31 +83,6 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, phys_addr_t limit, struct cma **res_cma, bool fixed); -/** -* dma_declare_contiguous() - reserve area for contiguous memory handling -* for particular device -* @dev: Pointer to device structure. -* @size: Size of the reserved memory. -* @base: Start address of the reserved memory (optional, 0 for any). -* @limit: End address of the reserved memory (optional, 0 for any). -* -* This function reserves memory for specified device. It should be -* called by board specific code when early allocator (memblock or bootmem) -* is still activate. -*/ - -static inline int dma_declare_contiguous (struct device *dev,phys_addr_t size, -phys_addr_t base,phys_addr_t limit) -{ -struct cma *cma; -int ret; - ret =dma_contiguous_reserve_area (size, base, limit, &cma, true); -if (ret ==0 ) -dev_set_cma_area (dev, cma); - -return ret; -} -struct page *dma_alloc_from_contiguous (struct device *dev,size_t count,unsigned int order,bool no_warn); bool dma_release_from_contiguous(struct device *dev, struct page *pages,
@@ -135,13 +110,6 @@ static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t basereturn -ENOSYS ; } -static inline -int dma_declare_contiguous (struct device *dev,phys_addr_t size, -phys_addr_t base,phys_addr_t limit) -{ -return -ENOSYS ; -} -static inline struct page *dma_alloc_from_contiguous (struct device *dev,size_t count,unsigned int order,bool no_warn)
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/9 dma-contiguous: remove dev_set_cma_area
In reply to Christoph Hellwigdev_set_cma_area contains a trivial assignment. It has just three callers that all have a non-NULL device and depend on CONFIG_DMA_CMA, so remove the wrapper.
--- arch/arm/mach-davinci/devices-da8xx.c | 2 +- include/linux/dma-contiguous.h | 8 -------- kernel/dma/contiguous.c | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-)
arch/arm/mach-davinci/devices-da8xx.c +1 -1
@@ -905,7 +905,7 @@ void __init da8xx_rproc_reserve_cma(void) __func__, ret); return; } -dev_set_cma_area (&da8xx_dsp.dev, cma); + da8xx_dsp.dev.cma_area = cma; rproc_mem_inited = true; }#else
include/linux/dma-contiguous.h +0 -8
@@ -66,12 +66,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)return dma_contiguous_default_area; } -static inline void dev_set_cma_area (struct device *dev,struct cma *cma) -{ -if (dev) - dev->cma_area = cma; -} -static inline void dma_contiguous_set_default (struct cma *cma) { dma_contiguous_default_area = cma;
@@ -97,8 +91,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)return NULL ; } -static inline void dev_set_cma_area (struct device *dev,struct cma *cma) { } -static inline void dma_contiguous_set_default (struct cma *cma) { }static inline void dma_contiguous_reserve (phys_addr_t limit) { }
kernel/dma/contiguous.c +2 -2
@@ -359,14 +359,14 @@ void dma_free_contiguous(struct device *dev, struct page *page, size_t size)static int rmem_cma_device_init (struct reserved_mem *rmem,struct device *dev) { -dev_set_cma_area (dev, rmem->priv); + dev->cma_area = rmem->priv;return 0 ; }static void rmem_cma_device_release (struct reserved_mem *rmem,struct device *dev) { -dev_set_cma_area (dev,NULL ); + dev->cma_area =NULL ; }static const struct reserved_mem_ops rmem_cma_ops = {
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 4/9 dma-contiguous: remove dma_contiguous_set_default
In reply to Christoph Hellwigdma_contiguous_set_default contains a trivial assignment, and has a single caller that is compiled if CONFIG_CMA_DMA is enabled.
--- include/linux/dma-contiguous.h | 7 ------- kernel/dma/contiguous.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)
include/linux/dma-contiguous.h +0 -7
@@ -66,11 +66,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)return dma_contiguous_default_area; } -static inline void dma_contiguous_set_default (struct cma *cma) -{ - dma_contiguous_default_area = cma; -} -void dma_contiguous_reserve (phys_addr_t addr_limit); int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
@@ -91,8 +86,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)return NULL ; } -static inline void dma_contiguous_set_default (struct cma *cma) { } -static inline void dma_contiguous_reserve (phys_addr_t limit) { } static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
kernel/dma/contiguous.c +1 -1
@@ -407,7 +407,7 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem)dma_contiguous_early_fixup (rmem->base, rmem->size);if (default_cma) -dma_contiguous_set_default (cma); + dma_contiguous_default_area = cma; rmem->ops = &rmem_cma_ops; rmem->priv = cma;
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 5/9 dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
In reply to Christoph HellwigMerge dma-contiguous.h into dma-map-ops.h, after removing the comment describing the contiguous allocator into kernel/dma/contigous.c.
--- .../admin-guide/kernel-parameters.txt | 2 +- arch/arm/mach-davinci/devices-da8xx.c | 2 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- arch/arm/mm/dma-mapping.c | 1 - arch/arm/mm/init.c | 2 +- arch/arm64/mm/init.c | 3 +- arch/csky/kernel/setup.c | 2 +- arch/csky/mm/dma-mapping.c | 3 +- arch/microblaze/mm/init.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/mips/mm/dma-noncoherent.c | 1 - arch/s390/kernel/setup.c | 2 +- arch/x86/include/asm/dma-mapping.h | 1 - arch/x86/kernel/setup.c | 2 +- arch/xtensa/kernel/pci-dma.c | 2 +- arch/xtensa/mm/init.c | 2 +- drivers/dma-buf/heaps/cma_heap.c | 2 +- drivers/iommu/amd/iommu.c | 3 +- drivers/iommu/dma-iommu.c | 1 - drivers/iommu/intel/iommu.c | 2 +- drivers/media/platform/exynos4-is/fimc-is.c | 1 - include/linux/dma-contiguous.h | 135 ------------------ include/linux/dma-map-ops.h | 65 +++++++++ kernel/dma/Kconfig | 2 +- kernel/dma/contiguous.c | 30 +++- kernel/dma/direct.c | 1 - kernel/dma/ops_helpers.c | 1 - kernel/dma/pool.c | 2 +- 28 files changed, 112 insertions(+), 164 deletions(-) delete mode 100644 include/linux/dma-contiguous.h
Documentation/admin-guide/kernel-parameters.txt +1 -1
@@ -597,7 +597,7 @@ placement constraint by the physical address range of memory allocations. A value of 0 disables CMA altogether. For more information, see - include/linux/dma-contiguous.h + kernel/dma/contiguous.c cma_pernuma=nn[MG] [ARM64,KNL]
arch/arm/mach-davinci/devices-da8xx.c +1 -1
@@ -10,7 +10,7 @@#include <linux/clk-provider.h> #include <linux/clk.h> #include <linux/clkdev.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dmaengine.h> #include <linux/init.h> #include <linux/io.h>
arch/arm/mach-shmobile/setup-rcar-gen2.c +1 -1
@@ -9,7 +9,7 @@#include <linux/clocksource.h> #include <linux/device.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/memblock.h>
arch/arm/mm/dma-mapping.c +0 -1
@@ -17,7 +17,6 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> -#include <linux/dma-contiguous.h> #include <linux/highmem.h> #include <linux/memblock.h> #include <linux/slab.h>
arch/arm/mm/init.c +1 -1
@@ -18,7 +18,7 @@#include <linux/highmem.h> #include <linux/gfp.h> #include <linux/memblock.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/sizes.h> #include <linux/stop_machine.h> #include <linux/swiotlb.h>
arch/arm64/mm/init.c +1 -2
@@ -21,8 +21,7 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/dma-direct.h> -#include <linux/dma-mapping.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/efi.h> #include <linux/swiotlb.h> #include <linux/vmalloc.h>
arch/csky/kernel/setup.c +1 -1
@@ -7,7 +7,7 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/start_kernel.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/screen_info.h> #include <asm/sections.h> #include <asm/mmu_context.h>
arch/csky/mm/dma-mapping.c +1 -2
@@ -2,8 +2,7 @@// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #include <linux/cache.h> -#include <linux/dma-mapping.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/genalloc.h> #include <linux/highmem.h>
arch/microblaze/mm/init.c +1 -1
@@ -7,7 +7,7 @@* for more details. */ -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/memblock.h> #include <linux/init.h> #include <linux/kernel.h>
arch/mips/kernel/setup.c +1 -1
@@ -24,7 +24,7 @@#include <linux/kexec.h> #include <linux/sizes.h> #include <linux/device.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/decompress/generic.h> #include <linux/of_fdt.h> #include <linux/of_reserved_mem.h>
arch/mips/mm/dma-noncoherent.c +0 -1
@@ -7,7 +7,6 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> -#include <linux/dma-contiguous.h> #include <linux/highmem.h> #include <asm/cache.h>
arch/s390/kernel/setup.c +1 -1
@@ -37,7 +37,7 @@#include <linux/root_dev.h> #include <linux/console.h> #include <linux/kernel_stat.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/device.h> #include <linux/notifier.h> #include <linux/pfn.h>
arch/x86/include/asm/dma-mapping.h +0 -1
@@ -11,7 +11,6 @@#include <linux/dma-debug.h> #include <asm/io.h> #include <asm/swiotlb.h> -#include <linux/dma-contiguous.h> extern int iommu_merge;extern int panic_on_overflow;
arch/x86/kernel/setup.c +1 -1
@@ -7,7 +7,7 @@*/ #include <linux/console.h> #include <linux/crash_dump.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dmi.h> #include <linux/efi.h> #include <linux/init_ohci1394_dma.h>
arch/xtensa/kernel/pci-dma.c +1 -1
@@ -11,7 +11,7 @@* Joe Taylor <[email protected], [email protected]> */ -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/dma-direct.h> #include <linux/gfp.h>
arch/xtensa/mm/init.c +1 -1
@@ -26,7 +26,7 @@#include <linux/nodemask.h> #include <linux/mm.h> #include <linux/of_fdt.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <asm/bootparam.h> #include <asm/page.h>
drivers/dma-buf/heaps/cma_heap.c +1 -1
@@ -10,7 +10,7 @@#include <linux/device.h> #include <linux/dma-buf.h> #include <linux/dma-heap.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/err.h> #include <linux/errno.h> #include <linux/highmem.h>
drivers/iommu/amd/iommu.c +1 -2
@@ -18,7 +18,7 @@#include <linux/slab.h> #include <linux/debugfs.h> #include <linux/scatterlist.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> #include <linux/dma-iommu.h> #include <linux/iommu-helper.h>
@@ -28,7 +28,6 @@#include <linux/export.h> #include <linux/irq.h> #include <linux/msi.h> -#include <linux/dma-contiguous.h> #include <linux/irqdomain.h> #include <linux/percpu.h> #include <linux/iova.h>
drivers/iommu/dma-iommu.c +0 -1
@@ -11,7 +11,6 @@#include <linux/acpi_iort.h> #include <linux/device.h> #include <linux/dma-map-ops.h> -#include <linux/dma-contiguous.h> #include <linux/dma-iommu.h> #include <linux/dma-noncoherent.h> #include <linux/gfp.h>
drivers/iommu/intel/iommu.c +1 -1
@@ -37,7 +37,7 @@#include <linux/dmi.h> #include <linux/pci-ats.h> #include <linux/memblock.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> #include <linux/crash_dump.h> #include <linux/numa.h>
drivers/media/platform/exynos4-is/fimc-is.c +0 -1
@@ -12,7 +12,6 @@#include <linux/device.h> #include <linux/debugfs.h> #include <linux/delay.h> -#include <linux/dma-contiguous.h> #include <linux/errno.h> #include <linux/firmware.h> #include <linux/interrupt.h>
include/linux/dma-contiguous.h deleted +0 -135
135 lines not on this page · raw message
include/linux/dma-map-ops.h +65 -0
77 lines not on this page · raw message
kernel/dma/Kconfig +1 -1
@@ -118,7 +118,7 @@ config DMA_CMA You can disable CMA by specifying "cma=0" on the kernel's command line. - For more information see <include/linux/dma-contiguous.h>. + For more information see <kernel/dma/contiguous.c>. If unsure, say "n". if DMA_CMA
kernel/dma/contiguous.c +29 -1
@@ -5,6 +5,34 @@* Written by: * Marek Szyprowski <[email protected]> * Michal Nazarewicz <[email protected]> +* +* Contiguous Memory Allocator +* +* The Contiguous Memory Allocator (CMA) makes it possible to +* allocate big contiguous chunks of memory after the system has +* booted. +* +* Why is it needed? +* +* Various devices on embedded systems have no scatter-getter and/or +* IO map support and require contiguous blocks of memory to +* operate. They include devices such as cameras, hardware video +* coders, etc. +* +* Such devices often require big memory buffers (a full HD frame +* is, for instance, more then 2 mega pixels large, i.e. more than 6 +* MB of memory), which makes mechanisms such as kmalloc() or +* alloc_page() ineffective. +* +* At the same time, a solution where a big memory region is +* reserved for a device is suboptimal since often more memory is +* reserved then strictly required and, moreover, the memory is +* inaccessible to page system even if device drivers don't use it. +* +* CMA tries to solve this issue by operating on memory regions +* where only movable pages can be allocated from. This way, kernel +* can use the memory for pagecache and when device driver requests +* it, allocated pages can be migrated. */ #define pr_fmt (fmt) "cma: " fmt
@@ -21,7 +49,7 @@#include <linux/memblock.h> #include <linux/err.h> #include <linux/sizes.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/cma.h> #ifdef CONFIG_CMA_SIZE_MBYTES
kernel/dma/direct.c +0 -1
@@ -10,7 +10,6 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/scatterlist.h> -#include <linux/dma-contiguous.h> #include <linux/pfn.h> #include <linux/vmalloc.h> #include <linux/set_memory.h>
kernel/dma/ops_helpers.c +0 -1
@@ -3,7 +3,6 @@* Helpers for DMA ops implementations. These generally rely on the fact that * the allocated memory contains normal pages in the direct kernel mapping. */ -#include <linux/dma-contiguous.h> #include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h>
kernel/dma/pool.c +1 -1
@@ -5,7 +5,7 @@*/ #include <linux/cma.h> #include <linux/debugfs.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> #include <linux/dma-noncoherent.h> #include <linux/init.h>
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 6/9 dma-mapping: remove <asm/dma-contiguous.h>
In reply to Christoph HellwigJust provide a weak default definition of dma_contiguous_early_fixup and let arm override it.
--- arch/arm/include/asm/dma-contiguous.h | 15 --------------- arch/arm/mm/dma-mapping.c | 1 - include/asm-generic/Kbuild | 1 - include/asm-generic/dma-contiguous.h | 10 ---------- include/linux/dma-map-ops.h | 2 ++ kernel/dma/contiguous.c | 6 +++++- 6 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 arch/arm/include/asm/dma-contiguous.h delete mode 100644 include/asm-generic/dma-contiguous.h
arch/arm/include/asm/dma-contiguous.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef ASMARM_DMA_CONTIGUOUS_H -#define ASMARM_DMA_CONTIGUOUS_H - -#ifdef __KERNEL__ -#ifdef CONFIG_DMA_CMA - -#include <linux/types.h> - -void dma_contiguous_early_fixup (phys_addr_t base,unsigned long size); - -#endif -#endif - -#endif
arch/arm/mm/dma-mapping.c +0 -1
@@ -34,7 +34,6 @@#include <asm/dma-iommu.h> #include <asm/mach/map.h> #include <asm/system_info.h> -#include <asm/dma-contiguous.h> #include <xen/swiotlb-xen.h> #include "dma.h"
include/asm-generic/Kbuild +0 -1
@@ -16,7 +16,6 @@ mandatory-y += current.h mandatory-y += delay.h mandatory-y += device.h mandatory-y += div64.h -mandatory-y += dma-contiguous.h mandatory-y += dma-mapping.h mandatory-y += dma.h mandatory-y += emergency-restart.h
include/asm-generic/dma-contiguous.h deleted +0 -10
@@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_GENERIC_DMA_CONTIGUOUS_H -#define _ASM_GENERIC_DMA_CONTIGUOUS_H - -#include <linux/types.h> - -static inline void -dma_contiguous_early_fixup (phys_addr_t base,unsigned long size) { } - -#endif
include/linux/dma-map-ops.h +2 -0
@@ -116,6 +116,8 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, int count);struct page *dma_alloc_contiguous (struct device *dev,size_t size,gfp_t gfp);void dma_free_contiguous (struct device *dev,struct page *page,size_t size); + +void dma_contiguous_early_fixup (phys_addr_t base,unsigned long size);#else /* CONFIG_DMA_CMA */ static inline struct cma *dev_get_cma_area (struct device *dev) {
kernel/dma/contiguous.c +5 -1
@@ -44,7 +44,6 @@#endif #include <asm/page.h> -#include <asm/dma-contiguous.h> #include <linux/memblock.h> #include <linux/err.h>
@@ -212,6 +211,11 @@ void __init dma_contiguous_reserve(phys_addr_t limit) } } +void __weak +dma_contiguous_early_fixup (phys_addr_t base,unsigned long size) +{ +} +/** * dma_contiguous_reserve_area() - reserve custom contiguous area * @size: Size of the reserved area (in bytes),
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 7/9 dma-mapping: move dma-debug.h to kernel/dma/
In reply to Christoph HellwigMost of dma-debug.h is not required by anything outside of kernel/dma. Move the four declarations needed by dma-mappin.h or dma-ops providers into dma-mapping.h and dma-map-ops.h, and move the remainder of the file to kernel/dma/debug.h.
--- arch/arm/include/asm/dma-iommu.h | 1 - arch/arm/include/asm/dma-mapping.h | 1 - arch/microblaze/kernel/dma.c | 1 - arch/sh/drivers/pci/pci.c | 1 - arch/x86/include/asm/dma-mapping.h | 1 - arch/x86/kernel/pci-dma.c | 1 - drivers/pci/pci-driver.c | 1 + include/linux/dma-map-ops.h | 12 +++++ include/linux/dma-mapping.h | 16 ++++++- kernel/dma/debug.c | 5 +-- .../linux/dma-debug.h => kernel/dma/debug.h | 44 ++----------------- kernel/dma/mapping.c | 1 + mm/memory.c | 1 - 13 files changed, 34 insertions(+), 52 deletions(-) rename include/linux/dma-debug.h => kernel/dma/debug.h (81%)
arch/arm/include/asm/dma-iommu.h +0 -1
@@ -6,7 +6,6 @@#include <linux/mm_types.h> #include <linux/scatterlist.h> -#include <linux/dma-debug.h> #include <linux/kref.h> struct dma_iommu_mapping {
arch/arm/include/asm/dma-mapping.h +0 -1
@@ -6,7 +6,6 @@#include <linux/mm_types.h> #include <linux/scatterlist.h> -#include <linux/dma-debug.h> #include <xen/xen.h> #include <asm/xen/hypervisor.h>
arch/microblaze/kernel/dma.c +0 -1
@@ -10,7 +10,6 @@#include <linux/device.h> #include <linux/dma-noncoherent.h> #include <linux/gfp.h> -#include <linux/dma-debug.h> #include <linux/export.h> #include <linux/bug.h> #include <asm/cacheflush.h>
arch/sh/drivers/pci/pci.c +0 -1
@@ -13,7 +13,6 @@#include <linux/pci.h> #include <linux/init.h> #include <linux/types.h> -#include <linux/dma-debug.h> #include <linux/io.h> #include <linux/mutex.h> #include <linux/spinlock.h>
arch/x86/include/asm/dma-mapping.h +0 -1
@@ -8,7 +8,6 @@*/ #include <linux/scatterlist.h> -#include <linux/dma-debug.h> #include <asm/io.h> #include <asm/swiotlb.h>
arch/x86/kernel/pci-dma.c +0 -1
@@ -1,7 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/dma-map-ops.h> #include <linux/dma-direct.h> -#include <linux/dma-debug.h> #include <linux/iommu.h> #include <linux/dmar.h> #include <linux/export.h>
drivers/pci/pci-driver.c +1 -0
@@ -19,6 +19,7 @@#include <linux/kexec.h> #include <linux/of_device.h> #include <linux/acpi.h> +#include <linux/dma-map-ops.h> #include "pci.h" #include "pcie/portdrv.h"
include/linux/dma-map-ops.h +12 -0
@@ -220,6 +220,18 @@ static inline void arch_teardown_dma_ops(struct device *dev) }#endif /* CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS */ +#ifdef CONFIG_DMA_API_DEBUG +void dma_debug_add_bus (struct bus_type *bus); +void debug_dma_dump_mappings (struct device *dev); +#else +static inline void dma_debug_add_bus (struct bus_type *bus) +{ +} +static inline void debug_dma_dump_mappings (struct device *dev) +{ +} +#endif /* CONFIG_DMA_API_DEBUG */ +extern const struct dma_map_ops dma_dummy_ops;#endif /* _LINUX_DMA_MAP_OPS_H */
include/linux/dma-mapping.h +15 -1
@@ -6,7 +6,6 @@#include <linux/string.h> #include <linux/device.h> #include <linux/err.h> -#include <linux/dma-debug.h> #include <linux/dma-direction.h> #include <linux/scatterlist.h> #include <linux/bug.h>
@@ -76,6 +75,21 @@#define DMA_BIT_MASK (n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) +#ifdef CONFIG_DMA_API_DEBUG +void debug_dma_mapping_error (struct device *dev,dma_addr_t dma_addr); +void debug_dma_map_single (struct device *dev,const void *addr, +unsigned long len); +#else +static inline void debug_dma_mapping_error (struct device *dev, +dma_addr_t dma_addr) +{ +} +static inline void debug_dma_map_single (struct device *dev,const void *addr, +unsigned long len) +{ +} +#endif /* CONFIG_DMA_API_DEBUG */ +#ifdef CONFIG_HAS_DMA static inline int dma_mapping_error (struct device *dev,dma_addr_t dma_addr) {
kernel/dma/debug.c +2 -3
@@ -9,10 +9,9 @@#include <linux/sched/task_stack.h> #include <linux/scatterlist.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/sched/task.h> #include <linux/stacktrace.h> -#include <linux/dma-debug.h> #include <linux/spinlock.h> #include <linux/vmalloc.h> #include <linux/debugfs.h>
@@ -24,8 +23,8 @@#include <linux/ctype.h> #include <linux/list.h> #include <linux/slab.h> -#include <asm/sections.h> +#include "debug.h" #define HASH_SIZE 16384ULL#define HASH_FN_SHIFT 13
kernel/dma/debug.h renamed from include/linux/dma-debug.h +3 -41
73 lines not on this page · raw message
kernel/dma/mapping.c +1 -0
@@ -14,6 +14,7 @@#include <linux/of_device.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include "debug.h" /* * Managed DMA API
mm/memory.c +0 -1
@@ -65,7 +65,6 @@#include <linux/gfp.h> #include <linux/migrate.h> #include <linux/string.h> -#include <linux/dma-debug.h> #include <linux/debugfs.h> #include <linux/userfaultfd_k.h> #include <linux/dax.h>
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 8/9 dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma
In reply to Christoph HellwigMost of the dma_direct symbols should only be used by direct.c and mapping.c, so move them to kernel/dma. In fact more of dma-direct.h should eventually move, but that will require more coordination with other subsystems.
--- include/linux/dma-direct.h | 106 --------------------------------- kernel/dma/direct.c | 2 +- kernel/dma/direct.h | 119 +++++++++++++++++++++++++++++++++++++ kernel/dma/mapping.c | 2 +- 4 files changed, 121 insertions(+), 108 deletions(-) create mode 100644 kernel/dma/direct.h
include/linux/dma-direct.h +0 -106
@@ -120,114 +120,8 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,void dma_direct_free_pages (struct device *dev,size_t size,struct page *page,dma_addr_t dma_addr,enum dma_data_direction dir); -int dma_direct_get_sgtable (struct device *dev,struct sg_table *sgt, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs); -bool dma_direct_can_mmap (struct device *dev); -int dma_direct_mmap (struct device *dev,struct vm_area_struct *vma, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs);int dma_direct_supported (struct device *dev,u64 mask); -bool dma_direct_need_sync (struct device *dev,dma_addr_t dma_addr); -int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents, -enum dma_data_direction dir,unsigned long attrs);dma_addr_t dma_direct_map_resource (struct device *dev,phys_addr_t paddr,size_t size,enum dma_data_direction dir,unsigned long attrs); -size_t dma_direct_max_mapping_size (struct device *dev); -#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ - defined(CONFIG_SWIOTLB ) -void dma_direct_sync_sg_for_device (struct device *dev,struct scatterlist *sgl, -int nents,enum dma_data_direction dir); -#else -static inline void dma_direct_sync_sg_for_device (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir) -{ -} -#endif - -#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU ) || \ - defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL ) || \ - defined(CONFIG_SWIOTLB ) -void dma_direct_unmap_sg (struct device *dev,struct scatterlist *sgl, -int nents,enum dma_data_direction dir,unsigned long attrs); -void dma_direct_sync_sg_for_cpu (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir); -#else -static inline void dma_direct_unmap_sg (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir, -unsigned long attrs) -{ -} -static inline void dma_direct_sync_sg_for_cpu (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir) -{ -} -#endif - -static inline void dma_direct_sync_single_for_device (struct device *dev, -dma_addr_t addr,size_t size,enum dma_data_direction dir) -{ -phys_addr_t paddr =dma_to_phys (dev, addr); - -if (unlikely (is_swiotlb_buffer (paddr))) -swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_DEVICE ); - -if (!dev_is_dma_coherent (dev)) -arch_sync_dma_for_device (paddr, size, dir); -} - -static inline void dma_direct_sync_single_for_cpu (struct device *dev, -dma_addr_t addr,size_t size,enum dma_data_direction dir) -{ -phys_addr_t paddr =dma_to_phys (dev, addr); - -if (!dev_is_dma_coherent (dev)) { -arch_sync_dma_for_cpu (paddr, size, dir); -arch_sync_dma_for_cpu_all (); - } - -if (unlikely (is_swiotlb_buffer (paddr))) -swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_CPU ); - -if (dir ==DMA_FROM_DEVICE ) -arch_dma_mark_clean (paddr, size); -} - -static inline dma_addr_t dma_direct_map_page (struct device *dev, -struct page *page,unsigned long offset,size_t size, -enum dma_data_direction dir,unsigned long attrs) -{ -phys_addr_t phys =page_to_phys (page) + offset; -dma_addr_t dma_addr =phys_to_dma (dev, phys); - -if (unlikely (swiotlb_force ==SWIOTLB_FORCE )) -return swiotlb_map (dev, phys, size, dir, attrs); - -if (unlikely (!dma_capable (dev, dma_addr, size, true))) { -if (swiotlb_force !=SWIOTLB_NO_FORCE ) -return swiotlb_map (dev, phys, size, dir, attrs); - -dev_WARN_ONCE (dev,1 , -"DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n" , - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); -return DMA_MAPPING_ERROR ; - } - -if (!dev_is_dma_coherent (dev) && !(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -arch_sync_dma_for_device (phys, size, dir); -return dma_addr; -} - -static inline void dma_direct_unmap_page (struct device *dev,dma_addr_t addr, -size_t size,enum dma_data_direction dir,unsigned long attrs) -{ -phys_addr_t phys =dma_to_phys (dev, addr); - -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -dma_direct_sync_single_for_cpu (dev, addr, size, dir); - -if (unlikely (is_swiotlb_buffer (phys))) -swiotlb_tbl_unmap_single (dev, phys, size, size, dir, attrs); -}#endif /* _LINUX_DMA_DIRECT_H */
kernel/dma/direct.c +1 -1
@@ -7,13 +7,13 @@#include <linux/memblock.h> /* for max_pfn */ #include <linux/export.h> #include <linux/mm.h> -#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/pfn.h> #include <linux/vmalloc.h> #include <linux/set_memory.h> #include <linux/slab.h> +#include "direct.h" /* * Most architectures use ZONE_DMA for the first 16 Megabytes, but some use it
kernel/dma/direct.h new file +119 -0
119 lines not on this page · raw message
kernel/dma/mapping.c +1 -1
@@ -7,7 +7,6 @@*/ #include <linux/memblock.h> /* for max_pfn */ #include <linux/acpi.h> -#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/export.h> #include <linux/gfp.h>
@@ -15,6 +14,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include "debug.h" +#include "direct.h" /* * Managed DMA API
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 8/9] dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma
Quoted 4 lines · Christoph Hellwig
Most of the
dma_directsymbols should only be used bydirect.candmapping.c, so move them to kernel/dma. In fact more ofdma-direct.hshould eventually move, but that will require more coordination with other subsystems.
Because of this change, http://patchwork.ozlabs.org/project/linuxppc-dev/patch/[email protected]/ does not work anymore.
Should I send a patch moving dma_direct_map_sg/dma_direct_map_page/+unmap back to include/ or there is a better idea? thanks,
Quoted 294 lines
Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/dma-direct.h | 106 --------------------------------- kernel/dma/direct.c | 2 +- kernel/dma/direct.h | 119 +++++++++++++++++++++++++++++++++++++ kernel/dma/mapping.c | 2 +- 4 files changed, 121 insertions(+), 108 deletions(-)create mode 100644
kernel/dma/direct.hinclude/linux/dma-direct.h +0
-106@@ -120,114 +120,8 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,void dma_direct_free_pages (struct device *dev,size_t size,struct page *page,dma_addr_t dma_addr,enum dma_data_direction dir); -int dma_direct_get_sgtable (struct device *dev,struct sg_table *sgt, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs); -bool dma_direct_can_mmap (struct device *dev); -int dma_direct_mmap (struct device *dev,struct vm_area_struct *vma, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs);int dma_direct_supported (struct device *dev,u64 mask); -bool dma_direct_need_sync (struct device *dev,dma_addr_t dma_addr); -int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents, -enum dma_data_direction dir,unsigned long attrs);dma_addr_t dma_direct_map_resource (struct device *dev,phys_addr_t paddr,size_t size,enum dma_data_direction dir,unsigned long attrs); -size_t dma_direct_max_mapping_size (struct device *dev); -#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ - defined(CONFIG_SWIOTLB ) -void dma_direct_sync_sg_for_device (struct device *dev,struct scatterlist *sgl, -int nents,enum dma_data_direction dir); -#else -static inline void dma_direct_sync_sg_for_device (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir) -{ -} -#endif - -#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU ) || \ - defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL ) || \ - defined(CONFIG_SWIOTLB ) -void dma_direct_unmap_sg (struct device *dev,struct scatterlist *sgl, -int nents,enum dma_data_direction dir,unsigned long attrs); -void dma_direct_sync_sg_for_cpu (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir); -#else -static inline void dma_direct_unmap_sg (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir, -unsigned long attrs) -{ -} -static inline void dma_direct_sync_sg_for_cpu (struct device *dev, -struct scatterlist *sgl,int nents,enum dma_data_direction dir) -{ -} -#endif - -static inline void dma_direct_sync_single_for_device (struct device *dev, -dma_addr_t addr,size_t size,enum dma_data_direction dir) -{ -phys_addr_t paddr =dma_to_phys (dev, addr); - -if (unlikely (is_swiotlb_buffer (paddr))) -swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_DEVICE ); - -if (!dev_is_dma_coherent (dev)) -arch_sync_dma_for_device (paddr, size, dir); -} - -static inline void dma_direct_sync_single_for_cpu (struct device *dev, -dma_addr_t addr,size_t size,enum dma_data_direction dir) -{ -phys_addr_t paddr =dma_to_phys (dev, addr); - -if (!dev_is_dma_coherent (dev)) { -arch_sync_dma_for_cpu (paddr, size, dir); -arch_sync_dma_for_cpu_all (); - } - -if (unlikely (is_swiotlb_buffer (paddr))) -swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_CPU ); - -if (dir ==DMA_FROM_DEVICE ) -arch_dma_mark_clean (paddr, size); -} - -static inline dma_addr_t dma_direct_map_page (struct device *dev, -struct page *page,unsigned long offset,size_t size, -enum dma_data_direction dir,unsigned long attrs) -{ -phys_addr_t phys =page_to_phys (page) + offset; -dma_addr_t dma_addr =phys_to_dma (dev, phys); - -if (unlikely (swiotlb_force ==SWIOTLB_FORCE )) -return swiotlb_map (dev, phys, size, dir, attrs); - -if (unlikely (!dma_capable (dev, dma_addr, size, true))) { -if (swiotlb_force !=SWIOTLB_NO_FORCE ) -return swiotlb_map (dev, phys, size, dir, attrs); - -dev_WARN_ONCE (dev,1 , -"DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n" , - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); -return DMA_MAPPING_ERROR ; - } - -if (!dev_is_dma_coherent (dev) && !(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -arch_sync_dma_for_device (phys, size, dir); -return dma_addr; -} - -static inline void dma_direct_unmap_page (struct device *dev,dma_addr_t addr, -size_t size,enum dma_data_direction dir,unsigned long attrs) -{ -phys_addr_t phys =dma_to_phys (dev, addr); - -if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) -dma_direct_sync_single_for_cpu (dev, addr, size, dir); - -if (unlikely (is_swiotlb_buffer (phys))) -swiotlb_tbl_unmap_single (dev, phys, size, size, dir, attrs); -}#endif /* _LINUX_DMA_DIRECT_H */ kernel/dma/direct.c +1
-1@@ -7,13 +7,13 @@#include <linux/memblock.h> /* for max_pfn */ #include <linux/export.h> #include <linux/mm.h> -#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/pfn.h> #include <linux/vmalloc.h> #include <linux/set_memory.h> #include <linux/slab.h> +#include "direct.h" /* * Most architectures use ZONE_DMA for the first 16 Megabytes, but some use it kernel/dma/direct.h new file +119
-0@@ -0,0 +1,119 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2018 Christoph Hellwig. +* +* DMA operations that map physical memory directly without using an IOMMU. +*/ +#ifndef _KERNEL_DMA_DIRECT_H +#define _KERNEL_DMA_DIRECT_H + +#include <linux/dma-direct.h> + +int dma_direct_get_sgtable (struct device *dev,struct sg_table *sgt, +void *cpu_addr,dma_addr_t dma_addr,size_t size, +unsigned long attrs); +bool dma_direct_can_mmap (struct device *dev); +int dma_direct_mmap (struct device *dev,struct vm_area_struct *vma, +void *cpu_addr,dma_addr_t dma_addr,size_t size, +unsigned long attrs); +bool dma_direct_need_sync (struct device *dev,dma_addr_t dma_addr); +int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents, +enum dma_data_direction dir,unsigned long attrs); +size_t dma_direct_max_mapping_size (struct device *dev); + +#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ + defined(CONFIG_SWIOTLB ) +void dma_direct_sync_sg_for_device (struct device *dev,struct scatterlist *sgl, +int nents,enum dma_data_direction dir); +#else +static inline void dma_direct_sync_sg_for_device (struct device *dev, +struct scatterlist *sgl,int nents,enum dma_data_direction dir) +{ +} +#endif + +#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU ) || \ + defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL ) || \ + defined(CONFIG_SWIOTLB ) +void dma_direct_unmap_sg (struct device *dev,struct scatterlist *sgl, +int nents,enum dma_data_direction dir,unsigned long attrs); +void dma_direct_sync_sg_for_cpu (struct device *dev, +struct scatterlist *sgl,int nents,enum dma_data_direction dir); +#else +static inline void dma_direct_unmap_sg (struct device *dev, +struct scatterlist *sgl,int nents,enum dma_data_direction dir, +unsigned long attrs) +{ +} +static inline void dma_direct_sync_sg_for_cpu (struct device *dev, +struct scatterlist *sgl,int nents,enum dma_data_direction dir) +{ +} +#endif + +static inline void dma_direct_sync_single_for_device (struct device *dev, +dma_addr_t addr,size_t size,enum dma_data_direction dir) +{ +phys_addr_t paddr =dma_to_phys (dev, addr); + +if (unlikely (is_swiotlb_buffer (paddr))) +swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_DEVICE ); + +if (!dev_is_dma_coherent (dev)) +arch_sync_dma_for_device (paddr, size, dir); +} + +static inline void dma_direct_sync_single_for_cpu (struct device *dev, +dma_addr_t addr,size_t size,enum dma_data_direction dir) +{ +phys_addr_t paddr =dma_to_phys (dev, addr); + +if (!dev_is_dma_coherent (dev)) { +arch_sync_dma_for_cpu (paddr, size, dir); +arch_sync_dma_for_cpu_all (); + } + +if (unlikely (is_swiotlb_buffer (paddr))) +swiotlb_tbl_sync_single (dev, paddr, size, dir,SYNC_FOR_CPU ); + +if (dir ==DMA_FROM_DEVICE ) +arch_dma_mark_clean (paddr, size); +} + +static inline dma_addr_t dma_direct_map_page (struct device *dev, +struct page *page,unsigned long offset,size_t size, +enum dma_data_direction dir,unsigned long attrs) +{ +phys_addr_t phys =page_to_phys (page) + offset; +dma_addr_t dma_addr =phys_to_dma (dev, phys); + +if (unlikely (swiotlb_force ==SWIOTLB_FORCE )) +return swiotlb_map (dev, phys, size, dir, attrs); + +if (unlikely (!dma_capable (dev, dma_addr, size, true))) { +if (swiotlb_force !=SWIOTLB_NO_FORCE ) +return swiotlb_map (dev, phys, size, dir, attrs); + +dev_WARN_ONCE (dev,1 , +"DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n" , + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit); +return DMA_MAPPING_ERROR ; + } + +if (!dev_is_dma_coherent (dev) && !(attrs &DMA_ATTR_SKIP_CPU_SYNC )) +arch_sync_dma_for_device (phys, size, dir); +return dma_addr; +} + +static inline void dma_direct_unmap_page (struct device *dev,dma_addr_t addr, +size_t size,enum dma_data_direction dir,unsigned long attrs) +{ +phys_addr_t phys =dma_to_phys (dev, addr); + +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC )) +dma_direct_sync_single_for_cpu (dev, addr, size, dir); + +if (unlikely (is_swiotlb_buffer (phys))) +swiotlb_tbl_unmap_single (dev, phys, size, size, dir, attrs); +} +#endif /* _KERNEL_DMA_DIRECT_H */ kernel/dma/mapping.c +1
-1@@ -7,7 +7,6 @@*/ #include <linux/memblock.h> /* for max_pfn */ #include <linux/acpi.h> -#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/export.h> #include <linux/gfp.h> @@ -15,6 +14,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include "debug.h" +#include "direct.h" /* * Managed DMA API
Signature · 1 line
Alexey
PATCH 9/9 dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>
In reply to Christoph HellwigMove more nitty gritty DMA implementation details into the common internal header.
--- MAINTAINERS | 1 - arch/arc/mm/dma.c | 1 - arch/arm/mm/dma-mapping.c | 1 - arch/arm/xen/mm.c | 2 +- arch/arm64/mm/dma-mapping.c | 1 - arch/c6x/mm/dma-coherent.c | 2 +- arch/csky/mm/dma-mapping.c | 1 - arch/hexagon/kernel/dma.c | 2 +- arch/ia64/mm/init.c | 2 +- arch/m68k/kernel/dma.c | 2 +- arch/microblaze/kernel/dma.c | 2 +- arch/microblaze/mm/consistent.c | 2 +- arch/mips/jazz/jazzdma.c | 1 - arch/mips/mm/dma-noncoherent.c | 1 - arch/nds32/kernel/dma.c | 2 +- arch/openrisc/kernel/dma.c | 2 +- arch/parisc/kernel/pci-dma.c | 2 +- arch/powerpc/mm/dma-noncoherent.c | 2 +- arch/sh/kernel/dma-coherent.c | 2 +- arch/sparc/kernel/ioport.c | 2 +- arch/xtensa/kernel/pci-dma.c | 1 - drivers/iommu/dma-iommu.c | 1 - drivers/xen/swiotlb-xen.c | 3 +- include/linux/dma-direct.h | 2 +- include/linux/dma-map-ops.h | 102 ++++++++++++++++++++++++++++ include/linux/dma-noncoherent.h | 109 ------------------------------ kernel/dma/ops_helpers.c | 1 - kernel/dma/pool.c | 1 - kernel/dma/swiotlb.c | 2 +- 29 files changed, 118 insertions(+), 137 deletions(-) delete mode 100644 include/linux/dma-noncoherent.h
MAINTAINERS +0 -1
@@ -5203,7 +5203,6 @@ F: include/asm-generic/dma-mapping.h F: include/linux/dma-direct.h F: include/linux/dma-mapping.h F: include/linux/dma-map-ops.h -F: include/linux/dma-noncoherent.h F: kernel/dma/ DMA-BUF HEAPS FRAMEWORK
arch/arc/mm/dma.c +0 -1
@@ -4,7 +4,6 @@*/ #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <asm/cache.h> #include <asm/cacheflush.h>
arch/arm/mm/dma-mapping.c +0 -1
@@ -16,7 +16,6 @@#include <linux/device.h> #include <linux/dma-direct.h> #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <linux/highmem.h> #include <linux/memblock.h> #include <linux/slab.h>
arch/arm/xen/mm.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only #include <linux/cpu.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/gfp.h> #include <linux/highmem.h> #include <linux/export.h>
arch/arm64/mm/dma-mapping.c +0 -1
@@ -7,7 +7,6 @@#include <linux/gfp.h> #include <linux/cache.h> #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <linux/dma-iommu.h> #include <xen/xen.h> #include <xen/swiotlb-xen.h>
arch/c6x/mm/dma-coherent.c +1 -1
@@ -15,7 +15,7 @@#include <linux/bitops.h> #include <linux/module.h> #include <linux/interrupt.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/memblock.h> #include <asm/cacheflush.h>
arch/csky/mm/dma-mapping.c +0 -1
@@ -3,7 +3,6 @@#include <linux/cache.h> #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <linux/genalloc.h> #include <linux/highmem.h> #include <linux/io.h>
arch/hexagon/kernel/dma.c +1 -1
@@ -5,7 +5,7 @@* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved. */ -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/memblock.h> #include <linux/genalloc.h> #include <linux/module.h>
arch/ia64/mm/init.c +1 -1
@@ -8,7 +8,7 @@#include <linux/kernel.h> #include <linux/init.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/dmar.h> #include <linux/efi.h> #include <linux/elf.h>
arch/m68k/kernel/dma.c +1 -1
@@ -6,7 +6,7 @@#undef DEBUG -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/platform_device.h>
arch/microblaze/kernel/dma.c +1 -1
@@ -8,7 +8,7 @@*/ #include <linux/device.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/gfp.h> #include <linux/export.h> #include <linux/bug.h>
arch/microblaze/mm/consistent.c +1 -1
@@ -11,7 +11,7 @@#include <linux/types.h> #include <linux/mm.h> #include <linux/init.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <asm/cpuinfo.h> #include <asm/cacheflush.h>
arch/mips/jazz/jazzdma.c +0 -1
@@ -17,7 +17,6 @@#include <linux/spinlock.h> #include <linux/gfp.h> #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <asm/mipsregs.h> #include <asm/jazz.h> #include <asm/io.h>
arch/mips/mm/dma-noncoherent.c +0 -1
@@ -6,7 +6,6 @@*/ #include <linux/dma-direct.h> #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <linux/highmem.h> #include <asm/cache.h>
arch/nds32/kernel/dma.c +1 -1
@@ -3,7 +3,7 @@#include <linux/types.h> #include <linux/mm.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/cache.h> #include <linux/highmem.h> #include <asm/cacheflush.h>
arch/openrisc/kernel/dma.c +1 -1
@@ -13,7 +13,7 @@* DMA mapping callbacks... */ -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/pagewalk.h> #include <asm/cpuinfo.h>
arch/parisc/kernel/pci-dma.c +1 -1
@@ -26,7 +26,7 @@#include <linux/string.h> #include <linux/types.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <asm/cacheflush.h> #include <asm/dma.h> /* for DMA_CHUNK_SIZE */
arch/powerpc/mm/dma-noncoherent.c +1 -1
@@ -11,7 +11,7 @@#include <linux/types.h> #include <linux/highmem.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <asm/tlbflush.h> #include <asm/dma.h>
arch/sh/kernel/dma-coherent.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2004 - 2007 Paul Mundt */ #include <linux/mm.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <asm/cacheflush.h> #include <asm/addrspace.h>
arch/sparc/kernel/ioport.c +1 -1
@@ -38,7 +38,7 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/scatterlist.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/of_device.h> #include <asm/io.h>
arch/xtensa/kernel/pci-dma.c +0 -1
@@ -12,7 +12,6 @@*/ #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> #include <linux/dma-direct.h> #include <linux/gfp.h> #include <linux/highmem.h>
drivers/iommu/dma-iommu.c +0 -1
@@ -12,7 +12,6 @@#include <linux/device.h> #include <linux/dma-map-ops.h> #include <linux/dma-iommu.h> -#include <linux/dma-noncoherent.h> #include <linux/gfp.h> #include <linux/huge_mm.h> #include <linux/iommu.h>
drivers/xen/swiotlb-xen.c +1 -2
@@ -27,9 +27,8 @@#define pr_fmt (fmt) "xen:" KBUILD_MODNAME ": " fmt#include <linux/memblock.h> -#include <linux/dma-map-ops.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/export.h> #include <xen/swiotlb-xen.h> #include <xen/page.h>
include/linux/dma-direct.h +1 -1
@@ -7,7 +7,7 @@#define _LINUX_DMA_DIRECT_H 1#include <linux/dma-mapping.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/memblock.h> /* for min_low_pfn */ #include <linux/mem_encrypt.h> #include <linux/swiotlb.h>
include/linux/dma-map-ops.h +102 -0
114 lines not on this page · raw message
include/linux/dma-noncoherent.h deleted +0 -109
109 lines not on this page · raw message
kernel/dma/ops_helpers.c +0 -1
@@ -4,7 +4,6 @@* the allocated memory contains normal pages in the direct kernel mapping. */ #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> /* * Create scatter-list for the already allocated DMA buffer.
kernel/dma/pool.c +0 -1
@@ -7,7 +7,6 @@#include <linux/debugfs.h> #include <linux/dma-map-ops.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> #include <linux/init.h> #include <linux/genalloc.h> #include <linux/set_memory.h>
kernel/dma/swiotlb.c +1 -1
@@ -22,7 +22,7 @@#include <linux/cache.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/mm.h> #include <linux/export.h> #include <linux/spinlock.h>
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
I've pulled this into the dma-mapping for-next tree now.