From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751415AbdE3Jze (ORCPT ); Tue, 30 May 2017 05:55:34 -0400 Received: from mga14.intel.com ([192.55.52.115]:55033 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbdE3Jzc (ORCPT ); Tue, 30 May 2017 05:55:32 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,418,1491289200"; d="scan'208";a="267954756" Date: Tue, 30 May 2017 15:27:49 +0530 From: Vinod Koul To: Logan Gunthorpe Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Stephen Bates , Dan Williams , Linus Walleij Subject: Re: [PATCH] dmaengine: ste_dma40, imx-dma: Cleanup scatterlist layering violations Message-ID: <20170530095749.GP15061@localhost> References: <1495663094-22031-1-git-send-email-logang@deltatee.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1495663094-22031-1-git-send-email-logang@deltatee.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Stephen Bates > Cc: Dan Williams > Cc: Vinod Koul > Cc: Linus Walleij > --- > 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