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: 155734 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp901519jaa; Wed, 16 Jan 2019 09:10:51 -0800 (PST) X-Received: by 2002:a63:6486:: with SMTP id y128mr9844972pgb.18.1547658651687; Wed, 16 Jan 2019 09:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547658651; cv=none; d=google.com; s=arc-20160816; b=UuK/793/AsQKfbGtr9UxRq98WL+Ysb275AHfa/vmYg2Nna4PysXW61LF9VUADiTgEn pq84rFKM0PXLEwOl5/wqrWFPt7DiD3usxFZ+KJFLGUvQ5SgAWel/kxkUsVAG0e6a8zKb 1QFSI2W/C3m3TP9rly3xVhZtrDW+KP1tL1apwWcYUvHcH6+ydGZDRheCSI36RKM65oX+ 0UUlUL0NlA02Y1MhylSqaY0dguXpvaPW5pj3vyGENl5RJo9gwK+wz2TyuE3gozJwCiJ2 yxFCO+Jsd4SlN9Z58Iwezay1gTvRfUy1k/+F74WO20A2AUu+Xylb5UAxFdIsmkrt5aee pRNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DtHgU4ueai0Fc/l8/P+ZyuzlLrZL8W/NSq8eqAtoCSo=; b=sm+Im796D238+Lkg2aaK5lQ1N8/FmBMf8Luh73bFquryOFGW8SOalVpfX/5is3WqpI ADAZXSHN9iNIoP5KTkIVHgcLoDk09C3Rg/1lfdq+vkjgtSWSJgLUIZLbdu4a2bk+jajx E2C8KK6lcw6j3t5hI19FCdDtPL2Lv3WQz2OLGqVrhMKjHl6Al12q3oExlQ3kiGrKqJn5 m/KgLeTT3mtpjBtkdkPRjf7tPBk0GWrEu+m4htbsqi9QzvwgYHOVWbM1m5XykrpyBVmW 90HZjE+I77Wir5wOOa6bgynA8+DMD/NffFzLdeD0SgkG/qOVT3lmwbCz5En97/NLOAuX 3Idg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvFTI9So; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 75sor10183737pgc.15.2019.01.16.09.10.51 for (Google Transport Security); Wed, 16 Jan 2019 09:10:51 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvFTI9So; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=F+BjnkqQYSUNJrUp00FespAzx7EWkjsxiFzgFhJ3PPEkhRa2FyNZF4jlAfFAcvqYy2 Dc0TJegDpakGJqCYGCMINcZ9jD8x6BK8vr1IXLXPzwup29itviLwq5LqT1yNlWauRX07 Rqs3u0LKzKtEzqzltKWf5uQ6Yf11nYzBmFEqXDZsqoz3nQpAt2A7nOR1yKV8d9bcNbhg 7POjFZGvaynNB3XtFJW7AcSxOWiqw7JpXSzhQGEqEVaxOASnvbQeYywbc+UfbBArdL3h PR26ik2womY71ZbtzS0fsDPVx61AWK1bHv0Gn4rjbAL9SbqLbm6XIWJ1GRDBYXPHFErE giew== X-Gm-Message-State: AJcUukcYnSnU8tlVnK4Y6X4QyEbgqOqrhkVVFGd1URHSsYNRnvVHydJs KFJbhX+lMPoBUJqddt0c9cs0brW8 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) Return-Path: 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> 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(-) -- 2.7.4 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; }