From patchwork Tue Jan 16 19:02:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 124762 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp1116803lje; Tue, 16 Jan 2018 11:07:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosYhijjk8smWX05+vdWh0/GNVqnN7rRkntmrtyCsYg7TpM4HGuMc2vc6SPvGQLzHlAkkBRj X-Received: by 10.84.240.69 with SMTP id h5mr5605778plt.418.1516129636728; Tue, 16 Jan 2018 11:07:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516129636; cv=none; d=google.com; s=arc-20160816; b=Rs29yHggGR4/vOlMyTxbOitIk77+3LDtnmmnwoLxs4dSSGVoDmGV11ALKaUR5rd5wI I/ZSuQJrw71I/OODeXhzWynjj2SK1qz5CYqOmmVUQllNnsuyWIq7C+pPTUMxYP4MpfNd zCVfKfmpqkUs3fTEWmCbzqy1ZWtX7ATnDNxCQH8ycgOeens2d72hIEwjq31OAI9mn33L gRi5UBLzFnFkJnsDZVDiRA9Ta9Qz4fNj7ycUwTmK+NIsFI2n9RbpaHq9s+97+PDAVj6T 7sRNl7neM2duet5HvwTZn+7GQrF4VoF5zyyKMXrqso++dDA/iIRO0zZSngdkWgeczNRw VSTQ== 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=Kke/Y1mJD1rWqSEyYOPWDo2QT7nwGLQKlbnsNfXl2T4=; b=1CwcTAmLdRMneD5aLvcPo51kYlxTQSBwTvt277AjRmCwrPKdi1RpmnIts4Wt7SHuq6 oLKecU5wOcBNiVOR43zg/iwSfcMkCEI/agRFhT4BhZ/svl7GE6Lp93IkDybH00IfKdHp IfTyWxY18GY8KbE+0MOM106C7JWPYNbIsLf5euNzDJsOnqd8qe1IGu5E2Y+oz5VM4Hu2 CL7nMW8tdKqM0gI9zFRCgzmIDkvdP5t52/2h3/97w1vyfhCh1RlNwqSbWW/v4r85L6b3 RUhwwYIRBLWBpE8U/0xiJjJCzC7qpEiWOTBfRZR4EVodWCq7DUxbMMz/3sEiPEwjNRkW wFhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iPb3yO4v; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 l59si2380971plb.743.2018.01.16.11.07.16; Tue, 16 Jan 2018 11:07:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=@linaro.org header.s=google header.b=iPb3yO4v; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbeAPTHE (ORCPT + 6 others); Tue, 16 Jan 2018 14:07:04 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:42531 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513AbeAPTHB (ORCPT ); Tue, 16 Jan 2018 14:07:01 -0500 Received: by mail-wr0-f193.google.com with SMTP id e41so16030180wre.9 for ; Tue, 16 Jan 2018 11:07:00 -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=9exoFLXv76/XOmvcUmeJ2Kd4ZNMMhHxQY5n6fYdw5GY=; b=iPb3yO4vDJ7YwvhFw5BI5XctIMnePHUlVigxhU6Eb8FSAtzkVT3sNtyijVz8hIuNq+ JSdxU7AAMlfCu+wQVCPofK2SNPSLHHCpLdvkI4hIm2mvy6zIA5AhCLVh5M96iBQ3env3 E3p1a+RJeRtzDOxGSoB4P9xlnKfaf/fVc/9rA= 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=9exoFLXv76/XOmvcUmeJ2Kd4ZNMMhHxQY5n6fYdw5GY=; b=XNG8BmVcKhIIAcsOP6gbToePMTMxkvOzMQSBDr4waZG+LQe+beNWm/iOkrK63Xxn6K UroThjcIWE4B95rjhd3l8oNFy/le94TcCiJfuj83/Ho8YZMDoQHUrBZgVcGDg94S0vjN yDXeXZFwucSDrcAThH1zsY9uZC4XG6y1bDDSPCPnc+AYs1Wd1/EnlRAfIiD19D4ezn2n X0JE9zr+DO2Z+prXwAxce5broUQJIPbvTmIZevn/JbC00mIEr6aM/10VBrpMkgKAtXtU w7P3F0gy90V9D9w8zNWdanH96tR91KyeM2gqHNnT5DAwUH+xJuFiK8Zr/OczfR5UinCI E6DQ== X-Gm-Message-State: AKwxytdQvyevSX48oUropd6qTl0WVrzc3AZ4TYDyhalUxIKyF4Dpga6P 1dDYzHGJIDVf088d3YXpjyeQig== X-Received: by 10.223.132.166 with SMTP id 35mr190354wrg.131.1516129620286; Tue, 16 Jan 2018 11:07:00 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id 198sm3257074wmo.21.2018.01.16.11.06.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jan 2018 11:06:59 -0800 (PST) From: srinivas.kandagatla@linaro.org To: Vinod Koul , Andy Gross , dmaengine@vger.kernel.org Cc: Rob Herring , Mark Rutland , David Brown , Dan Williams , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, yanhe@quicinc.com, ramkri@qti.qualcomm.com, sdharia@quicinc.com, Srinivas Kandagatla Subject: [PATCH 2/4] dmaengine: qcom: bam_dma: add num-channels binding for remotely controlled Date: Tue, 16 Jan 2018 19:02:34 +0000 Message-Id: <20180116190236.14558-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116190236.14558-1-srinivas.kandagatla@linaro.org> References: <20180116190236.14558-1-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Srinivas Kandagatla When Linux is master of BAM, it can directly read registers to know number of supported channels, however when its remotely controlled reading these registers would trigger a crash if the BAM is not yet intialized/powered up on the remote side. This patch adds num-channels binding to specify number of supported dma channels on remotely controlled BAM. Signed-off-by: Srinivas Kandagatla --- Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 2 ++ drivers/dma/qcom/bam_dma.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" 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/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt index 9cbf5d9df8fd..aa6822cbb230 100644 --- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt @@ -15,6 +15,8 @@ Required properties: the secure world. - qcom,controlled-remotely : optional, indicates that the bam is controlled by remote proccessor i.e. execution environment. +- num-channels : optional, indicates supported number of DMA channels in a + remotely controlled bam. Example: diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index 78e488e8f96d..523bd178047a 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -1083,8 +1083,10 @@ static int bam_init(struct bam_device *bdev) if (bdev->ee >= val) return -EINVAL; - val = readl_relaxed(bam_addr(bdev, 0, BAM_NUM_PIPES)); - bdev->num_channels = val & BAM_NUM_PIPES_MASK; + if (!bdev->num_channels) { + val = readl_relaxed(bam_addr(bdev, 0, BAM_NUM_PIPES)); + bdev->num_channels = val & BAM_NUM_PIPES_MASK; + } if (bdev->controlled_remotely) return 0; @@ -1179,6 +1181,13 @@ static int bam_dma_probe(struct platform_device *pdev) bdev->controlled_remotely = of_property_read_bool(pdev->dev.of_node, "qcom,controlled-remotely"); + if (bdev->controlled_remotely) { + ret = of_property_read_u32(pdev->dev.of_node, "num-channels", + &bdev->num_channels); + if (ret) + dev_err(bdev->dev, "num-channels unspecified in dt\n"); + } + bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk"); if (IS_ERR(bdev->bamclk)) { bdev->bamclk = NULL;