Commit dcbef079 authored by Lizhi Hou's avatar Lizhi Hou Committed by Vinod Koul
Browse files

dmaengine: amd: qdma: Remove using the private get and set dma_ops APIs 



The get_dma_ops and set_dma_ops APIs were never for driver to use. Remove
these calls from QDMA driver. Instead, pass the DMA device pointer from the
qdma_platdata structure.

Fixes: 73d5fc92 ("dmaengine: amd: qdma: Add AMD QDMA driver")
Signed-off-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240918181022.2155715-1-lizhi.hou@amd.com


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

drivers/dma/amd/qdma/qdma.c

+12 −16
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
#include <linux/bitfield.h>

#include <linux/bitops.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/dma-map-ops.h>

#include <linux/platform_device.h>

#include <linux/platform_data/amd_qdma.h>

#include <linux/regmap.h>
@@ -492,18 +492,9 @@ static int qdma_device_verify(struct qdma_device *qdev) 


static int qdma_device_setup(struct qdma_device *qdev)

{

	struct device *dev = &qdev->pdev->dev;

	u32 ring_sz = QDMA_DEFAULT_RING_SIZE;

	int ret = 0;



	while (dev && get_dma_ops(dev))

		dev = dev->parent;

	if (!dev) {

		qdma_err(qdev, "dma device not found");

		return -EINVAL;

	}

	set_dma_ops(&qdev->pdev->dev, get_dma_ops(dev));



	ret = qdma_setup_fmap_context(qdev);

	if (ret) {

		qdma_err(qdev, "Failed setup fmap context");
@@ -548,11 +539,12 @@ static void qdma_free_queue_resources(struct dma_chan *chan) 
{

	struct qdma_queue *queue = to_qdma_queue(chan);

	struct qdma_device *qdev = queue->qdev;

	struct device *dev = qdev->dma_dev.dev;

	struct qdma_platdata *pdata;



	qdma_clear_queue_context(queue);

	vchan_free_chan_resources(&queue->vchan);

	dma_free_coherent(dev, queue->ring_size * QDMA_MM_DESC_SIZE,

	pdata = dev_get_platdata(&qdev->pdev->dev);

	dma_free_coherent(pdata->dma_dev, queue->ring_size * QDMA_MM_DESC_SIZE,

			  queue->desc_base, queue->dma_desc_base);

}
@@ -565,6 +557,7 @@ static int qdma_alloc_queue_resources(struct dma_chan *chan) 
	struct qdma_queue *queue = to_qdma_queue(chan);

	struct qdma_device *qdev = queue->qdev;

	struct qdma_ctxt_sw_desc desc;

	struct qdma_platdata *pdata;

	size_t size;

	int ret;
@@ -572,8 +565,9 @@ static int qdma_alloc_queue_resources(struct dma_chan *chan) 
	if (ret)

		return ret;



	pdata = dev_get_platdata(&qdev->pdev->dev);

	size = queue->ring_size * QDMA_MM_DESC_SIZE;

	queue->desc_base = dma_alloc_coherent(qdev->dma_dev.dev, size,

	queue->desc_base = dma_alloc_coherent(pdata->dma_dev, size,

					      &queue->dma_desc_base,

					      GFP_KERNEL);

	if (!queue->desc_base) {
@@ -588,7 +582,7 @@ static int qdma_alloc_queue_resources(struct dma_chan *chan) 
	if (ret) {

		qdma_err(qdev, "Failed to setup SW desc ctxt for %s",

			 chan->name);

		dma_free_coherent(qdev->dma_dev.dev, size, queue->desc_base,

		dma_free_coherent(pdata->dma_dev, size, queue->desc_base,

				  queue->dma_desc_base);

		return ret;

	}
@@ -948,8 +942,9 @@ static int qdma_init_error_irq(struct qdma_device *qdev) 


static int qdmam_alloc_qintr_rings(struct qdma_device *qdev)

{

	u32 ctxt[QDMA_CTXT_REGMAP_LEN];

	struct qdma_platdata *pdata = dev_get_platdata(&qdev->pdev->dev);

	struct device *dev = &qdev->pdev->dev;

	u32 ctxt[QDMA_CTXT_REGMAP_LEN];

	struct qdma_intr_ring *ring;

	struct qdma_ctxt_intr intr_ctxt;

	u32 vector;
@@ -969,7 +964,8 @@ static int qdmam_alloc_qintr_rings(struct qdma_device *qdev) 
		ring->msix_id = qdev->err_irq_idx + i + 1;

		ring->ridx = i;

		ring->color = 1;

		ring->base = dmam_alloc_coherent(dev, QDMA_INTR_RING_SIZE,

		ring->base = dmam_alloc_coherent(pdata->dma_dev,

						 QDMA_INTR_RING_SIZE,

						 &ring->dev_base, GFP_KERNEL);

		if (!ring->base) {

			qdma_err(qdev, "Failed to alloc intr ring %d", i);

include/linux/platform_data/amd_qdma.h

+2 −0
Original line number Diff line number Diff line
@@ -26,11 +26,13 @@ struct dma_slave_map; 
 * @max_mm_channels: Maximum number of MM DMA channels in each direction

 * @device_map: DMA slave map

 * @irq_index: The index of first IRQ

 * @dma_dev: The device pointer for dma operations

 */

struct qdma_platdata {

	u32			max_mm_channels;

	u32			irq_index;

	struct dma_slave_map	*device_map;

	struct device		*dma_dev;

};



#endif /* _PLATDATA_AMD_QDMA_H */