* [PATCH v2 1/2] dmaengine: imx-dma: cleanup scatterlist layering violations
@ 2017-05-30 22:39 Logan Gunthorpe
2017-05-30 22:39 ` [PATCH v2 2/2] dmaengine: ste_dma40: Cleanup " Logan Gunthorpe
2017-06-01 16:39 ` [PATCH v2 1/2] dmaengine: imx-dma: cleanup " Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Logan Gunthorpe @ 2017-05-30 22:39 UTC (permalink / raw)
To: linux-kernel, dmaengine
Cc: Linus Walleij, Logan Gunthorpe, Stephen Bates, Dan Williams,
Vinod Koul, Per Förlin
This dma engine driver directly accesses page_link assuming knowledge
that should be contained only in scatterlist.h.
We replace these with calls to sg_chain and sg_assign_page.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Stephen Bates <sbates@raithlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Per Förlin <per.forlin@axis.com>
---
v2: Splits the patch into two: one per driver
drivers/dma/imx-dma.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index ab0fb804fb1e..f681df8f0ed3 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -888,7 +888,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(
sg_init_table(imxdmac->sg_list, periods);
for (i = 0; i < periods; i++) {
- imxdmac->sg_list[i].page_link = 0;
+ sg_assign_page(&imxdmac->sg_list[i], NULL);
imxdmac->sg_list[i].offset = 0;
imxdmac->sg_list[i].dma_address = dma_addr;
sg_dma_len(&imxdmac->sg_list[i]) = period_len;
@@ -896,10 +896,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(
}
/* close the loop */
- imxdmac->sg_list[periods].offset = 0;
- sg_dma_len(&imxdmac->sg_list[periods]) = 0;
- imxdmac->sg_list[periods].page_link =
- ((unsigned long)imxdmac->sg_list | 0x01) & ~0x02;
+ sg_chain(imxdmac->sg_list, periods + 1, imxdmac->sg_list);
desc->type = IMXDMA_DESC_CYCLIC;
desc->sg = imxdmac->sg_list;
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] dmaengine: ste_dma40: Cleanup scatterlist layering violations
2017-05-30 22:39 [PATCH v2 1/2] dmaengine: imx-dma: cleanup scatterlist layering violations Logan Gunthorpe
@ 2017-05-30 22:39 ` Logan Gunthorpe
2017-06-01 16:39 ` [PATCH v2 1/2] dmaengine: imx-dma: cleanup " Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Logan Gunthorpe @ 2017-05-30 22:39 UTC (permalink / raw)
To: linux-kernel, dmaengine
Cc: Linus Walleij, Logan Gunthorpe, Stephen Bates, Dan Williams,
Vinod Koul, Per Förlin
This dma engine driver directly accesses page_link assuming knowledge
that should be contained only in scatterlist.h.
We replace this access with a call to sg_chain which is equivalent.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Stephen Bates <sbates@raithlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Per Förlin <per.forlin@axis.com>
---
v2: Splits the patch into two: one per driver
drivers/dma/ste_dma40.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index a6620b671d1d..c3052fbfd092 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2528,10 +2528,7 @@ dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
dma_addr += period_len;
}
- sg[periods].offset = 0;
- sg_dma_len(&sg[periods]) = 0;
- sg[periods].page_link =
- ((unsigned long)sg | 0x01) & ~0x02;
+ sg_chain(sg, periods + 1, sg);
txd = d40_prep_sg(chan, sg, sg, periods, direction,
DMA_PREP_INTERRUPT);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/2] dmaengine: imx-dma: cleanup scatterlist layering violations
2017-05-30 22:39 [PATCH v2 1/2] dmaengine: imx-dma: cleanup scatterlist layering violations Logan Gunthorpe
2017-05-30 22:39 ` [PATCH v2 2/2] dmaengine: ste_dma40: Cleanup " Logan Gunthorpe
@ 2017-06-01 16:39 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2017-06-01 16:39 UTC (permalink / raw)
To: Logan Gunthorpe
Cc: linux-kernel, dmaengine, Linus Walleij, Stephen Bates,
Dan Williams, Per Förlin
On Tue, May 30, 2017 at 04:39:16PM -0600, Logan Gunthorpe wrote:
> This dma engine driver directly accesses page_link assuming knowledge
> that should be contained only in scatterlist.h.
>
> We replace these with calls to sg_chain and sg_assign_page.
Applied both, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-01 16:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-30 22:39 [PATCH v2 1/2] dmaengine: imx-dma: cleanup scatterlist layering violations Logan Gunthorpe
2017-05-30 22:39 ` [PATCH v2 2/2] dmaengine: ste_dma40: Cleanup " Logan Gunthorpe
2017-06-01 16:39 ` [PATCH v2 1/2] dmaengine: imx-dma: cleanup " Vinod Koul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.