From patchwork Wed Sep 20 14:13:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 113130 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp820357qgf; Wed, 20 Sep 2017 07:14:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB1mBfXif0C2iIOh8Mpt3mw5K6kZpwYDfo4HGX/foD/MZmpdeoXSv7V84UTYyYRKzI1S+Wr X-Received: by 10.84.238.132 with SMTP id v4mr2258839plk.176.1505916849034; Wed, 20 Sep 2017 07:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505916849; cv=none; d=google.com; s=arc-20160816; b=BoIZuzVxQRmBy89EYHFLAj35EVqd/kRM9KfstukTllXun5hXookwcIV4Z5N84rwU81 3mIiZ6sW8l42ni5e82ExlKZvaY+LDT/K3LPpQygMkNuzxpR/5x/ZhD7Gs9E92qT2MIi7 mh5R0v1Divk5wVyrppsJMQyEM7bfEt+IDZHxXh2Ax3wdL6YxLPofkQ0TnJ+gK+T3Rznt 8WHxf01IvXLUlfw8Nazkh5DvwZF25YU9vxppUlcHnts/1EV1jtGKKf4ZRBN3wu1dbNqw reMdaN6Kz1+oKXMRoKMUzGIZvhcJiea7B1peJWqfkEOHqdA5HUMm0SWrp09TNQ/HBJsh R+iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=STNXbk+KO0s2jgarXc6hT5R+7dyQuw9eAFH0HvjWB+c=; b=KN6VxC1PoaOH7ccDsQIe6g1lt2Q1t7yZlKHycxjr4JRzTX8FJ+F7zglcZFD/rWlqNi OJnc/uFZ+OxHgS2ZG+yk73o+JqHCGlARbzdE2jF4GL7AEGis8Qa3ChVI7+7708dTEkOv yVhIdzjteJzpn/ckkU38UmoOTTNlq0hnmpXL1QPWf6gfZBnHQJjzf+0c1jDZXmIUj0rh JzWBje4Xk94rNsVczSotimmY6FS7APS7sKY6UIU1UEJcoCGbJ0ucKIgYayztX+C5McUW CO8qgEH6CXL6arjiIK/6AX3RqmdWks+a3F39sk7cNNd2s8jiIbECfVLR872TcM2hSdCA 2B3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l23si3223020pgu.492.2017.09.20.07.14.05; Wed, 20 Sep 2017 07:14:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751610AbdITOOC (ORCPT + 26 others); Wed, 20 Sep 2017 10:14:02 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:59756 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750892AbdITOOB (ORCPT ); Wed, 20 Sep 2017 10:14:01 -0400 Received: from e110455-lin.cambridge.arm.com (e110455-lin.cambridge.arm.com [10.2.131.60]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id v8KEDhke013849; Wed, 20 Sep 2017 15:13:43 +0100 From: Liviu Dudau To: Laurent Pinchart Cc: Magnus Damm , Geert Uytterhoeven , Shawn Lin , Joerg Roedel , IOMMU ML , LKML Subject: [PATCH v2] iommu/ipmmu-vmsa: Do not replace bus IOMMU ops on driver init. Date: Wed, 20 Sep 2017 15:13:52 +0100 Message-Id: <20170920141352.29377-1-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170918100444.21878-1-Liviu.Dudau@arm.com> References: <20170918100444.21878-1-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the IPMMU driver is compiled in the kernel it will replace the platform bus IOMMU ops on running the ipmmu_init() function, regardless if there is any IPMMU hardware present or not. This screws up systems that just want to build a generic kernel that runs on multiple platforms and use a different IOMMU implementation. Move the bus_set_iommu() call at the end of the ipmmu_probe() function when we know that hardware is present. With current IOMMU framework it should be safe (at least for OF case). Now that the ipmmu_init() and ipmmu_exit() functions are simple calls to platform_driver_register() and platform_driver_unregister(), replace them with the module_platform_driver() macro call. Signed-off-by: Liviu Dudau Cc: Laurent Pinchart --- drivers/iommu/ipmmu-vmsa.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) -- 2.14.1 diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 195d6e93ac718..31912997bffdf 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -966,10 +966,11 @@ static int ipmmu_probe(struct platform_device *pdev) return ret; /* - * 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 - * ipmmu_init() after the probe function returns. + * Now that we have validated the presence of the hardware, set + * the bus IOMMU ops to enable future domain and device setup. */ + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &ipmmu_ops); platform_set_drvdata(pdev, mmu); @@ -1006,27 +1007,7 @@ static struct platform_driver ipmmu_driver = { .remove = ipmmu_remove, }; -static int __init ipmmu_init(void) -{ - int ret; - - ret = platform_driver_register(&ipmmu_driver); - if (ret < 0) - return ret; - - if (!iommu_present(&platform_bus_type)) - bus_set_iommu(&platform_bus_type, &ipmmu_ops); - - return 0; -} - -static void __exit ipmmu_exit(void) -{ - return platform_driver_unregister(&ipmmu_driver); -} - -subsys_initcall(ipmmu_init); -module_exit(ipmmu_exit); +module_platform_driver(ipmmu_driver); MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU"); MODULE_AUTHOR("Laurent Pinchart ");