From patchwork Mon Jun 19 09:14:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9795551 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 41BE4603F5 for ; Mon, 19 Jun 2017 09:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4000027C05 for ; Mon, 19 Jun 2017 09:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 344D0283F5; Mon, 19 Jun 2017 09:18:13 +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=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 BFA3D283BD for ; Mon, 19 Jun 2017 09:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753900AbdFSJSL (ORCPT ); Mon, 19 Jun 2017 05:18:11 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35325 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753758AbdFSJSJ (ORCPT ); Mon, 19 Jun 2017 05:18:09 -0400 Received: by mail-pg0-f68.google.com with SMTP id f127so14603583pgc.2; Mon, 19 Jun 2017 02:18:09 -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=c2THPddcLRtEUJWy9Mr9FX1DplxO4D1G09Z54f1VnQ8=; b=gClAQMEVz9fBuvMHndOJX8zqdSvrXcbpyUsqd83557eD9ETnEAq5i0s+WybcVrBI2S Z3XfBWi6y5swy/lJqgrFy1Ym2gYSXu5BG4q1JRWFS/emktof2e/ZTW+ZEwEiR9GiNYcb Q6LGDHeCtxsSUsYavopNGCI6IhjbaRqLUN3MAVaOAGluW9+AO3JzUcgOuD2vTyWKDlxy OWU/TZtuOF/rAhEG3kBXneBi38w9v2qFz5t5Hg5aCwo/31VRToyVm5C1jgtxwonUx78I Q3meuxulLj8D7GLv3mVHETWoxwIdl7a+e50sdzkimdQziW09Qtp+JXQxb/yF6JXChENJ Q6dQ== 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=c2THPddcLRtEUJWy9Mr9FX1DplxO4D1G09Z54f1VnQ8=; b=HRF9q12MRH3fr5XFwzpU86u4gE9P7nIxtemeuvMTiv7GYm5h9miXKCNsLzzKLMVKRa nkA0OAWcr1MbrTBNc2zV9hC7cUQMfjv9H0WMHZnDdZZAP9hS/NhA2FDvGfVM4P287d11 PHejXIMEEjSEpk4BsfoZUznuH+EY3P4jEr7O9DzO84Kt8cy6B1I6JWrMIFn0z3iGsoHq pS7+9oRRXwPuy9YsJJpp8967CBYA3Tmt/KlTR4mrkNt1/MwudYkoGcpLC58xnWTbXV24 NM6McvpB2O9Tch9NqLeCyih4Kg59KIj7i9+68GvFFiTRU56MXh+PAXanrIHraUNJRU4U 9s1w== X-Gm-Message-State: AKS2vOx0gLocSGyOQJENeegNp1jS5P2bJPyCItUqdyBPwKF8v8gNQPeP 6FSD4lejnBw+Ig== X-Received: by 10.99.102.5 with SMTP id a5mr24851125pgc.101.1497863883984; Mon, 19 Jun 2017 02:18:03 -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 o6sm18176234pfb.110.2017.06.19.02.18.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 02:18:02 -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:14:17 +0900 Message-Id: <149786365717.14868.7474993576415329048.sendpatchset@little-apple> In-Reply-To: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> References: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> Subject: [PATCH v4 03/09] iommu/ipmmu-vmsa: Enable multi context support 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 Add support for up to 8 contexts. Each context is mapped to one domain. One domain is assigned one or more slave devices. Contexts are allocated dynamically and slave devices are grouped together based on which IPMMU device they are connected to. This makes slave devices tied to the same IPMMU device share the same IOVA space. Signed-off-by: Magnus Damm --- Changes since V3: - Use number_of_contexts unsigned int, drop WARN_ON() - Thanks Robin! Changes since V2: - Updated patch description to reflect code included in: [PATCH v7 00/07] iommu/ipmmu-vmsa: IPMMU multi-arch update V7 Changes since V1: - Support up to 8 contexts instead of 4 - Use feature flag and runtime handling - Default to single context drivers/iommu/ipmmu-vmsa.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) --- 0017/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-06-19 14:00:59.880607110 +0900 @@ -32,11 +32,12 @@ #include "io-pgtable.h" -#define IPMMU_CTX_MAX 1 +#define IPMMU_CTX_MAX 8 struct ipmmu_features { bool use_ns_alias_offset; bool has_cache_leaf_nodes; + unsigned int number_of_contexts; }; struct ipmmu_vmsa_device { @@ -47,6 +48,7 @@ struct ipmmu_vmsa_device { const struct ipmmu_features *features; bool is_leaf; unsigned int num_utlbs; + unsigned int num_ctx; spinlock_t lock; /* Protects ctx and domains[] */ DECLARE_BITMAP(ctx, IPMMU_CTX_MAX); struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX]; @@ -363,11 +365,12 @@ static int ipmmu_domain_allocate_context spin_lock_irqsave(&mmu->lock, flags); - ret = find_first_zero_bit(mmu->ctx, IPMMU_CTX_MAX); - if (ret != IPMMU_CTX_MAX) { + ret = find_first_zero_bit(mmu->ctx, mmu->num_ctx); + if (ret != mmu->num_ctx) { mmu->domains[ret] = domain; set_bit(ret, mmu->ctx); - } + } else + ret = -EBUSY; spin_unlock_irqrestore(&mmu->lock, flags); @@ -412,9 +415,9 @@ static int ipmmu_domain_init_context(str * Find an unused context. */ ret = ipmmu_domain_allocate_context(domain->root, domain); - if (ret == IPMMU_CTX_MAX) { + if (ret < 0) { free_io_pgtable_ops(domain->iop); - return -EBUSY; + return ret; } domain->context_id = ret; @@ -549,7 +552,7 @@ static irqreturn_t ipmmu_irq(int irq, vo /* * Check interrupts for all active contexts. */ - for (i = 0; i < IPMMU_CTX_MAX; i++) { + for (i = 0; i < mmu->num_ctx; i++) { if (!mmu->domains[i]) continue; if (ipmmu_domain_irq(mmu->domains[i]) == IRQ_HANDLED) @@ -620,6 +623,14 @@ static int ipmmu_attach_device(struct io domain->mmu = mmu; domain->root = root; ret = ipmmu_domain_init_context(domain); + if (ret < 0) { + dev_err(dev, "Unable to initialize IPMMU context\n"); + domain->mmu = NULL; + domain->root = NULL; + } else { + dev_info(dev, "Using IPMMU context %u\n", + domain->context_id); + } } else if (domain->mmu != mmu) { /* * Something is wrong, we can't attach two devices using @@ -953,13 +964,14 @@ static void ipmmu_device_reset(struct ip unsigned int i; /* Disable all contexts. */ - for (i = 0; i < 4; ++i) + for (i = 0; i < mmu->num_ctx; ++i) ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0); } static const struct ipmmu_features ipmmu_features_default = { .use_ns_alias_offset = true, .has_cache_leaf_nodes = false, + .number_of_contexts = 1, /* software only tested with one context */ }; static const struct of_device_id ipmmu_of_ids[] = { @@ -1013,6 +1025,9 @@ static int ipmmu_probe(struct platform_d if (mmu->features->use_ns_alias_offset) mmu->base += IM_NS_ALIAS_OFFSET; + mmu->num_ctx = min_t(unsigned int, IPMMU_CTX_MAX, + mmu->features->number_of_contexts); + irq = platform_get_irq(pdev, 0); /*