From patchwork Thu Mar 17 16:29:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8612971 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 84D30C0553 for ; Thu, 17 Mar 2016 16:26:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD4C02026C for ; Thu, 17 Mar 2016 16:26:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 380EE20251 for ; Thu, 17 Mar 2016 16:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030587AbcCQQ0A (ORCPT ); Thu, 17 Mar 2016 12:26:00 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35366 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754508AbcCQQZ5 (ORCPT ); Thu, 17 Mar 2016 12:25:57 -0400 Received: by mail-pf0-f173.google.com with SMTP id n5so127113550pfn.2; Thu, 17 Mar 2016 09:25:56 -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=dA3GQB6uflwdE+DJTeTMoSKTK2V5sjDzLISa9Ya8/og=; b=onRVUBMzQNX+mHZOI35l2av/RYzgtcxU5s0sEvH6DyoYy4NJldfdzJ3LwXGmxEW4hj rTem0uLPhUD+/m0ZSLlILN2dQkmGJQ1698IHcTmDWK0IokW+HmwNefi6c0CAFNiPojcg ZMcZ8PwQD5wiAaf94Y6qBXDnMmvgSuxhJBMk/otNqjUbJSx9DKr3S7q9/Hfioa9XkMfv W4sAyGSeBEAR8BgNTMqL6eX5Nk/Mu6XvaDCBJTsvewrrnxyNkjTOYsOwwXEMLZ18JsVV xYRnpx26CQ3HCoy+Uq/USpdlx02749QvKU00a641cpFo4tXSO5vDSInoNRrdcYLVtx7y oL1Q== 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=dA3GQB6uflwdE+DJTeTMoSKTK2V5sjDzLISa9Ya8/og=; b=CuY+dDhLG8ZdWvqnTGjREqfTg7O8PEHZnXFUF++OBk01EFsdR1CNnFkNEJ7oT3rNTf xXxhlhelB6jGqQiqU7UWSyVAqspcISBbIxE8blIZvUFIpD/R/ySFkNZRpE/40W3Ifl6t DHge+tigCv+dTaLFSSkJLvNw1X8b8aUF7DrEMIzs2HW9m5v2D+BbkbK/8RZCXQgYJTLW /M3on4NMwVyJhmKdPAs2PLanPq1vhrLFkEIDrv6Te0RM+OCnT5pNSAV7JOmOGWRBjNZN WlViNWeArzCEUT9qnQuXuwGvfNMhNv9fZZA+Swn147AONK/o+MO5jFtjQeTVAwGGh32k jMyQ== X-Gm-Message-State: AD7BkJIT/ghDiPBiVwQlPJ/38EIMCY1Vp2m6cXydQ86JPLHDuKs56nXjuGZauuEjR59gaA== X-Received: by 10.66.140.70 with SMTP id re6mr16312276pab.100.1458231955642; Thu, 17 Mar 2016 09:25:55 -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 yh5sm14528561pab.13.2016.03.17.09.25.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Mar 2016 09:25:54 -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: Fri, 18 Mar 2016 01:29:18 +0900 Message-Id: <20160317162918.24104.29242.sendpatchset@little-apple> In-Reply-To: <20160317162909.24104.31682.sendpatchset@little-apple> References: <20160317162909.24104.31682.sendpatchset@little-apple> Subject: [PATCH 01/10] 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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.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 this is required. Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) --- 0014/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:12:22.950513000 +0900 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1016,18 +1017,22 @@ static struct platform_driver ipmmu_driv static int __init ipmmu_init(void) { - const struct iommu_ops *ops; + static bool setup_done; int ret; + if (setup_done) + return 0; + ret = platform_driver_register(&ipmmu_driver); if (ret < 0) return ret; - ops = IS_ENABLED(CONFIG_IOMMU_DMA) ? &ipmmu_ops_dma : &ipmmu_ops; - +#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) if (!iommu_present(&platform_bus_type)) - bus_set_iommu(&platform_bus_type, ops); + bus_set_iommu(&platform_bus_type, &ipmmu_ops); +#endif + setup_done = true; return 0; } @@ -1039,6 +1044,24 @@ 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) +{ + static const struct iommu_ops *ops = &ipmmu_ops_dma; + + ipmmu_init(); + + of_iommu_set_ops(np, (struct iommu_ops *)ops); + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, ops); + + 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");