From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752650AbcFGF1l (ORCPT ); Tue, 7 Jun 2016 01:27:41 -0400 Received: from mga01.intel.com ([192.55.52.88]:33376 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750795AbcFGF1j (ORCPT ); Tue, 7 Jun 2016 01:27:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,431,1459839600"; d="scan'208";a="117303071" Date: Tue, 7 Jun 2016 11:04:06 +0530 From: Vinod Koul To: Kedareswara rao Appana Cc: dan.j.williams@intel.com, ramon.fried@tandemg.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Kedareswara rao Appana Subject: Re: [PATCH] dmaengine: dmatest: Add support for scatter-gather DMA mode Message-ID: <20160607053406.GE16910@localhost> References: <1461574085-18036-1-git-send-email-appanad@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1461574085-18036-1-git-send-email-appanad@xilinx.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 Mon, Apr 25, 2016 at 02:18:05PM +0530, Kedareswara rao Appana wrote: > This patch updates the dmatest client to support > scatter-gather dma mode. > > Signed-off-by: Kedareswara rao Appana > --- > drivers/dma/dmatest.c | 38 ++++++++++++++++++++++++++++++++++++-- > 1 file changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c > index b8576fd..6f259d8 100644 > --- a/drivers/dma/dmatest.c > +++ b/drivers/dma/dmatest.c > @@ -51,6 +51,14 @@ module_param(iterations, uint, S_IRUGO | S_IWUSR); > MODULE_PARM_DESC(iterations, > "Iterations before stopping test (default: infinite)"); > > +static unsigned int sg_sources = 1; > +module_param(sg_sources, uint, S_IRUGO | S_IWUSR); > +MODULE_PARM_DESC(sg_sources, sg_buffers rather? > + "Number of scatter gather buffers (default: 1)"); blank line please > +static unsigned int dmatest = 1; > +module_param(dmatest, uint, S_IRUGO | S_IWUSR); > +MODULE_PARM_DESC(dmatest, > + "dmatest 0-memcpy 1-slave_sg (default: 1)"); dmatest? What does this mean! > static unsigned int xor_sources = 3; > module_param(xor_sources, uint, S_IRUGO | S_IWUSR); > MODULE_PARM_DESC(xor_sources, > @@ -431,6 +439,8 @@ static int dmatest_func(void *data) > dev = chan->device; > if (thread->type == DMA_MEMCPY) > src_cnt = dst_cnt = 1; > + else if (thread->type == DMA_SG) > + src_cnt = dst_cnt = sg_sources; > else if (thread->type == DMA_XOR) { > /* force odd to ensure dst = src */ > src_cnt = min_odd(params->xor_sources | 1, dev->max_xor); > @@ -485,6 +495,8 @@ static int dmatest_func(void *data) > dma_addr_t *dsts; > unsigned int src_off, dst_off, len; > u8 align = 0; > + struct scatterlist tx_sg[src_cnt]; > + struct scatterlist rx_sg[src_cnt]; > > total_tests++; > > @@ -577,10 +589,21 @@ static int dmatest_func(void *data) > um->bidi_cnt++; > } > > + sg_init_table(tx_sg, src_cnt); > + sg_init_table(rx_sg, dst_cnt); why dst_cnt here wheras you used src_cnt to create the list! > + for (i = 0; i < src_cnt; i++) { > + sg_dma_address(&rx_sg[i]) = srcs[i]; > + sg_dma_address(&tx_sg[i]) = dsts[i] + dst_off; > + sg_dma_len(&tx_sg[i]) = len; > + sg_dma_len(&rx_sg[i]) = len; > + } > if (thread->type == DMA_MEMCPY) > tx = dev->device_prep_dma_memcpy(chan, > dsts[0] + dst_off, > srcs[0], len, flags); > + else if (thread->type == DMA_SG) > + tx = dev->device_prep_dma_sg(chan, tx_sg, > + dst_cnt, rx_sg, src_cnt, flags); again dst_cnt > else if (thread->type == DMA_XOR) > tx = dev->device_prep_dma_xor(chan, > dsts[0] + dst_off, > @@ -748,6 +771,8 @@ static int dmatest_add_threads(struct dmatest_info *info, > > if (type == DMA_MEMCPY) > op = "copy"; > + else if (type == DMA_SG) > + op = "sg"; > else if (type == DMA_XOR) > op = "xor"; > else if (type == DMA_PQ) > @@ -802,8 +827,16 @@ static int dmatest_add_channel(struct dmatest_info *info, > INIT_LIST_HEAD(&dtc->threads); > > if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) { > - cnt = dmatest_add_threads(info, dtc, DMA_MEMCPY); > - thread_count += cnt > 0 ? cnt : 0; > + if (dmatest == 0) { > + cnt = dmatest_add_threads(info, dtc, DMA_MEMCPY); > + thread_count += cnt > 0 ? cnt : 0; > + } > + } blank line -- ~Vinod