Commit 2a03c131 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Vinod Koul
Browse files

dmaengine: ti: edma: add missed operations 



The driver forgets to call pm_runtime_disable and pm_runtime_put_sync in
probe failure and remove.
Add the calls and modify probe failure handling to fix it.

To simplify the fix, the patch adjusts the calling order and merges checks
for devm_kcalloc.

Fixes: 2b6b3b74 ("ARM/dmaengine: edma: Merge the two drivers under drivers/dma/")
Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20191124052855.6472-1-hslester96@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent e42617b8

drivers/dma/ti/edma.c

+20 −17
Original line number Diff line number Diff line
@@ -2289,13 +2289,6 @@ static int edma_probe(struct platform_device *pdev) 
	if (!info)

		return -ENODEV;



	pm_runtime_enable(dev);

	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		dev_err(dev, "pm_runtime_get_sync() failed\n");

		return ret;

	}



	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;
@@ -2326,27 +2319,31 @@ static int edma_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ecc);



	pm_runtime_enable(dev);

	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		dev_err(dev, "pm_runtime_get_sync() failed\n");

		pm_runtime_disable(dev);

		return ret;

	}



	/* Get eDMA3 configuration from IP */

	ret = edma_setup_from_hw(dev, info, ecc);

	if (ret)

		return ret;

		goto err_disable_pm;



	/* Allocate memory based on the information we got from the IP */

	ecc->slave_chans = devm_kcalloc(dev, ecc->num_channels,

					sizeof(*ecc->slave_chans), GFP_KERNEL);

	if (!ecc->slave_chans)

		return -ENOMEM;



	ecc->slot_inuse = devm_kcalloc(dev, BITS_TO_LONGS(ecc->num_slots),

				       sizeof(unsigned long), GFP_KERNEL);

	if (!ecc->slot_inuse)

		return -ENOMEM;



	ecc->channels_mask = devm_kcalloc(dev,

					   BITS_TO_LONGS(ecc->num_channels),

					   sizeof(unsigned long), GFP_KERNEL);

	if (!ecc->channels_mask)

		return -ENOMEM;

	if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask)

		goto err_disable_pm;



	/* Mark all channels available initially */

	bitmap_fill(ecc->channels_mask, ecc->num_channels);
@@ -2388,7 +2385,7 @@ static int edma_probe(struct platform_device *pdev) 
				       ecc);

		if (ret) {

			dev_err(dev, "CCINT (%d) failed --> %d\n", irq, ret);

			return ret;

			goto err_disable_pm;

		}

		ecc->ccint = irq;

	}
@@ -2404,7 +2401,7 @@ static int edma_probe(struct platform_device *pdev) 
				       ecc);

		if (ret) {

			dev_err(dev, "CCERRINT (%d) failed --> %d\n", irq, ret);

			return ret;

			goto err_disable_pm;

		}

		ecc->ccerrint = irq;

	}
@@ -2412,7 +2409,8 @@ static int edma_probe(struct platform_device *pdev) 
	ecc->dummy_slot = edma_alloc_slot(ecc, EDMA_SLOT_ANY);

	if (ecc->dummy_slot < 0) {

		dev_err(dev, "Can't allocate PaRAM dummy slot\n");

		return ecc->dummy_slot;

		ret = ecc->dummy_slot;

		goto err_disable_pm;

	}



	queue_priority_mapping = info->queue_priority_mapping;
@@ -2512,6 +2510,9 @@ static int edma_probe(struct platform_device *pdev) 


err_reg1:

	edma_free_slot(ecc, ecc->dummy_slot);

err_disable_pm:

	pm_runtime_put_sync(dev);

	pm_runtime_disable(dev);

	return ret;

}
@@ -2542,6 +2543,8 @@ static int edma_remove(struct platform_device *pdev) 
	if (ecc->dma_memcpy)

		dma_async_device_unregister(ecc->dma_memcpy);

	edma_free_slot(ecc, ecc->dummy_slot);

	pm_runtime_put_sync(dev);

	pm_runtime_disable(dev);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE