From: Vinod Koul <vinod.koul@intel.com>
To: Logan Gunthorpe <logang@deltatee.com>
Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
Stephen Bates <sbates@raithlin.com>,
Dan Williams <dan.j.williams@intel.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations
Date: Tue, 30 May 2017 15:27:49 +0530 [thread overview]
Message-ID: <20170530095749.GP15061@localhost> (raw)
In-Reply-To: <1495663094-22031-1-git-send-email-logang@deltatee.com>
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
prev parent reply other threads:[~2017-05-30 9:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170530095749.GP15061@localhost \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=sbates@raithlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox