Commit 24fce61b authored by Damian Hobson-Garcia's avatar Damian Hobson-Garcia Committed by Greg Kroah-Hartman

drivers: uio_dmem_genirq: Don't mix address spaces for dynamic region vaddr

Assigning the virtual address returned from dma_alloc_coherent to the the
internal_addr element of uioinfo produces the following sparse errors since
internal_addr is a void __iomem * and dma_alloc_coherent returns void *.

+ drivers/uio/uio_dmem_genirq.c:65:39: sparse: incorrect type in assignment (different address spaces)
  drivers/uio/uio_dmem_genirq.c:65:39:    expected void [noderef] <asn:2>*internal_addr
  drivers/uio/uio_dmem_genirq.c:65:39:    got void *[assigned] addr
+ drivers/uio/uio_dmem_genirq.c:93:17: sparse: incorrect type in argument 3 (different address spaces)
  drivers/uio/uio_dmem_genirq.c:93:17:    expected void *vaddr
  drivers/uio/uio_dmem_genirq.c:93:17:    got void [noderef] <asn:2>*internal_addr

Store the void * in the driver's private data instead.
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarDamian Hobson-Garcia <dhobsong@igel.co.jp>
Cc: "Hans J. Koch" <hjk@hansjkoch.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b96c312
...@@ -37,6 +37,7 @@ struct uio_dmem_genirq_platdata { ...@@ -37,6 +37,7 @@ struct uio_dmem_genirq_platdata {
struct platform_device *pdev; struct platform_device *pdev;
unsigned int dmem_region_start; unsigned int dmem_region_start;
unsigned int num_dmem_regions; unsigned int num_dmem_regions;
void *dmem_region_vaddr[MAX_UIO_MAPS];
struct mutex alloc_lock; struct mutex alloc_lock;
unsigned int refcnt; unsigned int refcnt;
}; };
...@@ -46,6 +47,7 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode) ...@@ -46,6 +47,7 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode)
struct uio_dmem_genirq_platdata *priv = info->priv; struct uio_dmem_genirq_platdata *priv = info->priv;
struct uio_mem *uiomem; struct uio_mem *uiomem;
int ret = 0; int ret = 0;
int dmem_region = priv->dmem_region_start;
uiomem = &priv->uioinfo->mem[priv->dmem_region_start]; uiomem = &priv->uioinfo->mem[priv->dmem_region_start];
...@@ -61,8 +63,7 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode) ...@@ -61,8 +63,7 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode)
ret = -ENOMEM; ret = -ENOMEM;
break; break;
} }
priv->dmem_region_vaddr[dmem_region++] = addr;
uiomem->internal_addr = addr;
++uiomem; ++uiomem;
} }
priv->refcnt++; priv->refcnt++;
...@@ -77,6 +78,7 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode) ...@@ -77,6 +78,7 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode)
{ {
struct uio_dmem_genirq_platdata *priv = info->priv; struct uio_dmem_genirq_platdata *priv = info->priv;
struct uio_mem *uiomem; struct uio_mem *uiomem;
int dmem_region = priv->dmem_region_start;
/* Tell the Runtime PM code that the device has become idle */ /* Tell the Runtime PM code that the device has become idle */
pm_runtime_put_sync(&priv->pdev->dev); pm_runtime_put_sync(&priv->pdev->dev);
...@@ -91,7 +93,8 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode) ...@@ -91,7 +93,8 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode)
break; break;
dma_free_coherent(&priv->pdev->dev, uiomem->size, dma_free_coherent(&priv->pdev->dev, uiomem->size,
uiomem->internal_addr, uiomem->addr); priv->dmem_region_vaddr[dmem_region++],
uiomem->addr);
uiomem->addr = DMA_ERROR_CODE; uiomem->addr = DMA_ERROR_CODE;
++uiomem; ++uiomem;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment