* [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations
@ 2017-05-24 21:58 Logan Gunthorpe
2017-05-29 11:26 ` Linus Walleij
2017-05-30 9:57 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Logan Gunthorpe @ 2017-05-24 21:58 UTC (permalink / raw)
To: linux-kernel, dmaengine
Cc: Logan Gunthorpe, Stephen Bates, Dan Williams, Vinod Koul, Linus Walleij
Two dma engine drivers 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>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
drivers/dma/imx-dma.c | 7 ++-----
drivers/dma/ste_dma40.c | 5 +----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index ab0fb80..f681df8 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;
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index a6620b6..c3052fb 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.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations
2017-05-24 21:58 [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations Logan Gunthorpe
@ 2017-05-29 11:26 ` Linus Walleij
2017-05-30 9:57 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2017-05-29 11:26 UTC (permalink / raw)
To: Logan Gunthorpe, Per Förlin
Cc: linux-kernel, dmaengine, Stephen Bates, Dan Williams, Vinod Koul
On Wed, May 24, 2017 at 11:58 PM, Logan Gunthorpe <logang@deltatee.com> wrote:
> Two dma engine drivers 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>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
OMG I guess you know what you're doing, so:
Acked-by: Linus Walleij <linus.walleij@linaro.org>
I will shout if Ux500 breaks.
CC Per Förlin who wrote the code.
> drivers/dma/imx-dma.c | 7 ++-----
> drivers/dma/ste_dma40.c | 5 +----
> 2 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> index ab0fb80..f681df8 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;
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index a6620b6..c3052fb 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.1.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations
2017-05-24 21:58 [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations Logan Gunthorpe
2017-05-29 11:26 ` Linus Walleij
@ 2017-05-30 9:57 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2017-05-30 9:57 UTC (permalink / raw)
To: Logan Gunthorpe
Cc: linux-kernel, dmaengine, Stephen Bates, Dan Williams, Linus Walleij
On Wed, May 24, 2017 at 03:58:14PM -0600, Logan Gunthorpe wrote:
> Two dma engine drivers 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.
good catch, but can you please split these to per driver
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Signed-off-by: Stephen Bates <sbates@raithlin.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/dma/imx-dma.c | 7 ++-----
> drivers/dma/ste_dma40.c | 5 +----
> 2 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> index ab0fb80..f681df8 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;
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index a6620b6..c3052fb 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.1.4
>
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-30 9:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-24 21:58 [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations Logan Gunthorpe
2017-05-29 11:26 ` Linus Walleij
2017-05-30 9:57 ` 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.