From patchwork Mon Oct 16 12:29:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 10008209 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 9683260230 for ; Mon, 16 Oct 2017 12:33:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CD9A2855E for ; Mon, 16 Oct 2017 12:33:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 815442841E; Mon, 16 Oct 2017 12:33:55 +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 6F00828563 for ; Mon, 16 Oct 2017 12:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbdJPMb7 (ORCPT ); Mon, 16 Oct 2017 08:31:59 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:45309 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752146AbdJPMb5 (ORCPT ); Mon, 16 Oct 2017 08:31:57 -0400 Received: by mail-pf0-f193.google.com with SMTP id d28so15728040pfe.2; Mon, 16 Oct 2017 05:31:57 -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=/uzXpq8tGn1aL7/KL4AWJ40VG2aEVJsxabKkxHGHPFs=; b=DIzI78f4+yfG8ndjrJiXxJ52xQ2PdJqwSswCmaf/kA2T/CHLZ1hFvTaJrgiLSmQ2Ju k9H1hKCYyG0e0LFaKzOJ6LyDsRCEUSUUO+DTrbhcyIZLYGjCuU1dyuB8dkelHeKxdg1n aXKYn2/ekbQFC3qD/Q9j4OD+ZT8uDgpmIl5NJZrbRyFv5ro+fUfrzK3r3X5RiN+5M2lo PfC3uz1moh+LG8QdpzL4HMtt5MRocHulhfBVvtcyVmlKURe933YOi+hwTPOsc10WOEmy kiqHxM+JOMgt5fCVxCDGEVjJpQFWeJbSXCvvsdYytnn658AcROcFWHahLWPOceYZ8noh 78SQ== 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=/uzXpq8tGn1aL7/KL4AWJ40VG2aEVJsxabKkxHGHPFs=; b=kIvQ4jzn48nhsFf0wmgoj9W1kYHc//mydTkdXTvzugcACLD5G4kdUkEaK3TPxCWwja FfztEHngVFcAe0AK0WR2Y+b3/OTwa+q7mVAahaFHeR65xmaqPgxfUfZrT1ROzGyz02M5 MIaRwZME4h7lZtAX0QWXZOTevhOacX/HR3hAQGjwKhJQv+BWj3SI2yfRg/n6LqMRSz4p cmXNoEU1gau8PtrrK+4+1aqRIDlR5CfC/ZFqS3GxwbMBZ5/v8Cc4pFZ6xwBV6f3mUetg +EUgA0RpHrgvHOBCuqYfPP6tY3PkDakx4jN9uhET+DKchOObFRFJ5XNWcH6FhXe0zeYN WfEg== X-Gm-Message-State: AMCzsaXBklSP275HCmaZ5JjYpLKvt1o+dwZViJGMlRq+Pv9wFPZ/mrR2 Hg5+ejUDG7CgktHyzPk2kqU= X-Google-Smtp-Source: AOwi7QBtPNOp1KURN5Xpt8GpDn3WdRfBBlM7dtNLbyAxErw0gBgam1JJSM5BjNSysTGzZIMN/t853Q== X-Received: by 10.98.141.65 with SMTP id z62mr8594810pfd.186.1508157117238; Mon, 16 Oct 2017 05:31:57 -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 l23sm15062959pfg.83.2017.10.16.05.31.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 05:31:55 -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, 16 Oct 2017 21:29:57 +0900 Message-Id: <150815699719.32763.12935676055004739612.sendpatchset@little-apple> In-Reply-To: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> References: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> Subject: [PATCH v5 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 V4: - Use ipmmu_is_root() instead of now removed is_leaf flag Changes since V3: - Reworked to fit on top of [PATCH 00/04] iommu/ipmmu-vmsa: 32-bit ARM update 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 | 50 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) --- 0014/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-10-16 19:59:42.700607110 +0900 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1055,17 +1056,30 @@ static int ipmmu_probe(struct platform_d ipmmu_device_reset(mmu); } - ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL, - dev_name(&pdev->dev)); - if (ret) - return ret; + /* + * 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 || !ipmmu_is_root(mmu)) { + ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL, + dev_name(&pdev->dev)); + if (ret) + return ret; - iommu_device_set_ops(&mmu->iommu, &ipmmu_ops); - iommu_device_set_fwnode(&mmu->iommu, &pdev->dev.of_node->fwnode); + iommu_device_set_ops(&mmu->iommu, &ipmmu_ops); + iommu_device_set_fwnode(&mmu->iommu, + &pdev->dev.of_node->fwnode); - ret = iommu_device_register(&mmu->iommu); - if (ret) - return ret; + ret = iommu_device_register(&mmu->iommu); + if (ret) + return ret; + +#if defined(CONFIG_IOMMU_DMA) + 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 @@ -1105,15 +1119,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; } @@ -1125,6 +1146,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");