Commit 01994780 authored by Chris Leech's avatar Chris Leech Committed by Greg Kroah-Hartman
Browse files

uio_dmem_genirq: UIO_MEM_DMA_COHERENT conversion 



Conversion of this driver to use UIO_MEM_DMA_COHERENT for
dma_alloc_coherent memory instead of UIO_MEM_PHYS.

Signed-off-by: default avatarChris Leech <cleech@redhat.com>
Link: https://lore.kernel.org/r/20240205200257.138376-1-cleech@redhat.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7722151e

drivers/uio/uio_dmem_genirq.c

+8 −14
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct uio_dmem_genirq_platdata { 
	struct platform_device *pdev;

	unsigned int dmem_region_start;

	unsigned int num_dmem_regions;

	void *dmem_region_vaddr[MAX_UIO_MAPS];

	struct mutex alloc_lock;

	unsigned int refcnt;

};
@@ -50,7 +49,6 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode) 
{

	struct uio_dmem_genirq_platdata *priv = info->priv;

	struct uio_mem *uiomem;

	int dmem_region = priv->dmem_region_start;



	uiomem = &priv->uioinfo->mem[priv->dmem_region_start];
@@ -61,11 +59,8 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode) 
			break;



		addr = dma_alloc_coherent(&priv->pdev->dev, uiomem->size,

				(dma_addr_t *)&uiomem->addr, GFP_KERNEL);

		if (!addr) {

			uiomem->addr = DMEM_MAP_ERROR;

		}

		priv->dmem_region_vaddr[dmem_region++] = addr;

					  &uiomem->dma_addr, GFP_KERNEL);

		uiomem->addr = addr ? (phys_addr_t) addr : DMEM_MAP_ERROR;

		++uiomem;

	}

	priv->refcnt++;
@@ -80,7 +75,6 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode) 
{

	struct uio_dmem_genirq_platdata *priv = info->priv;

	struct uio_mem *uiomem;

	int dmem_region = priv->dmem_region_start;



	/* Tell the Runtime PM code that the device has become idle */

	pm_runtime_put_sync(&priv->pdev->dev);
@@ -93,13 +87,12 @@ static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode) 
	while (!priv->refcnt && uiomem < &priv->uioinfo->mem[MAX_UIO_MAPS]) {

		if (!uiomem->size)

			break;

		if (priv->dmem_region_vaddr[dmem_region]) {

			dma_free_coherent(&priv->pdev->dev, uiomem->size,

					priv->dmem_region_vaddr[dmem_region],

					uiomem->addr);

		if (uiomem->addr) {

			dma_free_coherent(uiomem->dma_device, uiomem->size,

					  (void *) uiomem->addr,

					  uiomem->dma_addr);

		}

		uiomem->addr = DMEM_MAP_ERROR;

		++dmem_region;

		++uiomem;

	}
@@ -264,7 +257,8 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) 
					" dynamic and fixed memory regions.\n");

			break;

		}

		uiomem->memtype = UIO_MEM_PHYS;

		uiomem->memtype = UIO_MEM_DMA_COHERENT;

		uiomem->dma_device = &pdev->dev;

		uiomem->addr = DMEM_MAP_ERROR;

		uiomem->size = pdata->dynamic_region_sizes[i];

		++uiomem;