From patchwork Wed Mar 8 11:02:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9610857 X-Patchwork-Delegate: geert@linux-m68k.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 E03B1604DD for ; Wed, 8 Mar 2017 11:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6DCC28559 for ; Wed, 8 Mar 2017 11:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBF902856E; Wed, 8 Mar 2017 11:11:17 +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=unavailable 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 8A93C28567 for ; Wed, 8 Mar 2017 11:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750853AbdCHLKx (ORCPT ); Wed, 8 Mar 2017 06:10:53 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34972 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbdCHLKt (ORCPT ); Wed, 8 Mar 2017 06:10:49 -0500 Received: by mail-pg0-f65.google.com with SMTP id 187so3139187pgb.2; Wed, 08 Mar 2017 03:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=0+oH56YYvpU7iU1B3NC1QJz6zLOP2KRqm02k/yI+pu4=; b=RBrrSlo0a7PsDJK5mwlIL1HPSYuFc3ApD+MqM3lRL4S7ZhiLWWFc+tGET0CBQkLwEh Hyc7exJI0izdF+evmJYhS/4e3NN8HvpIom3M69kDnvjZWmAtAH9Nj6hLlmZ7XtjaFdq5 CwDZFRjZzKbfBxxxbEtxBxtVoZMnlL+P9g7WCM3TaMt62ErB6l5glWpGgrVUCwTRyjJJ 37h2mIAOrJ0r8mKxhVQyuWDGqP9uPN5PLlKD9wxYjOltKKIc2JK0PFkFW1b3Ce2I1U5d 3vt1/igumLWouk8MBrYX4BmLgtHMDM4sWDvBsJmIqDOEIROF6ETF/WQP/2pWuxANQ5ej NrCw== 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:date:message-id:in-reply-to :references:subject; bh=0+oH56YYvpU7iU1B3NC1QJz6zLOP2KRqm02k/yI+pu4=; b=lv0WHt4BQux/1q5/tcQMBDknxXlKw8h39O6g4Mt5zxdVd7IJ/V5moCIDNifeEogmTn Yx6wsMbghxDcRxzw7CfBw8tIneFjIz5PYHX+ef3TYuaPzCMcoEZNhE9EHhUDUcObT2Uj g2vKfcLji7xzd7vCEPHOs61nnM4qnqCD8ndwuBGGQmJC6H+1+I8C0CZtRM7X5JsKtksL WccXWPIvNuRHLy35CR4/oW/OS1njjXUrc199bdsguXN58PiqMaVxgS67tcDZx2EC9BkO TbzReiMg7mlRnCMww1Rkdy48jXNfGQ3+gPyxuGiB+o1/IPbJl7FqmbyB2YY5OYmsmNxO iv9w== X-Gm-Message-State: AMke39kcAmj7+TVFTGVq0S32LXaR9UjgQPBVqFe6N4q2ThabjF+8c4ZMjKV4elAPZkFUUA== X-Received: by 10.84.232.129 with SMTP id i1mr7860100plk.129.1488971305273; Wed, 08 Mar 2017 03:08:25 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id h9sm5499099pfd.103.2017.03.08.03.08.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 03:08:23 -0800 (PST) From: Magnus Damm To: joro@8bytes.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, iommu@lists.linux-foundation.org, horms+renesas@verge.net.au, Magnus Damm , robin.murphy@arm.com, m.szyprowski@samsung.com Date: Wed, 08 Mar 2017 20:02:43 +0900 Message-Id: <148897096346.16106.12982552891354954137.sendpatchset@little-apple> In-Reply-To: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> References: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> Subject: [PATCH v3 08/09] iommu/ipmmu-vmsa: Allow two bit SL0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Introduce support for two bit SL0 bitfield in IMTTBCR by using a separate feature flag. Signed-off-by: Magnus Damm --- Changes since V2: - None Changes since V1: - None drivers/iommu/ipmmu-vmsa.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) --- 0022/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-03-08 18:33:07.630607110 +0900 @@ -38,6 +38,7 @@ struct ipmmu_features { bool has_cache_leaf_nodes; bool has_eight_ctx; bool setup_imbuscr; + bool twobit_imttbcr_sl0; }; struct ipmmu_vmsa_device { @@ -163,6 +164,10 @@ static void set_archdata(struct device * #define IMTTBCR_TSZ0_MASK (7 << 0) #define IMTTBCR_TSZ0_SHIFT O +#define IMTTBCR_SL0_TWOBIT_LVL_3 (0 << 6) +#define IMTTBCR_SL0_TWOBIT_LVL_2 (1 << 6) +#define IMTTBCR_SL0_TWOBIT_LVL_1 (2 << 6) + #define IMBUSCR 0x000c #define IMBUSCR_DVM (1 << 2) #define IMBUSCR_BUSSEL_SYS (0 << 0) @@ -406,6 +411,7 @@ static int ipmmu_domain_allocate_context static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) { u64 ttbr; + u32 tmp; int ret; /* @@ -458,9 +464,15 @@ static int ipmmu_domain_init_context(str * We use long descriptors with inner-shareable WBWA tables and allocate * the whole 32-bit VA space to TTBR0. */ + + if (domain->root->features->twobit_imttbcr_sl0) + tmp = IMTTBCR_SL0_TWOBIT_LVL_1; + else + tmp = IMTTBCR_SL0_LVL_1; + ipmmu_ctx_write(domain, IMTTBCR, IMTTBCR_EAE | IMTTBCR_SH0_INNER_SHAREABLE | IMTTBCR_ORGN0_WB_WA | - IMTTBCR_IRGN0_WB_WA | IMTTBCR_SL0_LVL_1); + IMTTBCR_IRGN0_WB_WA | tmp); /* MAIR0 */ ipmmu_ctx_write(domain, IMMAIR0, domain->cfg.arm_lpae_s1_cfg.mair[0]); @@ -1080,6 +1092,7 @@ static const struct ipmmu_features ipmmu .has_cache_leaf_nodes = false, .has_eight_ctx = false, .setup_imbuscr = true, + .twobit_imttbcr_sl0 = false, }; static const struct of_device_id ipmmu_of_ids[] = {