dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag

All users of dma_declare_coherent want their allocations to be
exclusive, so default to exclusive allocations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index b9d0cba..38e561b 100644 (file)
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -566,8 +566,7 @@ boundaries when doing this.
 
        int
        dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                                   dma_addr_t device_addr, size_t size, int
-                                   flags)
+                                   dma_addr_t device_addr, size_t size);
 
 Declare region of memory to be handed out by dma_alloc_coherent() when
 it's asked for coherent memory for this device.
@@ -581,12 +580,6 @@ dma_addr_t in dma_alloc_coherent()).
 
 size is the size of the area (must be multiples of PAGE_SIZE).
 
-flags can be ORed together and are:
-
-- DMA_MEMORY_EXCLUSIVE - only allocate memory from the declared regions.
-  Do not allow dma_alloc_coherent() to fall back to system memory when
-  it's out of memory in the declared region.
-
 As a simplification for the platforms, only *one* such region of
 memory may be declared per device.
 

diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 5169dfb..07d4fcf 100644 (file)
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -258,8 +258,7 @@ static void __init visstrim_analog_camera_init(void)
                return;
 
        dma_declare_coherent_memory(&pdev->dev, mx2_camera_base,
-                                   mx2_camera_base, MX2_CAMERA_BUF_SIZE,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   mx2_camera_base, MX2_CAMERA_BUF_SIZE);
 }
 
 static void __init visstrim_reserve(void)
@@ -445,8 +444,7 @@ static void __init visstrim_coda_init(void)
        dma_declare_coherent_memory(&pdev->dev,
                                    mx2_camera_base + MX2_CAMERA_BUF_SIZE,
                                    mx2_camera_base + MX2_CAMERA_BUF_SIZE,
-                                   MX2_CAMERA_BUF_SIZE,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   MX2_CAMERA_BUF_SIZE);
 }
 
 /* DMA deinterlace */
@@ -465,8 +463,7 @@ static void __init visstrim_deinterlace_init(void)
        dma_declare_coherent_memory(&pdev->dev,
                                    mx2_camera_base + 2 * MX2_CAMERA_BUF_SIZE,
                                    mx2_camera_base + 2 * MX2_CAMERA_BUF_SIZE,
-                                   MX2_CAMERA_BUF_SIZE,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   MX2_CAMERA_BUF_SIZE);
 }
 
 /* Emma-PrP for format conversion */
@@ -485,8 +482,7 @@ static void __init visstrim_emmaprp_init(void)
         */
        ret = dma_declare_coherent_memory(&pdev->dev,
                                mx2_camera_base, mx2_camera_base,
-                               MX2_CAMERA_BUF_SIZE,
-                               DMA_MEMORY_EXCLUSIVE);
+                               MX2_CAMERA_BUF_SIZE);
        if (ret)
                pr_err("Failed to declare memory for emmaprp\n");
 }

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 643a3d7..fe50f4c 100644 (file)
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -475,8 +475,7 @@ static int __init mx31moboard_init_cam(void)
 
        ret = dma_declare_coherent_memory(&pdev->dev,
                                          mx3_camera_base, mx3_camera_base,
-                                         MX3_CAMERA_BUF_SIZE,
-                                         DMA_MEMORY_EXCLUSIVE);
+                                         MX3_CAMERA_BUF_SIZE);
        if (ret)
                goto err;
 

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 8f234d0..7899b4f 100644 (file)
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -529,9 +529,8 @@ static int __init ap325rxa_devices_setup(void)
        device_initialize(&ap325rxa_ceu_device.dev);
        arch_setup_pdev_archdata(&ap325rxa_ceu_device);
        dma_declare_coherent_memory(&ap325rxa_ceu_device.dev,
-                                   ceu_dma_membase, ceu_dma_membase,
-                                   ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                       ceu_dma_membase, ceu_dma_membase,
+                       ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);
 
        platform_device_add(&ap325rxa_ceu_device);
 

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 22b4106..eb66754 100644 (file)
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -1440,8 +1440,7 @@ static int __init arch_setup(void)
        dma_declare_coherent_memory(&ecovec_ceu_devices[0]->dev,
                                    ceu0_dma_membase, ceu0_dma_membase,
                                    ceu0_dma_membase +
-                                   CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   CEU_BUFFER_MEMORY_SIZE - 1);
        platform_device_add(ecovec_ceu_devices[0]);
 
        device_initialize(&ecovec_ceu_devices[1]->dev);
