From patchwork Thu Feb 15 12:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 128414 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1691325ljc; Thu, 15 Feb 2018 04:28:04 -0800 (PST) X-Google-Smtp-Source: AH8x227CZc3XUqx+3R5l5/01RSHjzga/Z3pv3UB/txxR3ydxPZEGmR/h91CWisEamBTnG8bx5N4b X-Received: by 10.99.4.66 with SMTP id 63mr2076808pge.93.1518697684821; Thu, 15 Feb 2018 04:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518697684; cv=none; d=google.com; s=arc-20160816; b=N18pKxwP5qjx83Iuugo9oJ1ZE5SGyVeyGaeMPhBAwcUmPyl/8UuOcvyZ5uPZfbbHbW 1X7PiKFnwbPnpZQrGxepKw4acgI1MQSJ6JLtk5BDpWnnl+G6a3sR0/oz7/y8jA5gGl6I r0NF7ANKGCZblOLXi6qZfNqz9HrgGlITXA+qRZF0Qv9NUV8K4ay3a9okXgwMJLyBbitM k98apOa97tbGrve3N0yCRWHi/izdto0e8N3ivE/qplumIr/Xq5eL1+41N+AQappLSW92 CsX3P8QUcwBl9aqDA6GxLU9XwPJTCyGvEtk6BxyfwnXKbGdBSQat2yLPbgNPiVQwo8gq yA5g== 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=/a8km/m0m3VBvY1DlZ8IycBEr8Zc3ka6ZM616DymQVk=; b=XSIZDr461wrS/Q3QGgta9rtkRToY7CuPf/QjJeC4aKEe11cBBqHgIR87ogN1AV75Pe mvNJowL2KS/J2MEPQyyY3sk9lcoB4xH3g9PbnaKCsBbgAKGEY3tYmdlnVlrz9xCPStTF MNw+vTdDJuc1LowLgGKs6RDIW3hbEiv2h0Et4CKvJyz46sXREaZBQPCvbTOd6jCYzjHg HPSODkrQm1NlViPnGh4zyavqvBKqTJ45XjivQfPva3C3DEWzleKloq3b1/JsIxx5fumi Eqp9OBVbBGs5EBFjyEMbcp5sDxHeAshMpqz7CyyL6VLL4og05WwqxqPONVC5sjqevujs zxKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=N66z5S89; 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 k20-v6si1572473pll.606.2018.02.15.04.28.04; Thu, 15 Feb 2018 04:28:04 -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=N66z5S89; 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 S1031505AbeBOM2D (ORCPT + 6 others); Thu, 15 Feb 2018 07:28:03 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:42078 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031392AbeBOM1U (ORCPT ); Thu, 15 Feb 2018 07:27:20 -0500 Received: by mail-wr0-f195.google.com with SMTP id k9so3154393wre.9 for ; Thu, 15 Feb 2018 04:27:20 -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=A4QAN1jtmvpNinr3ldIbonLTuonbdZ/0Smk9V2tktiw=; b=N66z5S89N1LgbJmPl9hTD/VXWUAJq3NyxPgljnD4eR7GHytd5sSpvB/LKBzw95fqHx xRWLUv8+CChiKf0y1Cz9C1/oDzkVH63ZPadVcPMRmO0k0DZ+zOUMEExwPdBBbfJkkc/+ ZWwSwlFd7DjX6nw2e1nZTjBdU1KO2+9SNLegA= 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=A4QAN1jtmvpNinr3ldIbonLTuonbdZ/0Smk9V2tktiw=; b=nlDLacUk3c7eqTc4Me4eg5/gRNOQL5RF1Xu9M+vd+7Vh5GNScKQMFFoxAPeT2DOzoj 6o70gUEtBNSsfYof12wN3O5TAK9uC8GDha6lpyJQMNbV9ul93X5wSC9cUK4cydCcrXnI 8Yvzsed+WyauLwdlAvOnk/TrDkctwdj7VEgipfLxuzebj/Y18LsMszn7SslWR3WS0NSH hvsyyGr16QGim14+FNvdpASO9M5Scf0PZjc9/iJP4+DSwRW9bz1bEENQGJhLDrprbBw4 tfU7HrXg+fTO9ArjoQKnYxpja2QI2W2te0Fe+Xi1byQ4Ldp61M4WPnl5D3/P9D9j7KQt GGIA== X-Gm-Message-State: APf1xPA6FRMZrAqQWKi1e1AJGXuXgpIP5zHH8WPlgefSOF0ihSN31ItX nxnoESKSFXsWGp3UtJ32CCAZtg== X-Received: by 10.223.129.76 with SMTP id 70mr2246035wrm.255.1518697639641; Thu, 15 Feb 2018 04:27:19 -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 s9sm15632778wra.4.2018.02.15.04.27.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 04:27:19 -0800 (PST) From: srinivas.kandagatla@linaro.org To: vinod.koul@intel.com, andy.gross@linaro.org, dmaengine@vger.kernel.org Cc: robh+dt@kernel.org, mark.rutland@arm.com, david.brown@linaro.org, dan.j.williams@intel.com, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-soc@vger.kernel.org, yanhe@quicinc.com, ramkri@qti.qualcomm.com, sdharia@quicinc.com, Srinivas Kandagatla Subject: [PATCH v3 3/5] dmaengine: qcom: bam_dma: get num-channels and num-ees from dt Date: Thu, 15 Feb 2018 12:25:09 +0000 Message-Id: <20180215122511.13517-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180215122511.13517-1-srinivas.kandagatla@linaro.org> References: <20180215122511.13517-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 initialized or powered up on the remote side. This patch allows driver to read num-channels and num-ees from Device Tree for remotely controlled BAM. Signed-off-by: Srinivas Kandagatla --- drivers/dma/qcom/bam_dma.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 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/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index b79691fcc82d..139e9f5e47a9 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -393,6 +393,7 @@ struct bam_device { struct device_dma_parameters dma_parms; struct bam_chan *channels; u32 num_channels; + u32 num_ees; /* execution environment ID, from DT */ u32 ee; @@ -1128,15 +1129,19 @@ static int bam_init(struct bam_device *bdev) u32 val; /* read revision and configuration information */ - val = readl_relaxed(bam_addr(bdev, 0, BAM_REVISION)) >> NUM_EES_SHIFT; - val &= NUM_EES_MASK; + if (!bdev->num_ees) { + val = readl_relaxed(bam_addr(bdev, 0, BAM_REVISION)); + bdev->num_ees = (val >> NUM_EES_SHIFT) & NUM_EES_MASK; + } /* check that configured EE is within range */ - if (bdev->ee >= val) + if (bdev->ee >= bdev->num_ees) 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; @@ -1232,6 +1237,18 @@ 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"); + + ret = of_property_read_u32(pdev->dev.of_node, "qcom,num-ees", + &bdev->num_ees); + if (ret) + dev_err(bdev->dev, "num-ees unspecified in dt\n"); + } + bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk"); if (IS_ERR(bdev->bamclk)) { if (!bdev->controlled_remotely)