From patchwork Mon Jun 6 03:58:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9157183 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 A628E60467 for ; Mon, 6 Jun 2016 04:09:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C36127B13 for ; Mon, 6 Jun 2016 04:09:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90D0B2821D; Mon, 6 Jun 2016 04:09:26 +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 911B827B13 for ; Mon, 6 Jun 2016 04:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753361AbcFFEJN (ORCPT ); Mon, 6 Jun 2016 00:09:13 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33264 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150AbcFFEJM (ORCPT ); Mon, 6 Jun 2016 00:09:12 -0400 Received: by mail-pa0-f67.google.com with SMTP id di3so10838705pab.0; Sun, 05 Jun 2016 21:09:11 -0700 (PDT) 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=WXE/x6uzaX36hHeD5tRAmubcR2/MXFixKo/uWlU+VIw=; b=sGErO/TVE2V+kcvks9XOcpcaqBGBuJ6Kf/bLzh25VH5UN0RnG/xk6U6lx6uMpLcmgR CC7LFwUzfVTICbx3qipxPwjJbUBmFevR+P+VoYDiEahndwqVg9U5cyWLb5XAcdGpymGu skMogZo8ZV9vQlvgN7T1tR0Eab1MfDa0FyMdYIV2abnWX3pFeHykyUOmNBH9UyHRyvIy 5QkV4xe7rQhxbX+XHGXja4ReXGjYWWm4HeN1IBh7H9Omqm88EvAH5CZ5tXPBvVMKlBLy MA57Sb4OTOFvHLNb0upJaSHoTIVhjBJdQt/r8A5xNVguXxhx5Z2HR2n35ynxeDLBw48k wskw== 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=WXE/x6uzaX36hHeD5tRAmubcR2/MXFixKo/uWlU+VIw=; b=QYYWHCbWXNAnpMe5lpX0tii+ds1h940oaLV1r2gAyOOvsguTMvrktiz3YGvo0sAwG8 2myzKfAU28KkfS5QMbWrPp35W3jHMpJu8BItPl9zkhcju4/SBe+t9xfDCH/IgQZ3GHJ4 263vR08s36TVEa2skWW4OqNCRD9o/f2ttYPcpvm1ZGPbAPV8NfJ3u7cH2ghr4JNzA1a4 bUXJ5bYg7KsD+Ju1xIym+9bpbnGh4SPfblxzsdtOOC9QL3XU0tbctw9nX7w9T4zAeqlQ uB7Yfq1U5k4cQyuG8vMQknA1iScFt0KIFp1/h/XzmoGMMMioSR9Ev9XZf/VvK8DVRJME SOjA== X-Gm-Message-State: ALyK8tLDkAxTK19s9kv3q7yKU4y4RIqIOf1ZrxzMf35CaJvtG/GNdMMdHnTSD7v9NjUtvA== X-Received: by 10.66.159.163 with SMTP id xd3mr22130572pab.23.1465186150350; Sun, 05 Jun 2016 21:09:10 -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 ql1sm21038069pac.2.2016.06.05.21.09.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2016 21:09:09 -0700 (PDT) From: Magnus Damm To: iommu@lists.linux-foundation.org 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 Date: Mon, 06 Jun 2016 12:58:49 +0900 Message-Id: <20160606035849.31763.15348.sendpatchset@little-apple> In-Reply-To: <20160606035723.31763.66500.sendpatchset@little-apple> References: <20160606035723.31763.66500.sendpatchset@little-apple> Subject: [PATCH v2 09/11] 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 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(-) --- 0023/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-06-06 11:04:39.800607110 +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 { @@ -438,10 +439,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. @@ -1057,6 +1058,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[] = {