From patchwork Tue Apr 5 22:56:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 606783 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qfklw3mjDz9t57 for ; Wed, 6 Apr 2016 08:58:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=GgBl3gRN; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbcDEW5W (ORCPT ); Tue, 5 Apr 2016 18:57:22 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:34343 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760060AbcDEW5T (ORCPT ); Tue, 5 Apr 2016 18:57:19 -0400 Received: by mail-wm0-f43.google.com with SMTP id l6so42114844wml.1 for ; Tue, 05 Apr 2016 15:57:14 -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=IB6rO8KVd1ql67SrqpADNlO4Er9OXJhKG3E/Nqqwlpk=; b=GgBl3gRNqdFIV1ZXxdI+x91hncO+eF0otQZdimL+p+XliGDbi+tZaO47bTJZ8FwaX9 UWPLEKtUaBJzaTHTnJebuc2sCBVBDwCqprGFFPPDQ9KhgDvG4mwIjQnKiwoKmmJ2ATEq Oz1a/+MV/V+TnrR0oGNSies5NmO6dGA+wt174= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IB6rO8KVd1ql67SrqpADNlO4Er9OXJhKG3E/Nqqwlpk=; b=Tt9vge05k52b+za4Jokx6SnhyV6SbItz3PJD3+921sXUTUk2J9m67RUS5v2KJ4Gjyj tEVen3KrQwXH4tvxMHn7RrkKRSs8HLONpbGI/uJGdPjUlLgoIGTaP0nMBYjpyM8JzcWX VdIXocC1ys166SAE+yZ9VLNb5YJAMjwjlkAwuQqZ7xo11yR6Ymzzoz7sk3qrwaz/QGQx 38LQ8EpmK/VMbV+7Rxw78uiP8S+LCnPU78ZXfxXI2+zFLg3Sa0xEnxEKmcmG7JhVazBg vmIo3ctFXKaymfa1G+SNihhQtavQJ/2VihpOTNRN7OLhD6lvuUree/N70CZsXw7hIZtC iLSQ== X-Gm-Message-State: AD7BkJKaFDX7bJ4qCjQzglcdCP3VM6Cuca6Q2y8h94zJhu9oTx0liVz3aHNEEYxW0xICHa7B X-Received: by 10.194.48.7 with SMTP id h7mr20608333wjn.81.1459897033312; Tue, 05 Apr 2016 15:57:13 -0700 (PDT) Received: from localhost.localdomain (hst-221-11.medicom.bg. [84.238.221.11]) by smtp.gmail.com with ESMTPSA id n3sm21914wja.6.2016.04.05.15.57.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Apr 2016 15:57:12 -0700 (PDT) From: Stanimir Varbanov To: Rob Herring , Mark Rutland , Vinod Koul , Andy Gross Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, dmaengine@vger.kernel.org, Sinan Kaya , Pramod Gurav , Stanimir Varbanov Subject: [PATCH v2 3/5] dmaengine: qcom: bam_dma: add controlled remotely dt property Date: Wed, 6 Apr 2016 01:56:20 +0300 Message-Id: <1459896982-30171-4-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459896982-30171-1-git-send-email-stanimir.varbanov@linaro.org> References: <1459896982-30171-1-git-send-email-stanimir.varbanov@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Some of the peripherals has bam which is controlled by remote processor, thus the bam dma driver must avoid register writes which initialise bam hw block. Those registers are protected from xPU block and any writes to them will lead to secure violation and system reboot. Adding the contolled_remotely flag in bam driver to avoid not permitted register writes in bam_init function. Signed-off-by: Stanimir Varbanov Reviewed-by: Andy Gross Acked-by: Rob Herring Tested-by: Pramod Gurav --- Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 2 ++ drivers/dma/qcom/bam_dma.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt index 1c9d48ea4914..9cbf5d9df8fd 100644 --- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt @@ -13,6 +13,8 @@ Required properties: - clock-names: must contain "bam_clk" entry - qcom,ee : indicates the active Execution Environment identifier (0-7) used in the secure world. +- qcom,controlled-remotely : optional, indicates that the bam is controlled by + remote proccessor i.e. execution environment. Example: diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index 789d5f836bf7..d0f878a78fae 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -387,6 +387,7 @@ struct bam_device { /* execution environment ID, from DT */ u32 ee; + bool controlled_remotely; const struct reg_offset_data *layout; @@ -1042,6 +1043,9 @@ static int bam_init(struct bam_device *bdev) val = readl_relaxed(bam_addr(bdev, 0, BAM_NUM_PIPES)); bdev->num_channels = val & BAM_NUM_PIPES_MASK; + if (bdev->controlled_remotely) + return 0; + /* s/w reset bam */ /* after reset all pipes are disabled and idle */ val = readl_relaxed(bam_addr(bdev, 0, BAM_CTRL)); @@ -1129,6 +1133,9 @@ static int bam_dma_probe(struct platform_device *pdev) return ret; } + bdev->controlled_remotely = of_property_read_bool(pdev->dev.of_node, + "qcom,controlled-remotely"); + bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk"); if (IS_ERR(bdev->bamclk)) return PTR_ERR(bdev->bamclk);