From patchwork Thu Jun 1 13:58:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 9759631 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 61D3360390 for ; Thu, 1 Jun 2017 13:59:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EE2220572 for ; Thu, 1 Jun 2017 13:59:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4387627F88; Thu, 1 Jun 2017 13:59:08 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 B469627569 for ; Thu, 1 Jun 2017 13:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751193AbdFAN7H (ORCPT ); Thu, 1 Jun 2017 09:59:07 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:35451 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083AbdFAN7G (ORCPT ); Thu, 1 Jun 2017 09:59:06 -0400 Received: by mail-qt0-f195.google.com with SMTP id r58so5759858qtb.2 for ; Thu, 01 Jun 2017 06:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J3y4uF3R55Z6lF4TnrBb1OSpTPjblbe7m+SiEZPRMf0=; b=DIFTYabfR2KnG4K+X1meu+6KJ8FaYkl81s7Qn0+TUlGEH1RXRL4ihJjIhJkr0Iao4Y R11/qDc96nXeaAnejM+9944zxo7zUFB3WtQEttXzZR2Ty/hmPc2n5rYi9W/9bgBhYXse kO3vXbYS4hGP7J191h/98EXx5qy1gTXlchmu0nSrncKATzjZPPmPT4shfwZZRl97ERjz OFIip15R21oKHN63a94Za4Vqly79F2jcoSZniAq/8XAWyGwGFQj4UTiVdA9aMm9d0iXV D7bbKoBL2nsx6TYuuTH+7oN+fMV3avEb0B6+0KTtXukQGQReGqUxNwpidOOMwDB9dFzp H0+Q== 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=J3y4uF3R55Z6lF4TnrBb1OSpTPjblbe7m+SiEZPRMf0=; b=ntaBSL3dmROcCQ7RjKyJ4/PDFj4CbRLCcMfcBF/2gcb6UQAJKQIpohmhAJ5hBX7V/a 3D6YQ7SWw7wzGY8G8esNK8b1SXJJWYxh1rR05B0BghISZ/CPcpSAH1ncCWL6VI/7da6y sD9aq9GxTAW+58PnyBEn2eTBdEtsruzGBMCziPjdvWYoLOUJYvxis4iaBncYBlrK+3XN 8XsyFUFRm5SaU9EZGc/CrWc46XZvIgtWKIsmvS+R9u4ckdYu4zzYZRJlfdGs4jcrOAgo AZDmd+VdW8lBH1qqlw8XQlUwgcUYSetG2ANzhUY8p3R+vObdrDV1ypgu4kDyNeij5Bl0 Pn1A== X-Gm-Message-State: AODbwcDJNb13GlUja/AfMuA7RSTemeG74+5nrWKpnPQx+USEEcNnhTE/ 0oNZRgZwygKo3FUBYTw= X-Received: by 10.237.45.129 with SMTP id i1mr1918084qtd.194.1496325545643; Thu, 01 Jun 2017 06:59:05 -0700 (PDT) Received: from localhost (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id x26sm1414976qtc.19.2017.06.01.06.59.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2017 06:59:04 -0700 (PDT) From: Rob Clark To: iommu@lists.linux-foundation.org Cc: linux-arm-msm@vger.kernel.org, Rob Herring , Robin Murphy , Will Deacon , Mark Rutland , Sricharan , Archit Taneja , Stanimir Varbanov , Rob Clark Subject: [PATCH 4/4] iommu: qcom: initialize secure page table Date: Thu, 1 Jun 2017 09:58:49 -0400 Message-Id: <20170601135849.14978-5-robdclark@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170601135849.14978-1-robdclark@gmail.com> References: <20170601135849.14978-1-robdclark@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stanimir Varbanov This basically gets the secure page table size, allocates memory for secure pagetables and passes the physical address to the trusted zone. Signed-off-by: Stanimir Varbanov Signed-off-by: Rob Clark --- drivers/iommu/qcom_iommu.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index 3b578e6..753ee0e 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -636,6 +636,51 @@ static void qcom_iommu_disable_clocks(struct qcom_iommu_dev *qcom_iommu) clk_disable_unprepare(qcom_iommu->iface_clk); } +static int qcom_iommu_sec_ptbl_init(struct device *dev) +{ + size_t psize = 0; + unsigned int spare = 0; + void *cpu_addr; + dma_addr_t paddr; + unsigned long attrs; + static bool allocated = false; + int ret; + + if (allocated) + return 0; + + ret = qcom_scm_iommu_secure_ptbl_size(spare, &psize); + if (ret) { + dev_err(dev, "failed to get iommu secure pgtable size (%d)\n", + ret); + return ret; + } + + dev_info(dev, "iommu sec: pgtable size: %zu\n", psize); + + attrs = DMA_ATTR_NO_KERNEL_MAPPING; + + cpu_addr = dma_alloc_attrs(dev, psize, &paddr, GFP_KERNEL, attrs); + if (!cpu_addr) { + dev_err(dev, "failed to allocate %zu bytes for pgtable\n", + psize); + return -ENOMEM; + } + + ret = qcom_scm_iommu_secure_ptbl_init(paddr, psize, spare); + if (ret) { + dev_err(dev, "failed to init iommu pgtable (%d)\n", ret); + goto free_mem; + } + + allocated = true; + return 0; + +free_mem: + dma_free_attrs(dev, psize, cpu_addr, paddr, attrs); + return ret; +} + static int get_asid(const struct device_node *np) { u32 reg; @@ -733,6 +778,17 @@ static struct platform_driver qcom_iommu_ctx_driver = { .remove = qcom_iommu_ctx_remove, }; +static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu) +{ + struct device_node *child; + + for_each_child_of_node(qcom_iommu->dev->of_node, child) + if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec")) + return true; + + return false; +} + static int qcom_iommu_device_probe(struct platform_device *pdev) { struct device_node *child; @@ -777,6 +833,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) return -ENODEV; } + if (qcom_iommu_has_secure_context(qcom_iommu)) { + ret = qcom_iommu_sec_ptbl_init(dev); + if (ret) { + dev_err(dev, "cannot init secure pg table(%d)\n", ret); + return ret; + } + } + platform_set_drvdata(pdev, qcom_iommu); pm_runtime_enable(dev);