From patchwork Mon Jun 19 09:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9795571 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 A2612600C5 for ; Mon, 19 Jun 2017 09:19:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DB3C27C05 for ; Mon, 19 Jun 2017 09:19:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9098A283C6; Mon, 19 Jun 2017 09:19:24 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,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 2CB7027C05 for ; Mon, 19 Jun 2017 09:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753789AbdFSJTL (ORCPT ); Mon, 19 Jun 2017 05:19:11 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:32883 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbdFSJTH (ORCPT ); Mon, 19 Jun 2017 05:19:07 -0400 Received: by mail-pg0-f44.google.com with SMTP id f185so45671388pgc.0; Mon, 19 Jun 2017 02:19:07 -0700 (PDT) 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=7i5YF2xzvIKIRAjQzHrNi4fxN3CRNA9Byb0OETQku0c=; b=uuINBK0P0vMX0y9duY9TMu2Tl69px7lw6Fxe4KxwhV8leTDQ7pzZG6yGGtt2pB1YDf bjIRCj/kfhY3emyJJivLlx6zoEG9HhBG/DrvAX99aexwhWOLmU+GCtFuKX6yJcpBlpXj dYqoYYlX9IiHEQkFnmPfMoLZWnfdQufJ7HPtPTRBdV3QYWXZiEiEvptLQMNRTXLns9MR Fx3i5c7xoH0A5eAG9/8Pu/ObO9yFcghcP0xUZi9YDES8qqJzo75TtcE5hAqV7hnlnyF1 HOLINQKe+jwdmGs586PqvEMUDe3GPM7luri8NxMXJ9JNrQTcdH8txQ1fe7afywFcGhS5 6USg== 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=7i5YF2xzvIKIRAjQzHrNi4fxN3CRNA9Byb0OETQku0c=; b=NJYf9v7ZlsGjKpUNgTyNmHuxVQ+/nbsgt1U3VKn6m2EasGk420A2unB07AxSIGwL6e 296TiqCjaim+n3rubL8lxIxOR+B3f9XdFqIeW2xF4imaipdwuF1u0R/uMHVdaPPtKxEf cjMs1abp/vhZaQqAWWbsbQbSWeMqqLfpn5Bhw2eZfLRVn+NOTcd/9pJQFc/mS1jWWhsB cAFYb/sDhM7I/G1xzI48bFvzkaKQ4BMRwzcvYHc51YaGqJHiA9HXNYSh60SWDE7EjxQ0 SnvbF6ZgUBUDxhHTlCeLdUOYJAf7riXJDf8v89z3ghDWrOkwUVbqyaMfhs1o0p/XNx1B 3jqA== X-Gm-Message-State: AKS2vOxvIo+UDvnoXPV5z6cQkmCGZxN494qHISruzcy1Wr7brNhHmsTB X0/cM1akM5tBoQ== X-Received: by 10.84.224.202 with SMTP id k10mr12890790pln.182.1497863937063; Mon, 19 Jun 2017 02:18:57 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id 186sm18697495pfv.15.2017.06.19.02.18.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 02:18:55 -0700 (PDT) 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: Mon, 19 Jun 2017 18:15:09 +0900 Message-Id: <149786370982.14868.1199687537260335036.sendpatchset@little-apple> In-Reply-To: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> References: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> Subject: [PATCH v4 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 V3: - None Changes since V2: - None Changes since V1: - None drivers/iommu/ipmmu-vmsa.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- 0027/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-06-19 14:08:26.100607110 +0900 @@ -40,6 +40,7 @@ struct ipmmu_features { bool has_cache_leaf_nodes; unsigned int number_of_contexts; bool setup_imbuscr; + bool twobit_imttbcr_sl0; }; struct ipmmu_vmsa_device { @@ -149,6 +150,10 @@ static struct ipmmu_vmsa_iommu_priv *to_ #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) @@ -393,6 +398,7 @@ static int ipmmu_domain_allocate_context static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) { u64 ttbr; + u32 tmp; int ret; /* @@ -445,9 +451,14 @@ 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_root(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_root(domain, IMMAIR0, @@ -989,6 +1000,7 @@ static const struct ipmmu_features ipmmu .has_cache_leaf_nodes = false, .number_of_contexts = 1, /* software only tested with one context */ .setup_imbuscr = true, + .twobit_imttbcr_sl0 = false, }; static const struct of_device_id ipmmu_of_ids[] = {