From patchwork Thu Mar 8 04:59:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130948 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6092446lja; Wed, 7 Mar 2018 22:20:03 -0800 (PST) X-Google-Smtp-Source: AG47ELtGt8qKrFik7Iy15yfQ/htZkN9j5mIWCeKlJdud8xJZlU7fbYYaMuSVV5nezlprBzCeZSlK X-Received: by 2002:a17:902:12e:: with SMTP id 43-v6mr22933025plb.77.1520490003677; Wed, 07 Mar 2018 22:20:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520490003; cv=none; d=google.com; s=arc-20160816; b=XDPvZ2PdIikKGZhFzP1uQdYRT+PuWu2CucYgdYwb6uGO4IAP/7h/YYeG6Z+HEJjpah FXr+oxOtSkZyQA7bSsGYyga1i+sxu+/3pBjKqmJXXD1QxDNG90yIHgLdR/5QfMi3RfMl K4FCR3SPNhaj4/2cgNC5GHD7HLGTwwas/qJ5VSfexizEYP0GJLTpDWRLg4l8onz7yTms 7dG9t9hVj93yklxPtl5sjbudkK1ql5oeb0RbReohchafPFmVyRN0gUb6RjRwixoqJn6h qlCRuOHaWD6IpBOTBuBHCdW68VtJgXXjaigVZzM9Q/UEXhTx7fhRezT1UD1+keDdrT4r iBUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=+2YX6yFOoaakHaG+m17uY8q07e/c/pw58IHrjW5R5ig=; b=vlBSeM2YJu07jKoBXaQ2lVj9+jPEVvwlbCLY69KcBVN4vGqUaasG5kdyl7ZRfKeYR+ jGqDaQ9xhK3gTVZxKeBihPTlpkFkH9EUDbLsykl3PxGfA6bdKkNwqqewIzr0/RDt65WT CdVuHDizmS0XcILItPhIbXRrTupTSu5nqPc4+MOaAlyo0I02fpsISxLpjIRHdpv9KAur RcxiHfo2ng/yxdpwoTxQJsyp6rIRAhOFUqM5J5n2THqTmPgEVRAGDqwBaN1ATr4Yjl63 gskcNUVcXomocim+sRP+cLsym2TgKrYqdRxMIxKokJEzjyj/F/t0Bko/7nOJBAc9QIvo UfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SwSWc7fe; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j5si15164533pfe.334.2018.03.07.22.20.03; Wed, 07 Mar 2018 22:20:03 -0800 (PST) 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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SwSWc7fe; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965791AbeCHGT6 (ORCPT + 28 others); Thu, 8 Mar 2018 01:19:58 -0500 Received: from mail-sn1nam01on0095.outbound.protection.outlook.com ([104.47.32.95]:45505 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935421AbeCHFA6 (ORCPT ); Thu, 8 Mar 2018 00:00:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+2YX6yFOoaakHaG+m17uY8q07e/c/pw58IHrjW5R5ig=; b=SwSWc7fe8nYF7CqL161AXPyJJd57Digu8Yn5dgISOKquxAo0LW/CMruhMm5w6+MUol4ZtBdsgqvmO4f5t38jC6pIjVJmJF09aidG4ik7xdoFgPWMw1sFfccbsbMiT98k175nV9uxSTIevuN2ONNtBWby3zzWBiwNXxaTxuzeL7s= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1109.namprd21.prod.outlook.com (52.132.130.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 05:00:46 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 05:00:46 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Suman Anna , Joerg Roedel , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 055/190] iommu/omap: Register driver before setting IOMMU ops Thread-Topic: [PATCH AUTOSEL for 4.9 055/190] iommu/omap: Register driver before setting IOMMU ops Thread-Index: AQHTtpo1BMgL04AufEOFsoBl6y3hUg== Date: Thu, 8 Mar 2018 04:59:16 +0000 Message-ID: <20180308045810.8041-55-alexander.levin@microsoft.com> References: <20180308045810.8041-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045810.8041-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1109; 7:x0ajnLz2Urj5iHq5Q7eGcsVKjPzIRMzBIZD42NMbgmZ72NShA57f9bdDwLv3mT6p7aTNc+Etq9xqpJmwkmhNfrxCHUZRToZvh3d1MWIHu1yN6e5G8r+JDzdZbCWdsgCN4cKBeSs7AZnQMWbavhmyY6oGNFy+LJRkorxWwRLDvZ+P14634WIj+HDmVCTRhxkCuPmNQH5EH+4XS1Pr/uGQR2QbJNMgroLpEE267NmOCRhoINVK39hzbYBM3l/XUBpk; 20:GCknoPtUIbNYAvsblRbssiXOpFk7fUQlmDSlyzWOIyd3iNbkcZPnPDlfoyg2GjwSoTY4cSTkDTOA26nYfi555s84dJeHuqApj1SXNQKotXSzciE/rLSms3xqML7eFAydP3TT9Sm6LnDdouLg78BvXarS2+1DbFbvTMr8fKXdET4= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 35f886ef-0378-414b-a7ab-08d584b18e05 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1109; x-ms-traffictypediagnostic: DM5PR2101MB1109: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB1109; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1109; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(346002)(39380400002)(39860400002)(366004)(199004)(189003)(3660700001)(5250100002)(102836004)(6436002)(2501003)(81166006)(8936002)(6486002)(81156014)(53936002)(6512007)(8676002)(6506007)(5660300001)(86612001)(76176011)(10290500003)(86362001)(4326008)(105586002)(25786009)(10090500001)(26005)(2900100001)(316002)(106356001)(97736004)(54906003)(305945005)(7736002)(186003)(36756003)(22452003)(110136005)(14454004)(72206003)(6116002)(3846002)(68736007)(3280700002)(66066001)(2906002)(2950100002)(478600001)(6666003)(99286004)(1076002)(107886003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1109; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UKNjy4AR7cieWKv1d/zsaZYtBATHk9ZmsJ6og5bVv2jHf7aWKLsxG5YExBZOYVKBQwGnT2NyFC65hmneZ3oKmfzd92hEEyk9ViSHptXgum0t1jhzyDgLZ4lDhjQxSXMRthyoztfzwfwQ4Nt9ScxSm5gF0ktThx1+d1zF//vCIy3d7Xnh5bG7TsP2lncH7HhO1SOQX7HuQOy29UkHB3SAX5Keimqjv1Si5BJWfMCeNqMAjeBKPaEmBeC8/gWH1DK1z0PZIwWWcKcRDv4lIzYEsBlyHDj5y3apUwIgj5ec7U8GNAUbd8y4dJ2GIor6bXogvFZcXWPFrjX5jQkMHHqwSQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35f886ef-0378-414b-a7ab-08d584b18e05 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:59:16.2064 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1109 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna [ Upstream commit abaa7e5b054aae567861628b74dbc7fbf8ed79e8 ] Move the registration of the OMAP IOMMU platform driver before setting the IOMMU callbacks on the platform bus. This causes the IOMMU devices to be probed first before the .add_device() callback is invoked for all registered devices, and allows the iommu_group support to be added to the OMAP IOMMU driver. While at this, also check for the return status from bus_set_iommu. Signed-off-by: Suman Anna Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/omap-iommu.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index e2583cce2cc1..54556713c8d1 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1299,6 +1299,7 @@ static int __init omap_iommu_init(void) const unsigned long flags = SLAB_HWCACHE_ALIGN; size_t align = 1 << 10; /* L2 pagetable alignement */ struct device_node *np; + int ret; np = of_find_matching_node(NULL, omap_iommu_of_match); if (!np) @@ -1312,11 +1313,25 @@ static int __init omap_iommu_init(void) return -ENOMEM; iopte_cachep = p; - bus_set_iommu(&platform_bus_type, &omap_iommu_ops); - omap_iommu_debugfs_init(); - return platform_driver_register(&omap_iommu_driver); + ret = platform_driver_register(&omap_iommu_driver); + if (ret) { + pr_err("%s: failed to register driver\n", __func__); + goto fail_driver; + } + + ret = bus_set_iommu(&platform_bus_type, &omap_iommu_ops); + if (ret) + goto fail_bus; + + return 0; + +fail_bus: + platform_driver_unregister(&omap_iommu_driver); +fail_driver: + kmem_cache_destroy(iopte_cachep); + return ret; } subsys_initcall(omap_iommu_init); /* must be ready before omap3isp is probed */