clean up dma_declare_coherent_memory calling conventions V2
Subsystems (13)
Remove various unused flags, and return a reasonable error code.
Changes since V1:
- rebased
- fix an incorrect return value
- propagate the error value in ohci-sm501
PATCH 1/2 dma-coherent: remove the DMA_MEMORY_INCLUDES_CHILDREN flag
This flag was never implemented or used.
--- Documentation/DMA-API.txt | 4 ---- drivers/base/dma-coherent.c | 2 -- drivers/char/virtio_console.c | 3 --- include/linux/dma-mapping.h | 3 +-- 4 files changed, 1 insertion(+), 11 deletions(-)
Documentation/DMA-API.txt +0 -4
@@ -598,10 +598,6 @@ flags can be ORed together and are: One or both of these flags must be present. -- DMA_MEMORY_INCLUDES_CHILDREN - make the declared memory be allocated by - dma_alloc_coherent of any child devices of this one (for memory residing - on a bridge). - - 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.
drivers/base/dma-coherent.c +0 -2
@@ -109,8 +109,6 @@ static int dma_assign_coherent_memory(struct device *dev,return -EBUSY ; dev->dma_mem = mem; -/* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */ -return 0 ; }
drivers/char/virtio_console.c +0 -3
@@ -451,9 +451,6 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size,* device is created by remoteproc, the DMA memory is * associated with the grandparent device: * vdev => rproc => platform-dev. -* The code here would have been less quirky if -* DMA_MEMORY_INCLUDES_CHILDREN had been supported -* in dma-coherent.c */ if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent) goto free_buf;
include/linux/dma-mapping.h +1 -2
@@ -710,8 +710,7 @@ static inline int dma_get_cache_alignment(void)/* flags for the coherent memory api */ #define DMA_MEMORY_MAP 0x01#define DMA_MEMORY_IO 0x02 -#define DMA_MEMORY_INCLUDES_CHILDREN 0x04 -#define DMA_MEMORY_EXCLUSIVE 0x08 +#define DMA_MEMORY_EXCLUSIVE 0x04#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
Signature · 1 line
2.11.0
PATCH 2/2 dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
In reply to Christoph HellwigDMA_MEMORY_IO was never used in the tree, so remove it. That means there is no need for the DMA_MEMORY_MAP flag either now, so remove it as well and change dma_declare_coherent_memory to return a normal errno value.
--- Documentation/DMA-API.txt | 21 +--------- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 43 +++++++------------- arch/arm/mach-imx/mach-mx31moboard.c | 12 +++--- arch/sh/drivers/pci/fixups-dreamcast.c | 3 +- drivers/base/dma-coherent.c | 46 +++++++--------------- drivers/base/dma-mapping.c | 7 +--- .../platform/soc_camera/sh_mobile_ceu_camera.c | 5 +-- drivers/scsi/NCR_Q720.c | 3 +- drivers/usb/host/ohci-sm501.c | 7 ++-- drivers/usb/host/ohci-tmio.c | 9 ++--- include/linux/dma-mapping.h | 6 +-- 11 files changed, 50 insertions(+), 112 deletions(-)
Documentation/DMA-API.txt +1 -20
@@ -590,30 +590,11 @@ size is the size of the area (must be multiples of PAGE_SIZE). flags can be ORed together and are: -- DMA_MEMORY_MAP - request that the memory returned from - dma_alloc_coherent() be directly writable. - -- DMA_MEMORY_IO - request that the memory returned from - dma_alloc_coherent() be addressable using read()/write()/memcpy_toio() etc. - -One or both of these flags must be present. - - 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. -The return value will be either DMA_MEMORY_MAP or DMA_MEMORY_IO and -must correspond to a passed in flag (i.e. no returning DMA_MEMORY_IO -if only DMA_MEMORY_MAP were passed in) for success or zero for -failure. - -Note, for DMA_MEMORY_IO returns, all subsequent memory returned by -dma_alloc_coherent() may no longer be accessed directly, but instead -must be accessed using the correct bus functions. If your driver -isn't prepared to handle this contingency, it should not specify -DMA_MEMORY_IO in the input flags. - -As a simplification for the platforms, only **one** such region of +As a simplification for the platforms, only *one* such region of memory may be declared per device. For reasons of efficiency, most platforms choose to track the declared
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +15 -28
86 lines not on this page · raw message
arch/arm/mach-imx/mach-mx31moboard.c +6 -6
@@ -475,7 +475,7 @@ static phys_addr_t mx3_camera_base __initdata;static int __init mx31moboard_init_cam (void ) { -int dma, ret = -ENOMEM ; +int dma, ret;struct platform_device *pdev;imx31_add_ipu_core ();
@@ -484,11 +484,11 @@ static int __init mx31moboard_init_cam(void)if (IS_ERR (pdev))return PTR_ERR (pdev); - dma =dma_declare_coherent_memory (&pdev->dev, - mx3_camera_base, mx3_camera_base, -MX3_CAMERA_BUF_SIZE , -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!(dma &DMA_MEMORY_MAP )) + ret =dma_declare_coherent_memory (&pdev->dev, + mx3_camera_base, mx3_camera_base, +MX3_CAMERA_BUF_SIZE , +DMA_MEMORY_EXCLUSIVE ); +if (ret) goto err; ret =platform_device_add (pdev);
arch/sh/drivers/pci/fixups-dreamcast.c +1 -2
@@ -63,11 +63,10 @@ static void gapspci_fixup_resources(struct pci_dev *dev) res.end =GAPSPCI_DMA_BASE +GAPSPCI_DMA_SIZE -1 ; res.flags =IORESOURCE_MEM ;pcibios_resource_to_bus (dev->bus, ®ion, &res); -BUG_ON (!dma_declare_coherent_memory (&dev->dev, +BUG_ON (dma_declare_coherent_memory (&dev->dev, res.start, region.start,resource_size (&res), -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ));break ;default :
drivers/base/dma-coherent.c +14 -32
89 lines not on this page · raw message
drivers/base/dma-mapping.c +2 -5
@@ -176,13 +176,10 @@ int dmam_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr, rc =dma_declare_coherent_memory (dev, phys_addr, device_addr, size, flags); -if (rc) { +if (!rc)devres_add (dev, res); - rc =0 ; - }else { +else devres_free (res); - rc = -ENOMEM ; - }return rc; }
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +2 -3
@@ -1708,11 +1708,10 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev) err =dma_declare_coherent_memory (&pdev->dev, res->start, res->start,resource_size (res), -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!err) { +if (err) {dev_err (&pdev->dev,"Unable to declare CEU memory.\n" ); -return -ENXIO ; +return err; } pcdev->video_limit =resource_size (res);
drivers/scsi/NCR_Q720.c +1 -2
@@ -217,8 +217,7 @@ NCR_Q720_probe(struct device *dev) }if (dma_declare_coherent_memory (dev, base_addr, base_addr, - mem_size,DMA_MEMORY_MAP ) - !=DMA_MEMORY_MAP ) { + mem_size,0 )) {printk (KERN_ERR "NCR_Q720: DMA declare memory failed\n" ); goto out_release_region; }
drivers/usb/host/ohci-sm501.c +3 -4
@@ -123,13 +123,12 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)* regular memory. The HCD_LOCAL_MEM flag does just that. */ -if (!dma_declare_coherent_memory (dev, mem->start, + retval =dma_declare_coherent_memory (dev, mem->start, mem->start - mem->parent->start,resource_size (mem), -DMA_MEMORY_MAP | -DMA_MEMORY_EXCLUSIVE )) { +DMA_MEMORY_EXCLUSIVE ); +if (retval) {dev_err (dev,"cannot declare coherent memory\n" ); - retval = -ENXIO ; goto err1; }
drivers/usb/host/ohci-tmio.c +3 -6
@@ -227,13 +227,10 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev) goto err_ioremap_regs; } -if (!dma_declare_coherent_memory (&dev->dev, sram->start, - sram->start, -resource_size (sram), -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE )) { - ret = -EBUSY ; + ret =dma_declare_coherent_memory (&dev->dev, sram->start, sram->start, +resource_size (sram),DMA_MEMORY_EXCLUSIVE ); +if (ret) goto err_dma_declare; - }if (cell->enable) { ret = cell->enable (dev);
include/linux/dma-mapping.h +2 -4
@@ -708,9 +708,7 @@ static inline int dma_get_cache_alignment(void)#endif /* flags for the coherent memory api */ -#define DMA_MEMORY_MAP 0x01 -#define DMA_MEMORY_IO 0x02 -#define DMA_MEMORY_EXCLUSIVE 0x04 +#define DMA_MEMORY_EXCLUSIVE 0x01#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
@@ -723,7 +721,7 @@ 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) { - return 0; + return -EINVAL; } static inline void
Signature · 1 line
2.11.0
Re: [PATCH 2/2] dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
Can I get a review for this one?
Re: [PATCH 2/2] dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
In reply to Christoph HellwigHi Christoph,
Quoted 5 lines · Christoph Hellwig
DMA_MEMORY_IOwas never used in the tree, so remove it. That means there is no need for theDMA_MEMORY_MAPflag either now, so remove it as well and changedma_declare_coherent_memoryto return a normal errno value.Signed-off-by Christoph Hellwig <[email protected]>
There are 2 minor issues, besides that:
Quoted 132 lines
--- Documentation/DMA-API.txt | 21 +--------- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 43 +++++++------------- arch/arm/mach-imx/mach-mx31moboard.c | 12 +++--- arch/sh/drivers/pci/fixups-dreamcast.c | 3 +- drivers/base/dma-coherent.c | 46 +++++++--------------- drivers/base/dma-mapping.c | 7 +--- .../platform/soc_camera/sh_mobile_ceu_camera.c | 5 +-- drivers/scsi/NCR_Q720.c | 3 +- drivers/usb/host/ohci-sm501.c | 7 ++-- drivers/usb/host/ohci-tmio.c | 9 ++--- include/linux/dma-mapping.h | 6 +-- 11 files changed, 50 insertions(+), 112 deletions(-)Documentation/DMA-API.txt +1
-20@@ -590,30 +590,11 @@ size is the size of the area (must be multiples of PAGE_SIZE). flags can be ORed together and are: -- DMA_MEMORY_MAP - request that the memory returned from - dma_alloc_coherent() be directly writable. - -- DMA_MEMORY_IO - request that the memory returned from - dma_alloc_coherent() be addressable using read()/write()/memcpy_toio() etc. - -One or both of these flags must be present. - - 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. -The return value will be either DMA_MEMORY_MAP or DMA_MEMORY_IO and -must correspond to a passed in flag (i.e. no returning DMA_MEMORY_IO -if only DMA_MEMORY_MAP were passed in) for success or zero for -failure. - -Note, for DMA_MEMORY_IO returns, all subsequent memory returned by -dma_alloc_coherent() may no longer be accessed directly, but instead -must be accessed using the correct bus functions. If your driver -isn't prepared to handle this contingency, it should not specify -DMA_MEMORY_IO in the input flags. - -As a simplification for the platforms, only **one** such region of +As a simplification for the platforms, only *one* such region of memory may be declared per device. For reasons of efficiency, most platforms choose to track the declaredarch/arm/mach-imx/mach-imx27_visstrim_m10.c +13
-24@@ -245,7 +245,6 @@ static phys_addr_t mx2_camera_base __initdata;static void __init visstrim_analog_camera_init (void ) {struct platform_device *pdev; -int dma;gpio_set_value (TVP5150_PWDN ,1 );ndelay (1 );@@ -258,12 +257,9 @@ static void __init visstrim_analog_camera_init(void)if (IS_ERR (pdev))return ; - dma =dma_declare_coherent_memory (&pdev->dev, - mx2_camera_base, mx2_camera_base, -MX2_CAMERA_BUF_SIZE , -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!(dma &DMA_MEMORY_MAP )) -return ; +dma_declare_coherent_memory (&pdev->dev, mx2_camera_base, + mx2_camera_base,MX2_CAMERA_BUF_SIZE , +DMA_MEMORY_EXCLUSIVE ); }static void __init visstrim_reserve (void )@@ -444,16 +440,13 @@ static const struct imx_ssi_platform_data visstrim_m10_ssi_pdata __initconst = {static void __init visstrim_coda_init (void ) {struct platform_device *pdev; -int dma; pdev =imx27_add_coda (); - dma =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_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!(dma &DMA_MEMORY_MAP )) -return ; +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 ); }/* DMA deinterlace */ @@ -466,24 +459,20 @@ static void __init visstrim_deinterlace_init(void) {int ret = -ENOMEM ;struct platform_device *pdev = &visstrim_deinterlace; -int dma; ret =platform_device_register (pdev); - dma =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_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!(dma &DMA_MEMORY_MAP )) -return ; +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 ); }/* Emma-PrP for format conversion */ static void __init visstrim_emmaprp_init (void ) {struct platform_device *pdev; -int dma; pdev =imx27_add_mx2_emmaprp ();if (IS_ERR (pdev))@@ -493,12 +482,10 @@ static void __init visstrim_emmaprp_init(void)* Use the same memory area as the analog camera since both
arch/arm/mach-imx/mach-imx27_visstrim_m10.c static void __init visstrim_emmaprp_init(void) · line 488
Quoted 10 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +2
-4* devices are, by nature, exclusive. */ - dma =dma_declare_coherent_memory (&pdev->dev, +dma_declare_coherent_memory (&pdev->dev, mx2_camera_base, mx2_camera_base,MX2_CAMERA_BUF_SIZE , -DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ); -if (!(dma &DMA_MEMORY_MAP )) -pr_err ("Failed to declare memory for emmaprp\n" ); +DMA_MEMORY_EXCLUSIVE );
Can we keep error message? It might be useful in case of any problems, because the return value is not propagated otherwise.
Quoted 18 lines
Quoted 1 line
[...]
include/linux/dma-mapping.h +1
-3@@ -708,9 +708,7 @@ static inline int dma_get_cache_alignment(void)#endif /* flags for the coherent memory api */ -#define DMA_MEMORY_MAP 0x01 -#define DMA_MEMORY_IO 0x02 -#define DMA_MEMORY_EXCLUSIVE 0x04 +#define DMA_MEMORY_EXCLUSIVE 0x01#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
include/linux/dma-mapping.h static inline int · line 724
Quoted 5 lines
include/linux/dma-mapping.h +1
-1@@ -723,7 +721,7 @@ 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) { - return 0; + return -EINVAL;
ENOSYS ?
include/linux/dma-mapping.h static inline int · line 727
Quoted 3 lines
include/linux/dma-mapping.h +0
-0} static inline void
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Re: [PATCH 2/2] dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
Hi Marek,
thanks for the review. I'll fix those two issues up.