Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1360011
| Path | csiph.com!news.mixmin.net!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Magnus Damm <magnus.damm@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 02/10] iommu/ipmmu-vmsa: Enable multi context support |
| Date | Thu, 17 Mar 2016 17:30:04 +0100 |
| Message-ID | <rdIYc-1i1-49@gated-at.bofh.it> (permalink) |
| References | <rdIY9-1i1-5@gated-at.bofh.it> |
| X-Original-To | iommu@lists.linux-foundation.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=idDAJ2JaV1UqMA5He3vxXofe02aWLk8FLxY3Vy68LUk=; b=FpiN3IKX/V6HYF14zEsfjXH9yMGKTR2ldYdvT567aU7O2BDO4CUTnFIbxYDM4VVbu5 DYfFkNBhVLrUm42Xe3MHMOwOClPaciz4VU6FidPjQfYHNH4NhdqyOuz7R4HP5dQXhQVj S2T/T6eYW7xfPlMcfXprZ4mILm/hGiR0qRj0ULqru/9FQtZCKJ4ZEOmzTVHgC1vMcaHE YW6DHs5o0y1YkNqF0WGRLmIfitGML247yYyGXpyr5i1203FHxdYNIgc3Nob5yPBJZ9Mv R45vWlN6yalyoOVf2FNxJVLIFIsz/SAVLWaFw7qB1fn/lrXt2xD4+Qsbo68m4xtsvHru sYrA== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=idDAJ2JaV1UqMA5He3vxXofe02aWLk8FLxY3Vy68LUk=; b=P/TC0Ff4nB/Om6weRrWfwcbQaYKNGmdqz79GcWGDk8qH2iVxBoN28yGMM/aAlgyajj LHiHDJEPrAKsvjIaLXxmyElqCQfJl16Rc1uTeXLRqgKwzId6H5xmimJQcN08+A1ZSBz4 ULpKGwBRBK1Oeb8dNRKxfFM7qc2Y+rs6sFyc9lq4jGEg4TdgiyYXT9aOb2AvjhGKbXpl Xnaz4ec42RcskrchIlrszsQqUojBNOiVYmWrsxAbmbPpjVJzfPw0KB04PCpFJ0rYHHe3 TnvrSa8sbPxfqq4koHgO/6Yw1jz6R7DCreyjjAd+NyKMSKrolsuxECJLUpGkq3jq9VvY z/zw== |
| X-Gm-Message-State | AD7BkJI8fmB2QuQ+6a51Ahc/zSLkzBiL3dhNK0PZ7e9jhl1G3X/SeQI6DuYJ7pTppBQMIw== |
| X-Received | by 10.98.68.91 with SMTP id r88mr16318738pfa.12.1458231964853; Thu, 17 Mar 2016 09:26:04 -0700 (PDT) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 47 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm <magnus.damm@gmail.com> |
| X-Original-Date | Fri, 18 Mar 2016 01:29:28 +0900 |
| X-Original-Message-ID | <20160317162928.24104.46943.sendpatchset@little-apple> |
| X-Original-References | <20160317162909.24104.31682.sendpatchset@little-apple> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1360011 |
Show key headers only | View raw
From: Magnus Damm <damm+renesas@opensource.se>
Add support for up to 4 contexts. Each context is mapped
to one domain. One domain is associated with each device,
however one or more uTLBs for a single device are kept
in the same domain.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
drivers/iommu/ipmmu-vmsa.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--- 0015/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:15:49.180513000 +0900
@@ -31,7 +31,7 @@
#include "io-pgtable.h"
-#define IPMMU_CTX_MAX 1
+#define IPMMU_CTX_MAX 4
struct ipmmu_vmsa_device {
struct device *dev;
@@ -536,6 +536,13 @@ static int ipmmu_attach_device(struct io
/* The domain hasn't been used yet, initialize it. */
domain->mmu = mmu;
ret = ipmmu_domain_init_context(domain);
+ if (ret < 0) {
+ dev_err(dev, "Unable to initialize IPMMU context\n");
+ domain->mmu = 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
@@ -915,7 +922,7 @@ static void ipmmu_device_reset(struct ip
unsigned int i;
/* Disable all contexts. */
- for (i = 0; i < 4; ++i)
+ for (i = 0; i < IPMMU_CTX_MAX; ++i)
ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0);
}
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 00/10] iommu/ipmmu-vmsa: Initial r8a7795 support Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 09/10] iommu/ipmmu-vmsa: Allow two bit SL0 Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 06/10] iommu/ipmmu-vmsa: Add optional root device feature Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 05/10] iommu/ipmmu-vmsa: Introduce features, break out alias Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 10/10] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 07/10] iommu/ipmmu-vmsa: Write IMCTR twice Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 01/10] iommu/ipmmu-vmsa: Make use of IOMMU_OF_DECLARE() Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 03/10] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
Re: [PATCH 03/10] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus Geert Uytterhoeven <geert@linux-m68k.org> - 2016-03-18 10:50 +0100
[PATCH 08/10] iommu/ipmmu-vmsa: Make IMBUSCTR setup optional Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 04/10] iommu/ipmmu-vmsa: IPMMU device is 64-bit bus master Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
[PATCH 02/10] iommu/ipmmu-vmsa: Enable multi context support Magnus Damm <magnus.damm@gmail.com> - 2016-03-17 17:30 +0100
csiph-web