From patchwork Mon Jun 19 09:13:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9795543 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 DB49960381 for ; Mon, 19 Jun 2017 09:17:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8C9427C05 for ; Mon, 19 Jun 2017 09:17:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDADD283C0; Mon, 19 Jun 2017 09:17:50 +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 5932327C05 for ; Mon, 19 Jun 2017 09:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753830AbdFSJRt (ORCPT ); Mon, 19 Jun 2017 05:17:49 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33919 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753817AbdFSJRt (ORCPT ); Mon, 19 Jun 2017 05:17:49 -0400 Received: by mail-pg0-f66.google.com with SMTP id j186so14606541pge.1; Mon, 19 Jun 2017 02:17:48 -0700 (PDT) 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=W0CQYzk/9qzhV7Kn+Wov1Dakp6yTqCO81OIw3jlukAc=; b=ToB9iO6RTeYVHM3FRJMBS5QB59tTZ1KBjhnnrl47sXUYYm2eEmU0Z8nhf6GTYp+fGE lmpiyHZPTvk7VpiuR9qEBBUdvT643QkyYjaf0cjurZC7tgbIfVBxnrCbZHLQuoWwWF4o ++JKPbAXToFSjr4ZeRP2p3CaLO5zMMkkUZY3LK2b1GyjJDewECnixxxh2Eqo4qKqicEr wsto6/0CVb3tAvrlGPmKwpsb9NZorjRnYWTIr1UxevUrn5ONWNC7d2YMH2rhMq5Cz2H9 LycjNOjROye8yPmoywvqvam0N1nLNr+U40zDcS6I1k7PoJytY5Js6Z37pxti/kiFNruk 2l5A== 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=W0CQYzk/9qzhV7Kn+Wov1Dakp6yTqCO81OIw3jlukAc=; b=atl7tEEVAv0zYk3ToM96i85WN4aS/edATNfA+5Fm4OP6z4Vv9tUhvRKzY5Ek0NT0l0 Uez3MPsuvlZivmV/N4UDBtOPD0fomKfQ83pAImtU4gEVaJeg6j3yMv5ob/DqV4Woja+t sShoLpZtBQHA32O/V30AYa/jqBMq80yC50H8ciZ1fOTJhrsgwlC0KqjJSFo8JIkLP8rd s9BVguuPjJtlwhMzgeNd7uR3Hq+zZH1QBf6beY1ap1fR3v5BgdVzCGPz1cZ3fbFLRuwg GCItFVvy8nY9gSmAuJfkEYNnEz6P8/NYLw4SfY2djLQusoCrYqxJhTECWd3fFMqIjivj f+Ow== X-Gm-Message-State: AKS2vOzN1B7H/1CiPWHicTi7waGgNsqXm0g0N9qE4660Ohd9eNh3HL7o 4XdOkdAfUQQz1w== X-Received: by 10.99.101.135 with SMTP id z129mr24670495pgb.66.1497863863390; Mon, 19 Jun 2017 02:17:43 -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 a187sm18229926pgc.37.2017.06.19.02.17.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 02:17:42 -0700 (PDT) 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: Mon, 19 Jun 2017 18:13:56 +0900 Message-Id: <149786363603.14868.4644894466721476408.sendpatchset@little-apple> In-Reply-To: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> References: <149786362527.14868.2143461703972595839.sendpatchset@little-apple> Subject: [PATCH v4 01/09] iommu/ipmmu-vmsa: Introduce features, break out alias 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 struct ipmmu_features to track various hardware and software implementation changes inside the driver for different kinds of IPMMU hardware. Add use_ns_alias_offset as a first example of a feature to control if the secure register bank offset should be used or not. Signed-off-by: Magnus Damm --- Changes since V3: - Use of_device_get_match_data(), thanks Robin! Changes since V2: - None Changes since V1: - Moved patch to front of the series drivers/iommu/ipmmu-vmsa.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) --- 0014/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-06-19 13:57:36.300607110 +0900 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -33,12 +34,16 @@ #define IPMMU_CTX_MAX 1 +struct ipmmu_features { + bool use_ns_alias_offset; +}; + struct ipmmu_vmsa_device { struct device *dev; void __iomem *base; struct iommu_device iommu; struct list_head list; - + const struct ipmmu_features *features; unsigned int num_utlbs; spinlock_t lock; /* Protects ctx and domains[] */ DECLARE_BITMAP(ctx, IPMMU_CTX_MAX); @@ -904,6 +909,21 @@ static void ipmmu_device_reset(struct ip ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0); } +static const struct ipmmu_features ipmmu_features_default = { + .use_ns_alias_offset = true, +}; + +static const struct of_device_id ipmmu_of_ids[] = { + { + .compatible = "renesas,ipmmu-vmsa", + .data = &ipmmu_features_default, + }, { + /* Terminator */ + }, +}; + +MODULE_DEVICE_TABLE(of, ipmmu_of_ids); + static int ipmmu_probe(struct platform_device *pdev) { struct ipmmu_vmsa_device *mmu; @@ -921,6 +941,7 @@ static int ipmmu_probe(struct platform_d mmu->num_utlbs = 32; spin_lock_init(&mmu->lock); bitmap_zero(mmu->ctx, IPMMU_CTX_MAX); + mmu->features = of_device_get_match_data(&pdev->dev); /* Map I/O memory and request IRQ. */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -940,7 +961,8 @@ static int ipmmu_probe(struct platform_d * Offset the registers base unconditionally to point to the non-secure * alias space for now. */ - mmu->base += IM_NS_ALIAS_OFFSET; + if (mmu->features->use_ns_alias_offset) + mmu->base += IM_NS_ALIAS_OFFSET; irq = platform_get_irq(pdev, 0); if (irq < 0) { @@ -998,11 +1020,6 @@ static int ipmmu_remove(struct platform_ return 0; } -static const struct of_device_id ipmmu_of_ids[] = { - { .compatible = "renesas,ipmmu-vmsa", }, - { } -}; - static struct platform_driver ipmmu_driver = { .driver = { .name = "ipmmu-vmsa",