From patchwork Fri Jun 22 03:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 139565 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp362222lji; Thu, 21 Jun 2018 20:24:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL/JwhkqIryGCf3b4SvbmJA2bsk4SDji0B7ZcduOAA+IIDpVoMAqIblh1DQ7X77TcemRKKY X-Received: by 2002:a63:bd51:: with SMTP id d17-v6mr8249418pgp.42.1529637892788; Thu, 21 Jun 2018 20:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529637892; cv=none; d=google.com; s=arc-20160816; b=pHthFjqZgxelaSzOlRoKxeYVPeREIpdw8GSckmsttk1kMglkZ+dDaWFgZFlMhrckqh AInhZE7+hc5+RF4dy/ZkwTeOgr6F3lLJwkItumoGbtH1qs+df0M1i6ep0tWvDjNNmQ1o 4kwUbp5Kyvkp1CMiMZVznLrn+ZNTWXHMSH7cZ9fndl624hWDs+fCJa6q+szmSiUehxJC GXL91C7EAz4XTtY6MCpN+J2oeVHcNsXyMck3J/TCpDE6bfHBgxhHajMPtXFw+HFQ7WHh AXPrNTI07elgebzRsdmBdejf4Lgvnz0OQlfORHU/t0vfwfwqqlGFYzZCVIvjtFrYtsOh JX4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=+TGsoxWDLx0eUmV2mltgdZ45P5o8tIzkTFsYHg4OQtk=; b=AZLhuqO5dCLVlnTGrcamdp8Ctr8zyw3iGEu33eN11wjU5/BeylGJZEQ79/AC8j2sbv Dh2G55mCwL3GuxNb9gnr1+xcm3WQF8COWNPA2j8crjPTZC1V8lh8SxcXKAAF4KlQIXnZ TPbv1JGxQDcPbTuCDuotEUJ4nrTsAH9pPD0gjpYzYMSXEDsR3GzamWabCOUhsYXmo4i7 Fic0EOoLVnEVc6UHSbfN08APXasKjba1aWBWV46v5TbVERqVCiQ8Qx89oXp6g/wgxeou ElJfc/reK9QpIHrfpZnYvdOMevAIWanst+y7b8+sFjZoafbM7JAe45rIly5XUP2HS7XN S9cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=chNCEB6s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba7-v6si6405981plb.490.2018.06.21.20.24.52; Thu, 21 Jun 2018 20:24:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=chNCEB6s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934371AbeFVDYo (ORCPT + 30 others); Thu, 21 Jun 2018 23:24:44 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:41480 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934351AbeFVDYl (ORCPT ); Thu, 21 Jun 2018 23:24:41 -0400 Received: by mail-pl0-f65.google.com with SMTP id w8-v6so2746830ply.8 for ; Thu, 21 Jun 2018 20:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+TGsoxWDLx0eUmV2mltgdZ45P5o8tIzkTFsYHg4OQtk=; b=chNCEB6sm09PWStU9jTmEJfkARLnMmFnIs3LWB96Ywi5xtXH5QD1kZmuLICKkG/YUr 9JDMDEMkYhwGSrFr8hhXi8S45xfv4vl4beRKRE2kKx7cKATL8CPRPSnQumlicFK49Dbc xcbO7o3b0TP7xQU85XLQZcIswV33L6Z4izJSk= 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=+TGsoxWDLx0eUmV2mltgdZ45P5o8tIzkTFsYHg4OQtk=; b=bn22tSPjr50i3DyeDUFLNfe1tcxFAE9RwnMnp+V0fIO76Mn3kD2uF6P/LU26ojwF8T Dh39v96mud7Mg6nyy8qWqK6lQXe+Y1R8OFpBqi/YUyY81xmR9JOtqcHs8OvlNh4t1bUi Fp+xJD2v4F4KQMiKFIKvt8VwKqJzm/0RzZXEB+n0RubXQMTdG28CkoG37LWgN+b2ns1R YSLEijsQqYpOgQaWgTiqZXIy5CO8ppXxfYsgQnwOSuJ1cmU86VdmpiVZOZfxRk2t0HTc OnaWc58VYSlu8Dj3PWXT9EkXG3OzB5ulE8O2x4bzS4OFPtHbd6bM4s37fuGUSl0eY1M0 HYvw== X-Gm-Message-State: APt69E3mWseUESHO5mtAlAjIyIk6CJSucXgdplrnbinZMqNjfzKNxJDo plUazkv+ordoWeHce/Sfr9h3LA== X-Received: by 2002:a17:902:2983:: with SMTP id h3-v6mr31419435plb.232.1529637880909; Thu, 21 Jun 2018 20:24:40 -0700 (PDT) Received: from localhost.localdomain ([45.56.155.153]) by smtp.gmail.com with ESMTPSA id a23-v6sm9286253pfn.113.2018.06.21.20.24.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 20:24:40 -0700 (PDT) From: Guodong Xu To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, dan.j.williams@intel.com Cc: liyu65@hisilicon.com, suzhuangluan@hisilicon.com, xuhongtao8@hisilicon.com, zhongkaihua@huawei.com, xuezhiliang@hisilicon.com, xupeng7@huawei.com, sunliang10@huawei.com, fengbaopeng@hisilicon.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Guodong Xu Subject: [PATCH 2/3] k3dma: add support to reserved minimum channels Date: Fri, 22 Jun 2018 11:24:15 +0800 Message-Id: <20180622032416.20133-3-guodong.xu@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622032416.20133-1-guodong.xu@linaro.org> References: <20180622032416.20133-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Yu On k3 series of SoC, DMA controller reserves some channels for other on-chip coprocessors. By adding support to dma_min_chan, kernel will not be able to use these reserved channels. One example is on Hi3660 platform, channel 0 is reserved to lpm3. Please also refer to Documentation/devicetree/bindings/dma/k3dma.txt Signed-off-by: Li Yu Signed-off-by: Guodong Xu --- drivers/dma/k3dma.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index fa31cccbe04f..13cec12742e3 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -113,6 +113,7 @@ struct k3_dma_dev { struct dma_pool *pool; u32 dma_channels; u32 dma_requests; + u32 dma_min_chan; unsigned int irq; }; @@ -309,7 +310,7 @@ static void k3_dma_tasklet(unsigned long arg) /* check new channel request in d->chan_pending */ spin_lock_irq(&d->lock); - for (pch = 0; pch < d->dma_channels; pch++) { + for (pch = d->dma_min_chan; pch < d->dma_channels; pch++) { p = &d->phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -326,7 +327,7 @@ static void k3_dma_tasklet(unsigned long arg) } spin_unlock_irq(&d->lock); - for (pch = 0; pch < d->dma_channels; pch++) { + for (pch = d->dma_min_chan; pch < d->dma_channels; pch++) { if (pch_alloc & (1 << pch)) { p = &d->phy[pch]; c = p->vchan; @@ -825,6 +826,8 @@ static int k3_dma_probe(struct platform_device *op) "dma-channels", &d->dma_channels); of_property_read_u32((&op->dev)->of_node, "dma-requests", &d->dma_requests); + of_property_read_u32((&op->dev)->of_node, + "dma-min-chan", &d->dma_min_chan); } d->clk = devm_clk_get(&op->dev, NULL); @@ -848,12 +851,12 @@ static int k3_dma_probe(struct platform_device *op) return -ENOMEM; /* init phy channel */ - d->phy = devm_kcalloc(&op->dev, - d->dma_channels, sizeof(struct k3_dma_phy), GFP_KERNEL); + d->phy = devm_kcalloc(&op->dev, (d->dma_channels - d->dma_min_chan), + sizeof(struct k3_dma_phy), GFP_KERNEL); if (d->phy == NULL) return -ENOMEM; - for (i = 0; i < d->dma_channels; i++) { + for (i = d->dma_min_chan; i < d->dma_channels; i++) { struct k3_dma_phy *p = &d->phy[i]; p->idx = i;