Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751606AbdITOOC (ORCPT ); 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 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2358 Lines: 70 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(-) 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 "); -- 2.14.1