{"id":809434,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809434/?format=json","project":{"id":19,"url":"http://patchwork.ozlabs.org/api/1.0/projects/19/?format=json","name":"Linux IMX development","link_name":"linux-imx","list_id":"linux-imx-kernel.lists.patchwork.ozlabs.org","list_email":"linux-imx-kernel@lists.patchwork.ozlabs.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170903224100.17893-6-stefan.bruens@rwth-aachen.de>","date":"2017-09-03T22:40:56","name":"[05/10] dmaengine: sun6i: Move number of pchans/vchans/request to device struct","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"64b105324a42c46b8906db1813a045c00cc60a8a","submitter":{"id":67055,"url":"http://patchwork.ozlabs.org/api/1.0/people/67055/?format=json","name":"Stefan Brüns","email":"stefan.bruens@rwth-aachen.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-imx/patch/20170903224100.17893-6-stefan.bruens@rwth-aachen.de/mbox/","series":[{"id":1284,"url":"http://patchwork.ozlabs.org/api/1.0/series/1284/?format=json","date":"2017-09-03T22:40:55","name":"dmaengine: sun6i: Fixes for H3/A83T, enable A64","version":1,"mbox":"http://patchwork.ozlabs.org/series/1284/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809434/checks/","tags":{},"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=\"ZwzVxsE7\"; 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 3xlp0W3R9Rz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 08:43:07 +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 1dodbb-0008Je-51; Sun, 03 Sep 2017 22:43:03 +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 1dodaF-0006wU-KW for linux-arm-kernel@lists.infradead.org;\n\tSun, 03 Sep 2017 22:41:45 +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 00:41:11 +0200","from pebbles.fritz.box (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 00:41:10 +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=ClogkSCgoMIZz90wyNZ6vSiBq6rNv0BdDyzmEf/RfWU=;\n\tb=ZwzVxsE7fGGisy\n\tqXy8NOIJjOrrfNyvj+X0wcxgB+d+vvm6BWWXR48xld7C0RGNQPqEoW/E9e77GWfIxyAHg3dhCLP3p\n\tcTEdyrI7G/1PiYdn4aAic7gWQZmoGgXxALiBE/IhYsCbmqn3Zb0BM3O4+4jcuTLE/rA7OO02z53yW\n\tfAlYZ8A3ThBbNX60UMR+AmGT4/t/tYyx3JYfdVd/P7cnKZdviEXxka/0OoOfir7gUueFvUTMDkkqr\n\tg3mHXzImaMCJVHpcUyG+iClYBjw2oqzaqo8kAACjLaee6YJq0K/vvmOFz1SB6IkAoEn5VqMzJNVzj\n\t0UMGlUtgYQ1rd2kE47Jw==;","X-IronPort-AV":"E=Sophos;i=\"5.41,472,1498514400\"; d=\"scan'208\";a=\"11604249\"","From":"=?utf-8?q?Stefan_Br=C3=BCns?= ","To":"","Subject":"[PATCH 05/10] dmaengine: sun6i: Move number of pchans/vchans/request\n\tto device struct","Date":"Mon, 4 Sep 2017 00:40:56 +0200","Message-ID":"<20170903224100.17893-6-stefan.bruens@rwth-aachen.de>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170903224100.17893-1-stefan.bruens@rwth-aachen.de>","References":"<20170903224100.17893-1-stefan.bruens@rwth-aachen.de>","MIME-Version":"1.0","X-Originating-IP":"[92.225.242.208]","X-ClientProxiedBy":"rwthex-w1-b.rwth-ad.de (2002:8682:1a9d::8682:1a9d) 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_154140_090250_5093B26D ","X-CRM114-Status":"GOOD ( 12.74 )","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\tAndre Przywara , linux-kernel@vger.kernel.org,\n\tCode Kipper , Chen-Yu Tsai ,\n\tRob Herring , dmaengine@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"},"content":"Preparatory patch: If the same compatible is used for different SoCs which\nhave a common register layout, but different number of channels, the\nchannel count can no longer be stored in the config. Store it in the\ndevice structure instead.\n\nSigned-off-by: Stefan Brüns \n---\n drivers/dma/sun6i-dma.c | 26 ++++++++++++++++----------\n 1 file changed, 16 insertions(+), 10 deletions(-)","diff":"diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c\nindex 335a8ec88b0b..c69dadb853d2 100644\n--- a/drivers/dma/sun6i-dma.c\n+++ b/drivers/dma/sun6i-dma.c\n@@ -187,6 +187,9 @@ struct sun6i_dma_dev {\n \tconst struct sun6i_dma_config *cfg;\n \tu32\t\t\tsrc_burst_lengths;\n \tu32\t\t\tdst_burst_lengths;\n+\tu32\t\t\tnum_pchans;\n+\tu32\t\t\tnum_vchans;\n+\tu32\t\t\tmax_request;\n };\n \n static struct device *chan2dev(struct dma_chan *chan)\n@@ -411,7 +414,6 @@ static int sun6i_dma_start_desc(struct sun6i_vchan *vchan)\n static void sun6i_dma_tasklet(unsigned long data)\n {\n \tstruct sun6i_dma_dev *sdev = (struct sun6i_dma_dev *)data;\n-\tconst struct sun6i_dma_config *cfg = sdev->cfg;\n \tstruct sun6i_vchan *vchan;\n \tstruct sun6i_pchan *pchan;\n \tunsigned int pchan_alloc = 0;\n@@ -439,7 +441,7 @@ static void sun6i_dma_tasklet(unsigned long data)\n \t}\n \n \tspin_lock_irq(&sdev->lock);\n-\tfor (pchan_idx = 0; pchan_idx < cfg->nr_max_channels; pchan_idx++) {\n+\tfor (pchan_idx = 0; pchan_idx < sdev->num_pchans; pchan_idx++) {\n \t\tpchan = &sdev->pchans[pchan_idx];\n \n \t\tif (pchan->vchan || list_empty(&sdev->pending))\n@@ -460,7 +462,7 @@ static void sun6i_dma_tasklet(unsigned long data)\n \t}\n \tspin_unlock_irq(&sdev->lock);\n \n-\tfor (pchan_idx = 0; pchan_idx < cfg->nr_max_channels; pchan_idx++) {\n+\tfor (pchan_idx = 0; pchan_idx < sdev->num_pchans; pchan_idx++) {\n \t\tif (!(pchan_alloc & BIT(pchan_idx)))\n \t\t\tcontinue;\n \n@@ -482,7 +484,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id)\n \tint i, j, ret = IRQ_NONE;\n \tu32 status;\n \n-\tfor (i = 0; i < sdev->cfg->nr_max_channels / DMA_IRQ_CHAN_NR; i++) {\n+\tfor (i = 0; i < sdev->num_pchans / DMA_IRQ_CHAN_NR; i++) {\n \t\tstatus = readl(sdev->base + DMA_IRQ_STAT(i));\n \t\tif (!status)\n \t\t\tcontinue;\n@@ -974,7 +976,7 @@ static struct dma_chan *sun6i_dma_of_xlate(struct of_phandle_args *dma_spec,\n \tstruct dma_chan *chan;\n \tu8 port = dma_spec->args[0];\n \n-\tif (port > sdev->cfg->nr_max_requests)\n+\tif (port > sdev->max_request)\n \t\treturn NULL;\n \n \tchan = dma_get_any_slave_channel(&sdev->slave);\n@@ -1007,7 +1009,7 @@ static inline void sun6i_dma_free(struct sun6i_dma_dev *sdev)\n {\n \tint i;\n \n-\tfor (i = 0; i < sdev->cfg->nr_max_vchans; i++) {\n+\tfor (i = 0; i < sdev->num_vchans; i++) {\n \t\tstruct sun6i_vchan *vchan = &sdev->vchans[i];\n \n \t\tlist_del(&vchan->vc.chan.device_node);\n@@ -1167,26 +1169,30 @@ static int sun6i_dma_probe(struct platform_device *pdev)\n \tsdc->slave.residue_granularity\t\t= DMA_RESIDUE_GRANULARITY_BURST;\n \tsdc->slave.dev = &pdev->dev;\n \n-\tsdc->pchans = devm_kcalloc(&pdev->dev, sdc->cfg->nr_max_channels,\n+\tsdc->num_pchans = sdc->cfg->nr_max_channels;\n+\tsdc->num_vchans = sdc->cfg->nr_max_vchans;\n+\tsdc->max_request = sdc->cfg->nr_max_requests;\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 \t\treturn -ENOMEM;\n \n-\tsdc->vchans = devm_kcalloc(&pdev->dev, sdc->cfg->nr_max_vchans,\n+\tsdc->vchans = devm_kcalloc(&pdev->dev, sdc->num_vchans,\n \t\t\t\t sizeof(struct sun6i_vchan), GFP_KERNEL);\n \tif (!sdc->vchans)\n \t\treturn -ENOMEM;\n \n \ttasklet_init(&sdc->task, sun6i_dma_tasklet, (unsigned long)sdc);\n \n-\tfor (i = 0; i < sdc->cfg->nr_max_channels; i++) {\n+\tfor (i = 0; i < sdc->num_pchans; i++) {\n \t\tstruct sun6i_pchan *pchan = &sdc->pchans[i];\n \n \t\tpchan->idx = i;\n \t\tpchan->base = sdc->base + 0x100 + i * 0x40;\n \t}\n \n-\tfor (i = 0; i < sdc->cfg->nr_max_vchans; i++) {\n+\tfor (i = 0; i < sdc->num_vchans; i++) {\n \t\tstruct sun6i_vchan *vchan = &sdc->vchans[i];\n \n \t\tINIT_LIST_HEAD(&vchan->node);\n","prefixes":["05/10"]}