From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751002AbdE2L0R (ORCPT ); Mon, 29 May 2017 07:26:17 -0400 Received: from mail-it0-f47.google.com ([209.85.214.47]:35148 "EHLO mail-it0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbdE2L0P (ORCPT ); Mon, 29 May 2017 07:26:15 -0400 MIME-Version: 1.0 In-Reply-To: <1495663094-22031-1-git-send-email-logang@deltatee.com> References: <1495663094-22031-1-git-send-email-logang@deltatee.com> From: Linus Walleij Date: Mon, 29 May 2017 13:26:14 +0200 Message-ID: Subject: Re: [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations To: Logan Gunthorpe , =?UTF-8?Q?Per_F=C3=B6rlin?= Cc: "linux-kernel@vger.kernel.org" , dmaengine@vger.kernel.org, Stephen Bates , Dan Williams , Vinod Koul Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v4TBQLKQ003598 On Wed, May 24, 2017 at 11:58 PM, 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. > > Signed-off-by: Logan Gunthorpe > Signed-off-by: Stephen Bates > Cc: Dan Williams > Cc: Vinod Koul > Cc: Linus Walleij OMG I guess you know what you're doing, so: Acked-by: Linus Walleij 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 >