Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933574AbbLONE2 (ORCPT ); Tue, 15 Dec 2015 08:04:28 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33866 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932176AbbLONE0 (ORCPT ); Tue, 15 Dec 2015 08:04:26 -0500 From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-sh@vger.kernel.org, joro@8bytes.org, linux-kernel@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Tue, 15 Dec 2015 22:06:04 +0900 Message-Id: <20151215130604.13535.42142.sendpatchset@little-apple> In-Reply-To: <20151215130508.13535.26186.sendpatchset@little-apple> References: <20151215130508.13535.26186.sendpatchset@little-apple> Subject: [PATCH/RFC 06/10] iommu/ipmmu-vmsa: Also use IOMMU_OF_DECLARE() Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2682 Lines: 97 From: Magnus Damm Hook up IOMMU_OF_DECLARE() support. The default case has the use_of_iommu feature disabled so the init order remains unchanged for the default case. Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) --- 0016/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2015-12-15 21:19:31.090513000 +0900 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include #include @@ -36,6 +38,7 @@ struct ipmmu_features { bool has_cache_leaf_nodes; bool setup_imbuscr; bool twobit_imttbcr_sl0; + bool use_of_iommu; }; struct ipmmu_vmsa_device { @@ -891,6 +894,7 @@ static const struct ipmmu_features ipmmu .has_cache_leaf_nodes = false, .setup_imbuscr = true, .twobit_imttbcr_sl0 = false, + .use_of_iommu = false, }; static const struct of_device_id ipmmu_of_ids[] = { @@ -1015,15 +1019,21 @@ 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; +#ifdef CONFIG_ARM if (!iommu_present(&platform_bus_type)) bus_set_iommu(&platform_bus_type, &ipmmu_ops); - +#endif + setup_done = true; return 0; } @@ -1035,6 +1045,29 @@ static void __exit ipmmu_exit(void) subsys_initcall(ipmmu_init); module_exit(ipmmu_exit); +static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np) +{ + const struct of_device_id *match; + const struct ipmmu_features *feature; + static const struct iommu_ops *ops = &ipmmu_ops; + + ipmmu_init(); + + match = of_match_node(ipmmu_of_ids, np); + if (match) { + feature = match->data; + if (feature->use_of_iommu) { + 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); + MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU"); MODULE_AUTHOR("Laurent Pinchart "); MODULE_LICENSE("GPL v2"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/