dmaengine: dw-edma: Drop DT-region allocation

There is no point in allocating additional memory for the data target
regions passed to the client drivers. Use the already available structures
defined in the dw_edma_chip instance.

Note: these regions are unused in normal circumstances since they are
specific to the case of eDMA being embedded into the DW PCIe Endpoint and
having its CSRs accessible via an Endpoint BAR. This case is only known to
be implemented as a part of the Synopsys PCIe Endpoint IP prototype kit.

Link: https://lore.kernel.org/r/20230113171409.30470-21-Sergey.Semin@baikalelectronics.ru
Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/dw-edma/dw-edma-core.c b/drivers/dma/dw-edma/dw-edma-core.c
index 58808bec414805e794c8870428d07e188fe48035..040a88cfe070ec8270bd6152ce35578b461a3563 100644 (file)
--- a/drivers/dma/dw-edma/dw-edma-core.c
+++ b/drivers/dma/dw-edma/dw-edma-core.c
@@ -738,7 +738,6 @@ static void dw_edma_free_chan_resources(struct dma_chan *dchan)
 static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc)
 {
        struct dw_edma_chip *chip = dw->chip;
-       struct dw_edma_region *dt_region;
        struct device *dev = chip->dev;
        struct dw_edma_chan *chan;
        struct dw_edma_irq *irq;
@@ -754,12 +753,6 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc)
        for (i = 0; i < ch_cnt; i++) {
                chan = &dw->chan[i];
 
-               dt_region = devm_kzalloc(dev, sizeof(*dt_region), GFP_KERNEL);
-               if (!dt_region)
-                       return -ENOMEM;
-
-               chan->vc.chan.private = dt_region;
-
                chan->dw = dw;
 
                if (i < dw->wr_ch_cnt) {
@@ -807,17 +800,11 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc)
                         chan->msi.data);
 
                chan->vc.desc_free = vchan_free_desc;
-               vchan_init(&chan->vc, dma);
+               chan->vc.chan.private = chan->dir == EDMA_DIR_WRITE ?
+                                       &dw->chip->dt_region_wr[chan->id] :
+                                       &dw->chip->dt_region_rd[chan->id];
 
-               if (chan->dir == EDMA_DIR_WRITE) {
-                       dt_region->paddr = chip->dt_region_wr[chan->id].paddr;
-                       dt_region->vaddr = chip->dt_region_wr[chan->id].vaddr;
-                       dt_region->sz = chip->dt_region_wr[chan->id].sz;
-               } else {
-                       dt_region->paddr = chip->dt_region_rd[chan->id].paddr;
-                       dt_region->vaddr = chip->dt_region_rd[chan->id].vaddr;
-                       dt_region->sz = chip->dt_region_rd[chan->id].sz;
-               }
+               vchan_init(&chan->vc, dma);
 
                dw_edma_v0_core_device_config(chan);
        }