Commit ceaf5226 authored by Andy Duan's avatar Andy Duan Committed by Vinod Koul

dmaengine: imx-sdma: pass ->dev to dma_alloc_coherent() API

Pass ->dev to dma_alloc_coherent() API. We need this
because dma_alloc_coherent() makes use of dev parameter
and receiving NULL will result in a crash.
Signed-off-by: default avatarAndy Duan <fugang.duan@nxp.com>
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRobin Gong <yibin.gong@nxp.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 452fd6dc
...@@ -678,7 +678,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, ...@@ -678,7 +678,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
int ret; int ret;
unsigned long flags; unsigned long flags;
buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL); buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL);
if (!buf_virt) { if (!buf_virt) {
return -ENOMEM; return -ENOMEM;
} }
...@@ -697,7 +697,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, ...@@ -697,7 +697,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
spin_unlock_irqrestore(&sdma->channel_0_lock, flags); spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
dma_free_coherent(NULL, size, buf_virt, buf_phys); dma_free_coherent(sdma->dev, size, buf_virt, buf_phys);
return ret; return ret;
} }
...@@ -1189,7 +1189,7 @@ static int sdma_request_channel0(struct sdma_engine *sdma) ...@@ -1189,7 +1189,7 @@ static int sdma_request_channel0(struct sdma_engine *sdma)
{ {
int ret = -EBUSY; int ret = -EBUSY;
sdma->bd0 = dma_zalloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys, sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
GFP_NOWAIT); GFP_NOWAIT);
if (!sdma->bd0) { if (!sdma->bd0) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1212,8 +1212,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc) ...@@ -1212,8 +1212,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc)
u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
int ret = 0; int ret = 0;
desc->bd = dma_zalloc_coherent(NULL, bd_size, &desc->bd_phys, desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size,
GFP_NOWAIT); &desc->bd_phys, GFP_NOWAIT);
if (!desc->bd) { if (!desc->bd) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -1226,7 +1226,8 @@ static void sdma_free_bd(struct sdma_desc *desc) ...@@ -1226,7 +1226,8 @@ static void sdma_free_bd(struct sdma_desc *desc)
{ {
u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys); dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd,
desc->bd_phys);
} }
static void sdma_desc_free(struct virt_dma_desc *vd) static void sdma_desc_free(struct virt_dma_desc *vd)
...@@ -1849,7 +1850,7 @@ static int sdma_init(struct sdma_engine *sdma) ...@@ -1849,7 +1850,7 @@ static int sdma_init(struct sdma_engine *sdma)
/* Be sure SDMA has not started yet */ /* Be sure SDMA has not started yet */
writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
sdma->channel_control = dma_alloc_coherent(NULL, sdma->channel_control = dma_alloc_coherent(sdma->dev,
MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) + MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) +
sizeof(struct sdma_context_data), sizeof(struct sdma_context_data),
&ccb_phys, GFP_KERNEL); &ccb_phys, GFP_KERNEL);
......
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