@@ -1449,8 +1448,7 @@ static int __init arch_setup(void)
        dma_declare_coherent_memory(&ecovec_ceu_devices[1]->dev,
                                    ceu1_dma_membase, ceu1_dma_membase,
                                    ceu1_dma_membase +
-                                   CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   CEU_BUFFER_MEMORY_SIZE - 1);
        platform_device_add(ecovec_ceu_devices[1]);
 
        gpiod_add_lookup_table(&cn12_power_gpiod_table);

diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 203d249..b8bf67c 100644 (file)
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -603,9 +603,8 @@ static int __init kfr2r09_devices_setup(void)
        device_initialize(&kfr2r09_ceu_device.dev);
        arch_setup_pdev_archdata(&kfr2r09_ceu_device);
        dma_declare_coherent_memory(&kfr2r09_ceu_device.dev,
-                                   ceu_dma_membase, ceu_dma_membase,
-                                   ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                       ceu_dma_membase, ceu_dma_membase,
+                       ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);
 
        platform_device_add(&kfr2r09_ceu_device);
 

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index f4ad33c..bcd249e 100644 (file)
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -603,9 +603,8 @@ static int __init migor_devices_setup(void)
        device_initialize(&migor_ceu_device.dev);
        arch_setup_pdev_archdata(&migor_ceu_device);
        dma_declare_coherent_memory(&migor_ceu_device.dev,
-                                   ceu_dma_membase, ceu_dma_membase,
-                                   ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                       ceu_dma_membase, ceu_dma_membase,
+                       ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1);
 
        platform_device_add(&migor_ceu_device);
 

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index fdbec22..13c2d3c 100644 (file)
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -941,8 +941,7 @@ static int __init devices_setup(void)
        dma_declare_coherent_memory(&ms7724se_ceu_devices[0]->dev,
                                    ceu0_dma_membase, ceu0_dma_membase,
                                    ceu0_dma_membase +
-                                   CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   CEU_BUFFER_MEMORY_SIZE - 1);
        platform_device_add(ms7724se_ceu_devices[0]);
 
        device_initialize(&ms7724se_ceu_devices[1]->dev);
@@ -950,8 +949,7 @@ static int __init devices_setup(void)
        dma_declare_coherent_memory(&ms7724se_ceu_devices[1]->dev,
                                    ceu1_dma_membase, ceu1_dma_membase,
                                    ceu1_dma_membase +
-                                   CEU_BUFFER_MEMORY_SIZE - 1,
-                                   DMA_MEMORY_EXCLUSIVE);
+                                   CEU_BUFFER_MEMORY_SIZE - 1);
        platform_device_add(ms7724se_ceu_devices[1]);
 
        return platform_add_devices(ms7724se_devices,

diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index dfdbd05..7be8694 100644 (file)
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -63,8 +63,7 @@ static void gapspci_fixup_resources(struct pci_dev *dev)
                BUG_ON(dma_declare_coherent_memory(&dev->dev,
                                                res.start,
                                                region.start,
-                                               resource_size(&res),
-                                               DMA_MEMORY_EXCLUSIVE));
+                                               resource_size(&res)));
                break;
        default:
                printk("PCI: Failed resource fixup\n");

diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 6803f74..cc357b8 100644 (file)
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -1708,8 +1708,7 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
        if (res) {
                err = dma_declare_coherent_memory(&pdev->dev, res->start,
                                                  res->start,
-                                                 resource_size(res),
-                                                 DMA_MEMORY_EXCLUSIVE);
+                                                 resource_size(res));
                if (err) {
                        dev_err(&pdev->dev, "Unable to declare CEU memory.\n");
                        return err;

diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index c9233cd..c26228c 100644 (file)
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -126,8 +126,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
 
        retval = dma_declare_coherent_memory(dev, mem->start,
                                         mem->start - mem->parent->start,
-                                        resource_size(mem),
-                                        DMA_MEMORY_EXCLUSIVE);
+                                        resource_size(mem));
        if (retval) {
                dev_err(dev, "cannot declare coherent memory\n");
                goto err1;

diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index a631dbb..f88a037 100644 (file)
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -225,7 +225,7 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
        }
 
        ret = dma_declare_coherent_memory(&dev->dev, sram->start, sram->start,
-                               resource_size(sram), DMA_MEMORY_EXCLUSIVE);
+                               resource_size(sram));
        if (ret)
                goto err_dma_declare;
 

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index d29faad..70ad157 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -736,17 +736,14 @@ static inline int dma_get_cache_alignment(void)
        return 1;
 }
 
-/* flags for the coherent memory api */
-#define DMA_MEMORY_EXCLUSIVE           0x01
-
 #ifdef CONFIG_DMA_DECLARE_COHERENT
 int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                               dma_addr_t device_addr, size_t size, int flags);
+                               dma_addr_t device_addr, size_t size);
 void dma_release_declared_memory(struct device *dev);
 #else
 static inline int
 dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                           dma_addr_t device_addr, size_t size, int flags)
+                           dma_addr_t device_addr, size_t size)
 {
        return -ENOSYS;
 }

diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 1d12a31..29fd659 100644 (file)
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -14,7 +14,6 @@ struct dma_coherent_mem {
        dma_addr_t      device_base;
        unsigned long   pfn_base;
        int             size;
-       int             flags;
        unsigned long   *bitmap;
        spinlock_t      spinlock;
        bool            use_dev_dma_pfn_offset;
@@ -38,9 +37,9 @@ static inline dma_addr_t dma_get_device_base(struct device *dev,
                return mem->device_base;
 }
 
-static int dma_init_coherent_memory(
-       phys_addr_t phys_addr, dma_addr_t device_addr, size_t size, int flags,
-       struct dma_coherent_mem **mem)
+static int dma_init_coherent_memory(phys_addr_t phys_addr,
+               dma_addr_t device_addr, size_t size,
+               struct dma_coherent_mem **mem)
 {
        struct dma_coherent_mem *dma_mem = NULL;
        void *mem_base = NULL;
@@ -73,7 +72,6 @@ static int dma_init_coherent_memory(
        dma_mem->device_base = device_addr;
        dma_mem->pfn_base = PFN_DOWN(phys_addr);
        dma_mem->size = pages;
-       dma_mem->flags = flags;
        spin_lock_init(&dma_mem->spinlock);
 
        *mem = dma_mem;
@@ -110,12 +108,12 @@ static int dma_assign_coherent_memory(struct device *dev,
 }
 
 int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                               dma_addr_t device_addr, size_t size, int flags)
+                               dma_addr_t device_addr, size_t size)
 {
        struct dma_coherent_mem *mem;
        int ret;
 
-       ret = dma_init_coherent_memory(phys_addr, device_addr, size, flags, &mem);
+       ret = dma_init_coherent_memory(phys_addr, device_addr, size, &mem);
        if (ret)
                return ret;
 
@@ -190,15 +188,7 @@ int dma_alloc_from_dev_coherent(struct device *dev, ssize_t size,
                return 0;
 
        *ret = __dma_alloc_from_coherent(mem, size, dma_handle);
-       if (*ret)
-               return 1;
-
-       /*
-        * In the case where the allocation can not be satisfied from the
-        * per-device area, try to fall back to generic memory if the
-        * constraints allow it.
-        */
-       return mem->flags & DMA_MEMORY_EXCLUSIVE;
+       return 1;
 }
 
 void *dma_alloc_from_global_coherent(ssize_t size, dma_addr_t *dma_handle)
@@ -327,8 +317,7 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
 
        if (!mem) {
                ret = dma_init_coherent_memory(rmem->base, rmem->base,
-                                              rmem->size,
-                                              DMA_MEMORY_EXCLUSIVE, &mem);
+                                              rmem->size, &mem);
                if (ret) {
                        pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
                                &rmem->base, (unsigned long)rmem->size / SZ_1M);