From patchwork Wed Mar 8 11:02:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9610915 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 5B3E560414 for ; Wed, 8 Mar 2017 11:34:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60AB428543 for ; Wed, 8 Mar 2017 11:34:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54E262856E; Wed, 8 Mar 2017 11:34: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 D240528543 for ; Wed, 8 Mar 2017 11:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbdCHLdq (ORCPT ); Wed, 8 Mar 2017 06:33:46 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33418 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752095AbdCHLdn (ORCPT ); Wed, 8 Mar 2017 06:33:43 -0500 Received: by mail-pf0-f194.google.com with SMTP id v190so3533421pfb.0; Wed, 08 Mar 2017 03:33:41 -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=S43NRI2njLwHQ6Ft93fU/Uqsr4BA1nZt2dSiMAPPjtM=; b=dlLLqz9pCAXB4ctEolCLeEAGYdZZrQqOs6bbSr1lmJvZnm6zYDzzrm2NFMItazoOyR ZX5c81paIDAyeeqAGZgnFrGVZkQ6vK/+OKKhqLdR3FncPgHftP2kk7A4SKcohVCGlS2M vZJH3qGky4xskUeILC52WH5HRwGjjiSPb5rEeikXk6nRYpOZmzus626FpXrdHSioxxRu yTZVqvLeg1NHsGDAF/JieLhEwLG+BiYZem/L/8gWJxpLBOcnKmGeVEVTlQSR+pGRBTyH HCjNo/Jru4a8HDNl3KgsF83C6aWYdlPAc2iI/3b8tNXiVPKNyVq3hqAnkzyMeCU6GhX6 ZUUA== 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=S43NRI2njLwHQ6Ft93fU/Uqsr4BA1nZt2dSiMAPPjtM=; b=dLWUJ7ef+PfaAjuTnzF3ILiUglcs6D4QPZpYzdrX8DTXWrCaxAsYMif1N8iOa2vqyS AFxdmr3FbWEWadVxP9WW0s/XyQ3yktLDYEFUDsMtfBqJAmMZY5bjv9OOc3C0HK5GGewj 5GKRnvg5pZsMUt3P51wv6vrWHb6zNSvLOmUzT+YWMHTy2EITzkCOhjLjiyqvzInsjwW9 RYNot0Rn4jYtKDNucQcqjwfztxPpA/FVreWPcW4dWXFd7wAGwkMx8I8nPle84MKIOWR4 6jOVezXJS/A3gY3YwiyJg7GTJ8Xd0tr17zDcKv/EEEtPZdYDfp3oBPLBNuZrjFPD6slG W++Q== X-Gm-Message-State: AMke39l9OdwZ/dvjnJAHEBn5SZYc0H6W0mV/lKAFKElWmp8Uw2LQGVhV8K6icu4jj6/NVw== X-Received: by 10.84.232.5 with SMTP id h5mr7789559plk.134.1488971265297; Wed, 08 Mar 2017 03:07:45 -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 80sm5522833pfy.67.2017.03.08.03.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 03:07:43 -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:03 +0900 Message-Id: <148897092335.16106.10892669490439039957.sendpatchset@little-apple> In-Reply-To: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> References: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> Subject: [PATCH v3 04/09] iommu/ipmmu-vmsa: Make use of IOMMU_OF_DECLARE() 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 Hook up IOMMU_OF_DECLARE() support in case CONFIG_IOMMU_DMA is enabled. The only current supported case for 32-bit ARM is disabled, however for 64-bit ARM usage of OF is required. Signed-off-by: Magnus Damm --- Changes since V2: - Reworked registration code to make use of recently introduced: iommu_device_register() iommu_device_set_ops() iommu_device_set_fwnode() Changes since V1: - Reworked slightly to fit updated patch order and [PATCH v3 00/06] iommu/ipmmu-vmsa: IPMMU multi-arch update V3 drivers/iommu/ipmmu-vmsa.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) --- 0012/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-03-08 19:08:31.610607110 +0900 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ struct ipmmu_features { struct ipmmu_vmsa_device { struct device *dev; void __iomem *base; + struct iommu_device iommu; struct list_head list; const struct ipmmu_features *features; bool is_leaf; @@ -1161,6 +1163,25 @@ static int ipmmu_probe(struct platform_d ipmmu_device_reset(mmu); } +#if defined(CONFIG_IOMMU_DMA) + /* + * Register the IPMMU to the IOMMU subsystem in the following cases: + * - R-Car Gen2 IPMMU (all devices registered) + * - R-Car Gen3 IPMMU (leaf devices only - skip root IPMMU-MM device) + */ + if (!mmu->features->has_cache_leaf_nodes || mmu->is_leaf) { + ret = iommu_device_register(&mmu->iommu); + if (ret) + return ret; + + iommu_device_set_ops(&mmu->iommu, &ipmmu_ops); + iommu_device_set_fwnode(&mmu->iommu, + &pdev->dev.of_node->fwnode); + + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &ipmmu_ops); + } +#endif /* * We can't create the ARM mapping here as it requires the bus to have * an IOMMU, which only happens when bus_set_iommu() is called in @@ -1204,15 +1225,22 @@ static struct platform_driver ipmmu_driv static int __init ipmmu_init(void) { + static bool setup_done; int ret; + if (setup_done) + return 0; + ret = platform_driver_register(&ipmmu_driver); if (ret < 0) return ret; +#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) if (!iommu_present(&platform_bus_type)) bus_set_iommu(&platform_bus_type, &ipmmu_ops); +#endif + setup_done = true; return 0; } @@ -1224,6 +1252,17 @@ static void __exit ipmmu_exit(void) subsys_initcall(ipmmu_init); module_exit(ipmmu_exit); +#ifdef CONFIG_IOMMU_DMA +static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np) +{ + ipmmu_init(); + return 0; +} + +IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", + ipmmu_vmsa_iommu_of_setup); +#endif + MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU"); MODULE_AUTHOR("Laurent Pinchart "); MODULE_LICENSE("GPL v2");