From patchwork Mon Jan 23 17:24:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 92256 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1328698qgi; Mon, 23 Jan 2017 09:25:11 -0800 (PST) X-Received: by 10.84.196.164 with SMTP id l33mr41595717pld.158.1485192311525; Mon, 23 Jan 2017 09:25:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u20si16248948plj.268.2017.01.23.09.25.11; Mon, 23 Jan 2017 09:25:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750981AbdAWRZH (ORCPT + 4 others); Mon, 23 Jan 2017 12:25:07 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:37677 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751289AbdAWRZG (ORCPT ); Mon, 23 Jan 2017 12:25:06 -0500 Received: by mail-wm0-f41.google.com with SMTP id c206so167020628wme.0 for ; Mon, 23 Jan 2017 09:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IKWpQtpyzwNjTCAUbHxdb2LHN9gcWGP4u7aRPIa2Rz8=; b=OySeA8UdCqxUnJ25bHppUR8E4LwhAARMDbIuUmARQ7nbE+pUtfiMNRJ1sYxsWpiEeL 4ttOzmB1dDr1nKD/qWAWxlpUhsYRnt0MHxxXzHc1hYDjvc/mvICziXqfqTGGBTpymUA8 IlPXgIZJWuwaFgIzLSllanum2S9zOBnAR6f+qrTW+JhNSMRiGdZnE12FjPbnioLkbePy gBctG5hzZLkOrXE46jYNYS96di39bX9JuUCXasOp8s6kArC0ynHF18OBMeRS3TShhw4g +5E1ILUQO/TvbFAIb1bySarTPDueXNDYTT8uF/PIuBKe9TLhsMTJIeg1B+a2qijaCjwK zYaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IKWpQtpyzwNjTCAUbHxdb2LHN9gcWGP4u7aRPIa2Rz8=; b=N9+lDSKcDzg5SeAJuhTKBcMb0CNtO4a95YTzgeaGt9+2b+rxvgDeulA+kDLFiTe24s m52nYdBYSAN2BVaFIDkt05wiP4spdjqaJM4HE4pxjhqHfWhV35WqDkiJsEFJvK22NN4F PWKQUUKKOepYyf2uNQJTu3SQukZUaHZb0N3xYHAPcGBqMvFVheMLYJlAEKPIGH8wAdA/ Id2Q+2XTHMjMYFNrjYFnOzxc8AsXqXpgH2yvUJGPnR+evId75WXVwo/Pw9KuhE/DvVs+ n6ccnLqTQZYEnQ4ECoypePdKT/yDTjhLvpNr2ioNkhJHIneSTfyxeBXZCh0Y5T/RQu6o 9dMA== X-Gm-Message-State: AIkVDXLgqx8Q2wQUbIrsfAkKRIxJfECoz+mr9/4OUn8Zgg6z+QTkfFvd3Ryjsn1AB50PB4kK X-Received: by 10.28.217.136 with SMTP id q130mr13242261wmg.13.1485192304847; Mon, 23 Jan 2017 09:25:04 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g71sm11328119wmc.9.2017.01.23.09.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 09:25:04 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, Alexandre Bailon Subject: [PATCH v4 4/5] dmaengine: cppi41: init_sched(): Get number of channels from DT Date: Mon, 23 Jan 2017 18:24:51 +0100 Message-Id: <20170123172453.30224-5-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170123172453.30224-1-abailon@baylibre.com> References: <20170123172453.30224-1-abailon@baylibre.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Despite the driver is already using DT to get the number of channels, init_sched() is using an hardcoded value to get it. Use DT to get the number of channels. Signed-off-by: Alexandre Bailon --- drivers/dma/cppi41.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 5a40653..288205e 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -139,6 +139,8 @@ struct cppi41_dd { struct chan_queues td_queue; u16 first_completion_queue; u16 qmgr_num_pend; + u32 n_chans; + u8 platform; struct list_head pending; /* Pending queued transfers */ spinlock_t lock; /* Lock for pending list */ @@ -720,13 +722,8 @@ static int cppi41_add_chans(struct device *dev, struct cppi41_dd *cdd) { struct cppi41_channel *cchan; int i; - int ret; - u32 n_chans; + u32 n_chans = cdd->n_chans; - ret = of_property_read_u32(dev->of_node, "#dma-channels", - &n_chans); - if (ret) - return ret; /* * The channels can only be used as TX or as RX. So we add twice * that much dma channels because USB can only do RX or TX. @@ -840,7 +837,7 @@ static void init_sched(struct cppi41_dd *cdd) word = 0; cppi_writel(0, cdd->sched_mem + DMA_SCHED_CTRL); - for (ch = 0; ch < 15 * 2; ch += 2) { + for (ch = 0; ch < cdd->n_chans; ch += 2) { reg = SCHED_ENTRY0_CHAN(ch); reg |= SCHED_ENTRY1_CHAN(ch) | SCHED_ENTRY1_IS_RX; @@ -850,7 +847,7 @@ static void init_sched(struct cppi41_dd *cdd) cppi_writel(reg, cdd->sched_mem + DMA_SCHED_WORD(word)); word++; } - reg = 15 * 2 * 2 - 1; + reg = cdd->n_chans * 2 - 1; reg |= DMA_SCHED_CTRL_EN; cppi_writel(reg, cdd->sched_mem + DMA_SCHED_CTRL); } @@ -875,6 +872,7 @@ static int init_cppi41(struct device *dev, struct cppi41_dd *cdd) cppi_writel(cdd->td_queue.submit, cdd->ctrl_mem + DMA_TDFDQ); init_sched(cdd); + return 0; err_td: deinit_cppi41(dev, cdd); @@ -1036,6 +1034,11 @@ static int cppi41_dma_probe(struct platform_device *pdev) cdd->qmgr_num_pend = glue_info->qmgr_num_pend; cdd->first_completion_queue = glue_info->first_completion_queue; + ret = of_property_read_u32(dev->of_node, + "#dma-channels", &cdd->n_chans); + if (ret) + goto err_get_n_chans; + ret = init_cppi41(dev, cdd); if (ret) goto err_init_cppi; @@ -1078,6 +1081,7 @@ static int cppi41_dma_probe(struct platform_device *pdev) deinit_cppi41(dev, cdd); err_init_cppi: pm_runtime_dont_use_autosuspend(dev); +err_get_n_chans: err_get_sync: pm_runtime_put_sync(dev); pm_runtime_disable(dev);