| Message ID | 1597161231-32303-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 Tue, Aug 11, 2020 at 11:53:42PM +0800, Robin Gong wrote: > This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because > in spi-imx case, burst length may be changed dynamically. > > Signed-off-by: Robin Gong <yibin.gong@nxp.com> > Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Hi Robin, thanks for the pointer to this patch. As you suggested I've tested the two patches on my custom i.MX6DL board. Therefore please feel free to add: Tested-by: Richard Leitner <richard.leitner@skidata.com> regards;rl > --- > drivers/dma/imx-sdma.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 270992c..d305b80 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; > }; > @@ -984,9 +983,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) > @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) > > spin_unlock_irqrestore(&sdma->channel_0_lock, flags); > > - sdmac->context_loaded = true; > - > return ret; > } > > @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) > vchan_get_all_descriptors(&sdmac->vc, &head); > spin_unlock_irqrestore(&sdmac->vc.lock, flags); > vchan_dma_desc_free_list(&sdmac->vc, &head); > - sdmac->context_loaded = false; > } > > static int sdma_terminate_all(struct dma_chan *chan) > @@ -1337,7 +1330,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) > > sdmac->event_id0 = 0; > sdmac->event_id1 = 0; > - sdmac->context_loaded = false; > > sdma_set_channel_priority(sdmac, 0); > > -- > 2.7.4 > >
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 270992c..d305b80 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; }; @@ -984,9 +983,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) @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) vchan_get_all_descriptors(&sdmac->vc, &head); spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_terminate_all(struct dma_chan *chan) @@ -1337,7 +1330,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) sdmac->event_id0 = 0; sdmac->event_id1 = 0; - sdmac->context_loaded = false; sdma_set_channel_priority(sdmac, 0);