Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1360009
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Magnus Damm <magnus.damm@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 08/10] iommu/ipmmu-vmsa: Make IMBUSCTR setup optional |
| Date | Thu, 17 Mar 2016 17:30:04 +0100 |
| Message-ID | <rdIYc-1i1-43@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=7Lqb1snKQRqrwtvoH/qSVL7F9LxhvGqfAAuREzfDFPw=; b=YCeHv8gkIfzdYxDgIhqYGLWYFbpEZdN2WGfoEzDWzxlwOLp4hDM6yI3bpiKP76giU3 DaiJJe3mkLeQmoidWbv3do50DRV8mFotTxQWtdRsR7bX0Yc91BeJuSboErV8Kwt3bH0j Oy71I2/HbG9tZprfK22RQHc+Xv7/2xxmfnnXoWbB70dUic5gIPeAQ/yV1g7+2jzcHgR6 qdzRyqyscm7ypcgsUCeGLcSvp7d7qgqLclI9b1xCPTZZzXkGkvq+mMcCcHW7bqVFDNh8 9vSHvQdstRfy+WaRRjhvmBfmHPGmsohIh71YI0THWhKcTUek5+IQ6Gmw+94jCzOrkqFS L1OA== |
| 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=7Lqb1snKQRqrwtvoH/qSVL7F9LxhvGqfAAuREzfDFPw=; b=Tjw64VBMTLIgMUBI7ETksPR8TynIM0bZMkb85NnwIxk8e2InTZq+1kab6LqKMiBZzj w4Tuo1kzQz0forWy8LfBqOQei8C4GEVzXUi6lT8py9tFBUHWUqq8/QKvk+aIeY0A2XlK CHv8zwoqjdHBb4BwmgFuFOLV2KyjJsLS0vW3g1VFYx/X3E75ptDhd+nFcRAim67k2Kva U5Nh7VFz4QoHXkum7hUz07nIEkFl1mIh9En2FrQUCPNeImYE8LkPHOVY/YFb3mSrkrjC NnnYuH7DZz8pZJViRMLZRAhHAtm8exCnBguwWpAyhccaZjoGdSxgGLXPjqvCU1vFkW+Q /Qiw== |
| X-Gm-Message-State | AD7BkJIf3LenGvulbcnR8+96fJKNUEwwApg0/KbD1XkQbFNqreX7XLLh6l3RuJ9MaipXOw== |
| X-Received | by 10.98.67.199 with SMTP id l68mr16145032pfi.18.1458232020429; Thu, 17 Mar 2016 09:27:00 -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 | 44 |
| 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:30:23 +0900 |
| X-Original-Message-ID | <20160317163023.24104.41969.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:1360009 |
Show key headers only | View raw
From: Magnus Damm <damm+renesas@opensource.se>
Allow certain DT compat strings to opt-out of setting up
IMBUSCR. The default case is unchanged.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
drivers/iommu/ipmmu-vmsa.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- 0023/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:32:45.550513000 +0900
@@ -36,6 +36,7 @@
struct ipmmu_features {
bool use_ns_alias_offset;
bool has_cache_leaf_nodes;
+ bool setup_imbuscr;
};
struct ipmmu_vmsa_device {
@@ -415,10 +416,10 @@ static int ipmmu_domain_init_context(str
ipmmu_ctx_write(domain, IMMAIR0, domain->cfg.arm_lpae_s1_cfg.mair[0]);
/* IMBUSCR */
- ipmmu_ctx_write(domain, IMBUSCR,
- ipmmu_ctx_read(domain, IMBUSCR) &
- ~(IMBUSCR_DVM | IMBUSCR_BUSSEL_MASK));
-
+ if (domain->root->features->setup_imbuscr)
+ ipmmu_ctx_write(domain, IMBUSCR,
+ ipmmu_ctx_read(domain, IMBUSCR) &
+ ~(IMBUSCR_DVM | IMBUSCR_BUSSEL_MASK));
/*
* IMSTR
* Clear all interrupt flags.
@@ -992,6 +993,7 @@ static void ipmmu_device_reset(struct ip
static const struct ipmmu_features ipmmu_features_default = {
.use_ns_alias_offset = true,
.has_cache_leaf_nodes = false,
+ .setup_imbuscr = true,
};
static const struct of_device_id ipmmu_of_ids[] = {
Back to linux.kernel | Previous | Next — Previous in thread | Next 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