lkml.org 
[lkml]   [2016]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 02/10] iommu/ipmmu-vmsa: Enable multi context support
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);
}

\
 
 \ /
  Last update: 2016-03-17 18:01    [W:0.073 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site