From patchwork Wed Mar 8 11:02:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9610859 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 3F6356046A for ; Wed, 8 Mar 2017 11:11:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45EFB28567 for ; Wed, 8 Mar 2017 11:11:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC992856F; Wed, 8 Mar 2017 11:11:18 +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 F2FDF28567 for ; Wed, 8 Mar 2017 11:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752771AbdCHLKw (ORCPT ); Wed, 8 Mar 2017 06:10:52 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34317 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750745AbdCHLKt (ORCPT ); Wed, 8 Mar 2017 06:10:49 -0500 Received: by mail-pf0-f194.google.com with SMTP id o126so3467330pfb.1; Wed, 08 Mar 2017 03:08:15 -0800 (PST) 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=zOq5DhgGkqm2DBZMAyedugph2nX7NKYvxh+LqZu53lQ=; b=llR6aQEbDR890fwLSe2ZYZK4XGVHw7sq2eeXaQAXACM4u9QsY/DHYcMM0KQvDZt6YX UhUEW+NFto37WY5BPQ7ILUSEwGV9jvmVAW6xPCd5GSg+ZlXk83ad6O6owC6lFy0SFxNN v37HEYcn7xEAggTjCZvOtsJXYQSidWrxbTW7qBhFvlm92Z4T246UJ4d4cpmoIaZxjgOj QZBCFDlEgTXEyjeNzNX8+W3Ez7a5Ct6ZTwCYnSgwfx1z/nXP135LB14xKSFeiIbzzIKI MvGJpsNY2WPM1P4UsoL/WiX4VxRqv9im1yJCF7hvjYds4A4Khxl0M7uL5AYAC/OIXsjY 8x6Q== 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=zOq5DhgGkqm2DBZMAyedugph2nX7NKYvxh+LqZu53lQ=; b=ML1qhyaA87+2FIZ2eOv1rdnhgCR8SaTH6QVJuEO9cWP5ReDgv/ykp5tJe+bMlaV4Oq YJ0wcLnxiOmnF6L0EqfyiWlr+WT+PZYzIo5AFpgmy7XUkGTexF4opJWnFKFG2CfBIabO /zCV+D+hCfoC88UESWsqL1uq6z5D4glUFQGnG/Jq2ChKliWJ7FFeeX0d6C/ykcvN5S/J yRnj/aR9h5RPFGnq33EGUM5QcXKxrLJquIPUHQ3TJVRKvrWz2Rw8Te30qqbjzIi3M/2S bd7aYgK1KDXjMHzsnzmKOWO94H0ygkmLcewESQCApGfPlviMJordsppaUzc2rdbunH6x /U2Q== X-Gm-Message-State: AMke39nSrMxVKSrjB6mICD37jzpGigQiIKuqldg+j7ru/WaYL5sOha8CN3q8PZOziEMm2w== X-Received: by 10.84.160.195 with SMTP id v3mr7780862plg.161.1488971295370; Wed, 08 Mar 2017 03:08:15 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id r71sm5496160pfa.104.2017.03.08.03.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 03:08:13 -0800 (PST) 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: Wed, 08 Mar 2017 20:02:33 +0900 Message-Id: <148897095343.16106.17126859556338057136.sendpatchset@little-apple> In-Reply-To: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> References: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> Subject: [PATCH v3 07/09] iommu/ipmmu-vmsa: Make IMBUSCTR setup optional 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 a feature to allow opt-out of setting up IMBUSCR. The default case is unchanged. Signed-off-by: Magnus Damm --- Changes since V2: - None Changes since V1: - Updated the commit message - Reworked patch to coexist with the multi context feature drivers/iommu/ipmmu-vmsa.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- 0020/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-03-08 18:32:26.280607110 +0900 @@ -37,6 +37,7 @@ struct ipmmu_features { bool use_ns_alias_offset; bool has_cache_leaf_nodes; bool has_eight_ctx; + bool setup_imbuscr; }; struct ipmmu_vmsa_device { @@ -465,10 +466,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. @@ -1078,6 +1079,7 @@ static const struct ipmmu_features ipmmu .use_ns_alias_offset = true, .has_cache_leaf_nodes = false, .has_eight_ctx = false, + .setup_imbuscr = true, }; static const struct of_device_id ipmmu_of_ids[] = {