[{"id":1762349,"web_url":"http://patchwork.ozlabs.org/comment/1762349/","msgid":"","list_archive_url":null,"date":"2017-09-03T23:44:54","subject":"Re: [PATCH 07/10] dmaengine: sun6i: Retrieve channel count/max\n\trequest from devicetree","submitter":{"id":61837,"url":"http://patchwork.ozlabs.org/api/people/61837/","name":"Andre Przywara","email":"andre.przywara@arm.com"},"content":"Hi,\n\nOn 03/09/17 23:40, Stefan Brüns wrote:\n> To avoid introduction of a new compatible for each small SoC/DMA controller\n> variation, move the definition of the channel count to the devicetree.\n> \n> The number of vchans is no longer explicit, but limited by the highest\n> port/DMA request number. The result is a slight overallocation for SoCs\n> with a sparse port mapping.\n> \n> Signed-off-by: Stefan Brüns \n> ---\n> drivers/dma/sun6i-dma.c | 35 ++++++++++++++++++++++++++++++++++-\n> 1 file changed, 34 insertions(+), 1 deletion(-)\n> \n> diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c\n> index c69dadb853d2..bd4c2e4a759b 100644\n> --- a/drivers/dma/sun6i-dma.c\n> +++ b/drivers/dma/sun6i-dma.c\n> @@ -42,6 +42,9 @@\n> \n> #define DMA_STAT\t\t0x30\n> \n> +/* Offset between DMA_IRQ_EN and DMA_IRQ_STAT limits number of channels */\n> +#define DMA_MAX_CHANNELS\t(DMA_IRQ_CHAN_NR * 0x10 / 4)\n> +\n> /*\n> * sun8i specific registers\n> */\n> @@ -65,7 +68,8 @@\n> #define DMA_CHAN_LLI_ADDR\t0x08\n> \n> #define DMA_CHAN_CUR_CFG\t0x0c\n> -#define DMA_CHAN_CFG_SRC_DRQ(x)\t\t((x) & 0x1f)\n> +#define DMA_CHAN_MAX_DRQ\t\t0x1f\n> +#define DMA_CHAN_CFG_SRC_DRQ(x)\t\t((x) & DMA_CHAN_MAX_DRQ)\n> #define DMA_CHAN_CFG_SRC_IO_MODE\tBIT(5)\n> #define DMA_CHAN_CFG_SRC_LINEAR_MODE\t(0 << 5)\n> #define DMA_CHAN_CFG_SRC_BURST_A31(x)\t(((x) & 0x3) << 7)\n> @@ -1173,6 +1177,35 @@ static int sun6i_dma_probe(struct platform_device *pdev)\n> \tsdc->num_vchans = sdc->cfg->nr_max_vchans;\n> \tsdc->max_request = sdc->cfg->nr_max_requests;\n> \n> +\tret = of_property_read_u32(np, \"dma-channels\", &sdc->num_pchans);\n> +\tif (ret && !sdc->num_pchans) {\n> +\t\tdev_err(&pdev->dev, \"Can't get dma-channels.\\n\");\n> +\t\treturn ret;\n> +\t}\n> +\n> +\tif (sdc->num_pchans > DMA_MAX_CHANNELS) {\n> +\t\tdev_err(&pdev->dev, \"Number of dma-channels out of range.\\n\");\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tret = of_property_read_u32(np, \"dma-requests\", &sdc->max_request);\n> +\tif (ret && !sdc->max_request) {\n> +\t\tdev_info(&pdev->dev, \"Missing dma-requests, using %u.\\n\",\n> +\t\t\t DMA_CHAN_MAX_DRQ);\n\nMmmh, is this mapping of \"!sdc->max_request\" -> DMA_CHAN_MAX_DRQ\nimplemented somewhere else? Or is it just missing here:\n\t\tsdc->max_request = DMA_CHAN_MAX_DRQ;\n\nOtherwise this is looking good, thanks for picking up the DT property\napproach!\n\nCheers,\nAndre.\n\n> +\t}\n> +\n> +\tif (sdc->max_request > DMA_CHAN_MAX_DRQ) {\n> +\t\tdev_err(&pdev->dev, \"Value of dma-requests out of range.\\n\");\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\t/*\n> +\t * If the number of vchans is not specified, derive it from the\n> +\t * highest port number, at most one channel per port and direction.\n> +\t */\n> +\tif (!sdc->num_vchans)\n> +\t\tsdc->num_vchans = 2 * (sdc->max_request + 1);\n> +\n> \tsdc->pchans = devm_kcalloc(&pdev->dev, sdc->num_pchans,\n> \t\t\t\t sizeof(struct sun6i_pchan), GFP_KERNEL);\n> \tif (!sdc->pchans)\n>","headers":{"Return-Path":"","X-Original-To":"incoming-imx@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-imx@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.infradead.org\n\t(client-ip=65.50.211.133; helo=bombadil.infradead.org;\n\tenvelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org\n\theader.b=\"GpSJPXoO\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xlqSl5mSDz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 09:49:06 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1doedO-00042b-PQ; Sun, 03 Sep 2017 23:48:58 +0000","from foss.arm.com ([217.140.101.70])\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1doedL-00040T-D7 for linux-arm-kernel@lists.infradead.org;\n\tSun, 03 Sep 2017 23:48:56 +0000","from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])\n\tby usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7EAE415A2;\n\tSun, 3 Sep 2017 16:48:34 -0700 (PDT)","from [192.168.3.22] (usa-sjc-mx-foss1.foss.arm.com\n\t[217.140.101.70])\n\tby usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n\t925303F58F; Sun, 3 Sep 2017 16:48:32 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:\n\tMessage-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description\n\t:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=BgCy2kMg+JdC2j83tIItOg6oUnaVt5scIDen5Ngtcjk=;\n\tb=GpSJPXoOpjoBRx\n\tMknfMl7aNST4WfuFvxkUcE0XqM7t63jSGqWu3/0z5LH9VoX4/e+g6yeWiDnZNWehj6zBvE73lHYdN\n\tqQisuHw4AWSqWrL72jNGZrqH8NMK7qGAA96KvbtswLrUvyCM0WpGCp6YaDwOHDvxvfVhtjIf/5GB5\n\t+UO4Vfdt4g1Omi3ZsSNNtKdvAJiArSm0TuxXFjUrZ3zfP7O9OsjeaLsjDjaocY+675BHyHV5MLmL1\n\t/bkwRYzqFw3PTkB5eIvROlUNUR39kaq5YtP3gOQcENaR5SCLv5hdjsZ63FhOelmFRtpd8LWSHiTol\n\tp1VS4/K5TNdSqnMUX8gQ==;","Subject":"Re: [PATCH 07/10] dmaengine: sun6i: Retrieve channel count/max\n\trequest from devicetree","To":"=?utf-8?q?Stefan_Br=C3=BCns?= ,\n\tlinux-sunxi@googlegroups.com","References":"<20170903224100.17893-1-stefan.bruens@rwth-aachen.de>\n\t<20170903224100.17893-8-stefan.bruens@rwth-aachen.de>","From":"=?utf-8?q?Andr=C3=A9_Przywara?= ","Organization":"ARM Ltd.","Message-ID":"","Date":"Mon, 4 Sep 2017 00:44:54 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101\n\tThunderbird/45.8.0","MIME-Version":"1.0","In-Reply-To":"<20170903224100.17893-8-stefan.bruens@rwth-aachen.de>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170903_164855_455902_37D1DA08 ","X-CRM114-Status":"GOOD ( 16.41 )","X-Spam-Score":"-6.9 (------)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-6.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/,\n\thigh trust [217.140.101.70 listed in list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-arm-kernel@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"devicetree@vger.kernel.org, Vinod Koul ,\n\tlinux-kernel@vger.kernel.org, Code Kipper ,\n\tChen-Yu Tsai , Rob Herring ,\n\tdmaengine@vger.kernel.org,\n\tMaxime Ripard , \n\tlinux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Sender":"\"linux-arm-kernel\" ","Errors-To":"linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org","List-Id":"linux-imx-kernel.lists.patchwork.ozlabs.org"}},{"id":1762353,"web_url":"http://patchwork.ozlabs.org/comment/1762353/","msgid":"<2286861.ip18xhFNEq@pebbles.site>","list_archive_url":null,"date":"2017-09-04T00:12:07","subject":"Re: [PATCH 07/10] dmaengine: sun6i: Retrieve channel count/max\n\trequest from devicetree","submitter":{"id":67055,"url":"http://patchwork.ozlabs.org/api/people/67055/","name":"Stefan Brüns","email":"stefan.bruens@rwth-aachen.de"},"content":"On Montag, 4. September 2017 01:44:54 CEST André Przywara wrote:\n> Hi,\n> \n> On 03/09/17 23:40, Stefan Brüns wrote:\n> > To avoid introduction of a new compatible for each small SoC/DMA\n> > controller\n> > variation, move the definition of the channel count to the devicetree.\n> > \n> > The number of vchans is no longer explicit, but limited by the highest\n> > port/DMA request number. The result is a slight overallocation for SoCs\n> > with a sparse port mapping.\n> > \n> > Signed-off-by: Stefan Brüns \n> > ---\n> > \n> > drivers/dma/sun6i-dma.c | 35 ++++++++++++++++++++++++++++++++++-\n> > 1 file changed, 34 insertions(+), 1 deletion(-)\n> > \n> > diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c\n> > index c69dadb853d2..bd4c2e4a759b 100644\n> > --- a/drivers/dma/sun6i-dma.c\n> > +++ b/drivers/dma/sun6i-dma.c\n> > @@ -42,6 +42,9 @@\n> > \n> > #define DMA_STAT\t\t0x30\n> > \n> > +/* Offset between DMA_IRQ_EN and DMA_IRQ_STAT limits number of channels\n> > */\n> > +#define DMA_MAX_CHANNELS\t(DMA_IRQ_CHAN_NR * 0x10 / 4)\n> > +\n> > \n> > /*\n> > \n> > * sun8i specific registers\n> > */\n> > \n> > @@ -65,7 +68,8 @@\n> > \n> > #define DMA_CHAN_LLI_ADDR\t0x08\n> > \n> > #define DMA_CHAN_CUR_CFG\t0x0c\n> > \n> > -#define DMA_CHAN_CFG_SRC_DRQ(x)\t\t((x) & 0x1f)\n> > +#define DMA_CHAN_MAX_DRQ\t\t0x1f\n> > +#define DMA_CHAN_CFG_SRC_DRQ(x)\t\t((x) & DMA_CHAN_MAX_DRQ)\n> > \n> > #define DMA_CHAN_CFG_SRC_IO_MODE\tBIT(5)\n> > #define DMA_CHAN_CFG_SRC_LINEAR_MODE\t(0 << 5)\n> > #define DMA_CHAN_CFG_SRC_BURST_A31(x)\t(((x) & 0x3) << 7)\n> > \n> > @@ -1173,6 +1177,35 @@ static int sun6i_dma_probe(struct platform_device\n> > *pdev)> \n> > \tsdc->num_vchans = sdc->cfg->nr_max_vchans;\n> > \tsdc->max_request = sdc->cfg->nr_max_requests;\n> > \n> > +\tret = of_property_read_u32(np, \"dma-channels\", &sdc->num_pchans);\n> > +\tif (ret && !sdc->num_pchans) {\n> > +\t\tdev_err(&pdev->dev, \"Can't get dma-channels.\\n\");\n> > +\t\treturn ret;\n> > +\t}\n> > +\n> > +\tif (sdc->num_pchans > DMA_MAX_CHANNELS) {\n> > +\t\tdev_err(&pdev->dev, \"Number of dma-channels out of range.\\n\");\n> > +\t\treturn -EINVAL;\n> > +\t}\n> > +\n> > +\tret = of_property_read_u32(np, \"dma-requests\", &sdc->max_request);\n> > +\tif (ret && !sdc->max_request) {\n> > +\t\tdev_info(&pdev->dev, \"Missing dma-requests, using %u.\\n\",\n> > +\t\t\t DMA_CHAN_MAX_DRQ);\n> \n> Mmmh, is this mapping of \"!sdc->max_request\" -> DMA_CHAN_MAX_DRQ\n> implemented somewhere else? Or is it just missing here:\n> \t\tsdc->max_request = DMA_CHAN_MAX_DRQ;\n\nWell spotted, that assignment is actually missing.\n\nWith this line added, your comment for patch 8/10 should also be addressed \n(regarding the default value).\n \n> Otherwise this is looking good, thanks for picking up the DT property\n> approach!\n> \n> Cheers,\n> Andre.\n> \n\nKind regards,\n\nStefan","headers":{"Return-Path":"","X-Original-To":"incoming-imx@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-imx@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.infradead.org\n\t(client-ip=65.50.211.133; helo=bombadil.infradead.org;\n\tenvelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org\n\theader.b=\"OixaBrCo\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xlqzv3YgZz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 10:12:43 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dof0I-00054b-OL; Mon, 04 Sep 2017 00:12:38 +0000","from mail-out-1.itc.rwth-aachen.de ([134.130.5.46])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dof0E-00051g-Ga for linux-arm-kernel@lists.infradead.org;\n\tMon, 04 Sep 2017 00:12:36 +0000","from rwthex-w2-b.rwth-ad.de ([134.130.26.159])\n\tby mail-in-1.itc.rwth-aachen.de with ESMTP; 04 Sep 2017 02:12:09 +0200","from pebbles.site (92.225.242.208) by rwthex-w2-b.rwth-ad.de\n\t(2002:8682:1a9f::8682:1a9f) with Microsoft SMTP Server (TLS) id\n\t15.0.1320.4; Mon, 4 Sep 2017 02:12:08 +0200"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=vbnTNc57HjzrciCEPhP/VN5aJGRPa+KlQJVt79K9eRE=;\n\tb=OixaBrCoCmfWJk\n\tOV2YT25eu/euRlFb5vFj9iG0Sync2cPqj1Q6D+2xDvvVhhnXaJBBKVrwarJgIIetIWhROTj02rd9F\n\temuFg7eopTJFqH36L6Kx6oVlrEiPVpbJirYuz7HOHm6bBRHP1nPPl5BLH8eEZg1y5aypJwPUDAsi/\n\tQOZKIeeZEXGSAmPwDTFIOcPRFi7ZNgoG8QdlkI6yhP6JmYWCnvOJaCSYZMO+qanjzZFN9mBRvqXCr\n\tcHXi86knEBJFSsReqGUvZv7XMurti2MQTLqvuhmOpOkOMmtqSn4ElMfRKlewPUlyq2UH+K+J2ZGEv\n\taI8J4whIGcXODdpnoU5Q==;","X-IronPort-AV":"E=Sophos;i=\"5.41,472,1498514400\"; d=\"scan'208\";a=\"11607973\"","From":"Stefan Bruens ","To":"=?iso-8859-1?q?Andr=E9?= Przywara ","Subject":"Re: [PATCH 07/10] dmaengine: sun6i: Retrieve channel count/max\n\trequest from devicetree","Date":"Mon, 4 Sep 2017 02:12:07 +0200","Message-ID":"<2286861.ip18xhFNEq@pebbles.site>","In-Reply-To":"","References":"<20170903224100.17893-1-stefan.bruens@rwth-aachen.de>\n\t<20170903224100.17893-8-stefan.bruens@rwth-aachen.de>\n\t","MIME-Version":"1.0","X-Originating-IP":"[92.225.242.208]","X-ClientProxiedBy":"rwthex-w1-a.rwth-ad.de (2002:8682:1a9c::8682:1a9c) To\n\trwthex-w2-b.rwth-ad.de (2002:8682:1a9f::8682:1a9f)","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170903_171234_852303_9DF138C5 ","X-CRM114-Status":"GOOD ( 14.21 )","X-Spam-Score":"-4.2 (----)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-4.2 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\n\tmedium trust [134.130.5.46 listed in list.dnswl.org]\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-arm-kernel@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"devicetree@vger.kernel.org, Vinod Koul ,\n\tlinux-kernel@vger.kernel.org, Code Kipper ,\n\tlinux-sunxi@googlegroups.com, Rob Herring ,\n\tdmaengine@vger.kernel.org,\n\tMaxime Ripard , \n\tChen-Yu Tsai , linux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Sender":"\"linux-arm-kernel\" ","Errors-To":"linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org","List-Id":"linux-imx-kernel.lists.patchwork.ozlabs.org"}}]