| Message ID | 1556027045-5269-4-git-send-email-yibin.gong@nxp.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | add ecspi ERR009165 for i.mx6/7 soc family | expand |
On 23-04-19, 13:50, Robin Gong wrote: > This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because Please fix this as well > in spi-imx case, burst length may be changed dynamically. So what is the solution to handle different burst lengths, pls explain... > > Signed-off-by: Robin Gong <yibin.gong@nxp.com> > --- > drivers/dma/imx-sdma.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 99d9f43..407a56e 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -377,7 +377,6 @@ struct sdma_channel { > unsigned long watermark_level; > u32 shp_addr, per_addr; > enum dma_status status; > - bool context_loaded; > struct imx_dma_data data; > struct work_struct terminate_worker; > }; > @@ -988,9 +987,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) > int ret; > unsigned long flags; > > - if (sdmac->context_loaded) > - return 0; > - > if (sdmac->direction == DMA_DEV_TO_MEM) > load_address = sdmac->pc_from_device; > else if (sdmac->direction == DMA_DEV_TO_DEV) > @@ -1033,8 +1029,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) > > spin_unlock_irqrestore(&sdma->channel_0_lock, flags); > > - sdmac->context_loaded = true; > - > return ret; > } > > @@ -1074,7 +1068,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) > sdmac->desc = NULL; > spin_unlock_irqrestore(&sdmac->vc.lock, flags); > vchan_dma_desc_free_list(&sdmac->vc, &head); > - sdmac->context_loaded = false; > } > > static int sdma_disable_channel_async(struct dma_chan *chan) > -- > 2.7.4 >
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 99d9f43..407a56e 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -377,7 +377,6 @@ struct sdma_channel { unsigned long watermark_level; u32 shp_addr, per_addr; enum dma_status status; - bool context_loaded; struct imx_dma_data data; struct work_struct terminate_worker; }; @@ -988,9 +987,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) int ret; unsigned long flags; - if (sdmac->context_loaded) - return 0; - if (sdmac->direction == DMA_DEV_TO_MEM) load_address = sdmac->pc_from_device; else if (sdmac->direction == DMA_DEV_TO_DEV) @@ -1033,8 +1029,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1074,7 +1068,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) sdmac->desc = NULL; spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_disable_channel_async(struct dma_chan *chan)
This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because in spi-imx case, burst length may be changed dynamically. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/dma/imx-sdma.c | 7 ------- 1 file changed, 7 deletions(-)