From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EBE5C31E49 for ; Wed, 19 Jun 2019 08:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B83B206E0 for ; Wed, 19 Jun 2019 08:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731313AbfFSIQg (ORCPT ); Wed, 19 Jun 2019 04:16:36 -0400 Received: from shell.v3.sk ([90.176.6.54]:46808 "EHLO shell.v3.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731064AbfFSIQf (ORCPT ); Wed, 19 Jun 2019 04:16:35 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 4D0BACA051; Wed, 19 Jun 2019 10:16:32 +0200 (CEST) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 6FoiRkUxAFLs; Wed, 19 Jun 2019 10:16:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id AB0BBCA044; Wed, 19 Jun 2019 10:16:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id VuwPrubCZcNl; Wed, 19 Jun 2019 10:16:25 +0200 (CEST) Received: from belphegor (nat-pool-brq-t.redhat.com [213.175.37.10]) by zimbra.v3.sk (Postfix) with ESMTPSA id C4553CA01B; Wed, 19 Jun 2019 10:16:24 +0200 (CEST) Message-ID: Subject: Re: [PATCH v5 02/10] [media] marvell-ccic: fix DMA s/g desc number calculation From: Lubomir Rintel To: Jacopo Mondi Cc: Mauro Carvalho Chehab , Jonathan Corbet , linux-media@vger.kernel.org, Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, James Cameron , Pavel Machek , Libin Yang , Albert Wang , Sakari Ailus Date: Wed, 19 Jun 2019 10:16:23 +0200 In-Reply-To: <20190614094128.miryq2wfzoewjoyn@uno.localdomain> References: <20190505140031.9636-1-lkundrak@v3.sk> <20190505140031.9636-3-lkundrak@v3.sk> <20190614094128.miryq2wfzoewjoyn@uno.localdomain> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.2 (3.32.2-1.fc30) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2019-06-14 at 11:41 +0200, Jacopo Mondi wrote: > Hi Lubomir, > > On Sun, May 05, 2019 at 04:00:23PM +0200, Lubomir Rintel wrote: > > The commit d790b7eda953 ("[media] vb2-dma-sg: move dma_(un)map_sg here") > > left dma_desc_nent unset. It previously contained the number of DMA > > descriptors as returned from dma_map_sg(). > > > > We can now (since the commit referred to above) obtain the same value from > > the sg_table and drop dma_desc_nent altogether. > > > > Tested on OLPC XO-1.75 machine. Doesn't affect the OLPC XO-1's Cafe > > driver, since that one doesn't do DMA. > > > > Fixes: d790b7eda953df474f470169ebdf111c02fa7a2d > > Could you use the proper 'fixes' format here? > Fixes: d790b7eda953 ("[media] vb2-dma-sg: move dma_(un)map_sg here") > > > Signed-off-by: Lubomir Rintel > > --- > > drivers/media/platform/marvell-ccic/mcam-core.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c > > index f1b301810260a..d97f39bde9bd6 100644 > > --- a/drivers/media/platform/marvell-ccic/mcam-core.c > > +++ b/drivers/media/platform/marvell-ccic/mcam-core.c > > @@ -200,7 +200,6 @@ struct mcam_vb_buffer { > > struct list_head queue; > > struct mcam_dma_desc *dma_desc; /* Descriptor virtual address */ > > dma_addr_t dma_desc_pa; /* Descriptor physical address */ > > - int dma_desc_nent; /* Number of mapped descriptors */ > > }; > > > > static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_v4l2_buffer *vb) > > @@ -608,9 +607,11 @@ static void mcam_dma_contig_done(struct mcam_camera *cam, int frame) > > static void mcam_sg_next_buffer(struct mcam_camera *cam) > > { > > struct mcam_vb_buffer *buf; > > + struct sg_table *sg_table; > > > > buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue); > > list_del_init(&buf->queue); > > + sg_table = vb2_dma_sg_plane_desc(&buf->vb_buf.vb2_buf, 0); > > /* > > * Very Bad Not Good Things happen if you don't clear > > * C1_DESC_ENA before making any descriptor changes. > > @@ -618,7 +619,7 @@ static void mcam_sg_next_buffer(struct mcam_camera *cam) > > mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_ENA); > > mcam_reg_write(cam, REG_DMA_DESC_Y, buf->dma_desc_pa); > > mcam_reg_write(cam, REG_DESC_LEN_Y, > > - buf->dma_desc_nent*sizeof(struct mcam_dma_desc)); > > + sg_table->nents*sizeof(struct mcam_dma_desc)); > > Space betwen operators (it was there already, I know). > > Apart for that, patch seems fine to me: > Reviewed-by: Jacopo Mondi This has been already applied to media_tree.git, with the Fixes: tag corrected by Mauro Chehab. I suppose I can't make changes anymore and the space-between-operators things is not worth fixing up in a separate commit? > Thanks > j > > mcam_reg_write(cam, REG_DESC_LEN_U, 0); > > mcam_reg_write(cam, REG_DESC_LEN_V, 0); > > mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA); > > Thank you Lubo