From patchwork Wed Jan 16 17:10:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10766449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3952746 for ; Wed, 16 Jan 2019 17:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B2782F1ED for ; Wed, 16 Jan 2019 17:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9969B2F260; Wed, 16 Jan 2019 17:11:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5522F264 for ; Wed, 16 Jan 2019 17:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405798AbfAPRLN (ORCPT ); Wed, 16 Jan 2019 12:11:13 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37247 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405486AbfAPRKw (ORCPT ); Wed, 16 Jan 2019 12:10:52 -0500 Received: by mail-pg1-f195.google.com with SMTP id c25so3096007pgb.4 for ; Wed, 16 Jan 2019 09:10:51 -0800 (PST) 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=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=QvFTI9Sov4OjpoQNmN8XuMB6Qc8GaSkqLQW+gISNJvTIAnBPN82rZkr+wdjJV/bCL5 jxrPQwFaly2X0KEAA06y/qYYICNPyHWcZsBR3BjX1P2I9GrhYYxo2lUzkCP75vKRt4yy eyP3AVlhiIGL6g/kY5VRWVLzxTiMM/Tkb6MbA= 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=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=T2/SvaEuzHktBLuQolEup7/vfgOfK6qNxiXZUuG+WWVRvDSUkdqFt1yxLmxpalM4u6 U0I+pNXVde2iJOpt7itkzmVGFUsjrKo0YqD1y02Efffz0Rd974gsoUTQEymcRWMeP9ak JCCpLpojNVsvua24ghzzb4Y1dKExmPSpYNcdTbYlyxucBAN3egWqlgTSObWdyJ7z71fV BYeaCrOZ+/BYQbBYcYYMWl3TemOud2otgZDd+0PErRsQTJ4enKa/QFsNznPW2FNzYLFV KeD9adWZ2MySmlRZW4E9zgiTqpUMbaX2FWkEnj1wE1eh2dB++Nw7/bRLCZRCnFK1MwID eAqw== X-Gm-Message-State: AJcUuke2GyrPl39a221n6uTmhxdg00yzNM1pESXg2jvTzZtxwIJsrGTY HoVzwmgQdm5O0L030cxLoO/rVw== X-Google-Smtp-Source: ALg8bN4S7ttfBJzPlvyjL0k9V2t/idlYC93XsDxB2432OpFJUlF/tWYWMWKFi8QWac0fR6QhjF+sbw== X-Received: by 2002:a63:4948:: with SMTP id y8mr9820591pgk.32.1547658651293; Wed, 16 Jan 2019 09:10:51 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id h129sm17914023pfb.110.2019.01.16.09.10.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 09:10:50 -0800 (PST) From: John Stultz To: lkml Cc: Li Yu , Dan Williams , Vinod Koul , Tanglei Han , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , Guodong Xu , dmaengine@vger.kernel.org, John Stultz Subject: [PATCH 5/8 v4] dma: k3dma: Add support for dma-channel-mask Date: Wed, 16 Jan 2019 09:10:26 -0800 Message-Id: <1547658629-25378-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Li Yu Add dma-channel-mask as a property for k3dma, it defines available dma channels which a non-secure mode driver can use. One sample usage of this is in Hi3660 SoC. DMA channel 0 is reserved to lpm3, which is a coprocessor for power management. So as a result, any request in kernel (which runs on main processor and in non-secure mode) should start from at least channel 1. Cc: Dan Williams Cc: Vinod Koul Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Guodong Xu Cc: dmaengine@vger.kernel.org Signed-off-by: Li Yu [jstultz: Reworked to use a channel mask] Signed-off-by: John Stultz --- v3: Rename to hisi-dma-avail-chan v4: Rename to dma-channel-mask --- drivers/dma/k3dma.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index b2060bf..ed19b1f 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -111,6 +111,7 @@ struct k3_dma_dev { struct dma_pool *pool; u32 dma_channels; u32 dma_requests; + u32 dma_channel_mask; unsigned int irq; }; @@ -318,6 +319,9 @@ 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++) { + if (!(d->dma_channel_mask & (1<phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -335,6 +339,9 @@ static void k3_dma_tasklet(unsigned long arg) spin_unlock_irq(&d->lock); for (pch = 0; pch < d->dma_channels; pch++) { + if (!(d->dma_channel_mask & (1<phy[pch]; c = p->vchan; @@ -855,6 +862,13 @@ 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); + ret = of_property_read_u32((&op->dev)->of_node, + "dma-channel-mask", &d->dma_channel_mask); + if (ret) { + dev_warn(&op->dev, + "dma-channel-mask doesn't exist, considering all as available.\n"); + d->dma_channel_mask = (u32)~0UL; + } } if (!(soc_data->flags & K3_FLAG_NOCLK)) { @@ -886,8 +900,12 @@ static int k3_dma_probe(struct platform_device *op) return -ENOMEM; for (i = 0; i < d->dma_channels; i++) { - struct k3_dma_phy *p = &d->phy[i]; + struct k3_dma_phy *p; + + if (!(d->dma_channel_mask & (1<phy[i]; p->idx = i; p->base = d->base + i * 0x40; }