From patchwork Mon Oct 16 12:30:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 10008203 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 1222E60230 for ; Mon, 16 Oct 2017 12:33:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07E1A23794 for ; Mon, 16 Oct 2017 12:33:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F10C42841C; Mon, 16 Oct 2017 12:33:39 +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 8CAA723794 for ; Mon, 16 Oct 2017 12:33:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752075AbdJPMco (ORCPT ); Mon, 16 Oct 2017 08:32:44 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:46303 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752421AbdJPMck (ORCPT ); Mon, 16 Oct 2017 08:32:40 -0400 Received: by mail-pf0-f196.google.com with SMTP id p87so15714688pfj.3; Mon, 16 Oct 2017 05:32:40 -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=bzQWZOVVEg+0zrPozGs/TUQMbngSoJQeg+52S0d8yUY=; b=hjgYTQ2OtYV+rhxoYdSmW8dx8hF8/WFpLJyG2MuoJUxqpvJE3Fc95Loqq/mdW/Aw6n 7bHuqcNsIV6c3RkhUhvcVPjU4kBYv0H2xpg15NWicSvP6jkbr8rg0NT8BqJES2I4pDbt eAoItq9JAV2jUDqCsc1XKK5rInIwTG69suJ9c341hMknDPxPOXs6xLPoWdVX3QGkPJo8 y0tLaf9ZF4UDMrSAuJLoLZX+43495/duqgkxbR75Htn2Ed7XzbZkxWssDlGtyxSM3VCK UVZcUHdvrxum6W7TqxDr+z12tuJ0onqnF+FYgIgW9DfJQzDV5Hf4cY0NE1XyxlTY+cFK x0xQ== 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=bzQWZOVVEg+0zrPozGs/TUQMbngSoJQeg+52S0d8yUY=; b=Re2smUmZRvWZQx1iKy+BTRpJb/GjNjoN7jP8vxmejbMrmU9J+7TTpogoER5LspFqi3 hrwF+QypZWXJzydAjRB4u/YwVM3exvxZm9W+dZPofA9cQ8Yf4JyHwhkvU4VNGRiArZo3 BnJWbFiLl8ZVmxm1c33YlEP5GZMSB5YThdPKKYuhPn5SW3ghougVHK3zqfduwdUBUHJc 3GZG9hrevXlkRTyV2iy0r8CiiTwTixbcVXitZoeFUUi+2LDCx7otvK0c1R+25zb7EABD udzPs2KvMDk7JY3HT9tSdb6UoMcMIMle3qCa+JlcNAl/pEGCXHoKnRfDopS+hz5+92XM Wt2A== X-Gm-Message-State: AMCzsaXvbXrC3yAkQ4nMDIa0gkp9cpBH7MKyrJVoZxb0jbBl+3Tu1vPt 72/grYLwek19I4mENaCS8as= X-Google-Smtp-Source: AOwi7QCH2+qWi+nb77pWDhfjqkiY/lqwI72aR/oqjwz12QHQCTnEdeqkSzzk7EzHIwWFFjvNxvXJ9w== X-Received: by 10.98.24.20 with SMTP id 20mr8737497pfy.71.1508157160164; Mon, 16 Oct 2017 05:32:40 -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 z6sm14782056pfe.114.2017.10.16.05.32.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 05:32:38 -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, 16 Oct 2017 21:30:39 +0900 Message-Id: <150815703970.32763.17061177544172383217.sendpatchset@little-apple> In-Reply-To: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> References: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> Subject: [PATCH v5 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 V4: - Use leaf node mmu instead of root 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(-) --- 0019/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-10-16 20:24:22.990607110 +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 { @@ -144,6 +145,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) @@ -396,6 +401,7 @@ static void ipmmu_domain_free_context(st static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) { u64 ttbr; + u32 tmp; int ret; /* @@ -449,9 +455,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->mmu->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, @@ -982,6 +993,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[] = {