From patchwork Thu Mar 8 05:01:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130939 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6062988lja; Wed, 7 Mar 2018 21:43:33 -0800 (PST) X-Google-Smtp-Source: AG47ELuJqcKXrjILuhAsbkvMEo20rQ4KqzQ6p2+YW4u2fa1I/Cs1no39KMorWY8Ma7k0Zls+evtx X-Received: by 10.99.96.206 with SMTP id u197mr19502829pgb.261.1520487813333; Wed, 07 Mar 2018 21:43:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520487813; cv=none; d=google.com; s=arc-20160816; b=KHBwGAruZnrOhMjPhCe+OIfM3l8BMXXJ/ilvwIIEDS7lTgC67uHjm4V27UDUZKcq6B UFMH/timIQvuc7Cf7rkt03t+qzNdjF3yrmbdJK0mPZ9bbAbMRRM/ZmWGG0MP1FQkh0IA 3t0LLfZaghQPuFFpRNGaLgOXN88i5/NFP1zvjcUGTnC0GCrMM1itutD5ZLphO4pYyLWq BDGmUhpO//ph7yIVKarZC+hA3/8g+DDJi+qwmPlmHQe3bRRjTJLI5UaU/35n8NstBPbV cm+gdGqW5aMtXRYqUl8bYKqbeChRA2sYhORLG9BbxJzpBTCDK0GgXukKfKVJJRe34q6A 5trw== 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=6tRrjzSlkmFVblkflnn8TqQvOWQrIxuEsb+vS8/igTY=; b=neH1lYLVa2SskjH1HdnK9cUIEnjTLWHRsFiFvY1s5Y33LtTaO8sDhWulEyDY9zV+oi PeZvYI6osxqAQ7g/bW0eszSUBxaUKl0ZuZuJ4nztGMQu7tdGRIXU/L1TOFY3yUGqU3jI E7n4K2sfPw9fcBeVGiLQ1wkeF7d25PHFcozN9LQ5An9wpoEImG8ujrLDoDIypp7itiAs 6yGGEb/DTH1pX78Dcw1pkYzsmlUnX0anUCTVXU5vmR71zJf+W7yIDFtjNBNe0FX66TNr 29mrbZ1HrPEx24dO7WCeT63t7+wOuoXM7HpUWSNhI0hLrsUCmXHTHIeZDVNOZbb1CKg2 7XQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=iJldpfRI; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 n14si8595697pgs.335.2018.03.07.21.43.33; Wed, 07 Mar 2018 21:43:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=iJldpfRI; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S966202AbeCHFna (ORCPT + 10 others); Thu, 8 Mar 2018 00:43:30 -0500 Received: from mail-bn3nam01on0098.outbound.protection.outlook.com ([104.47.33.98]:45409 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966201AbeCHFFT (ORCPT ); Thu, 8 Mar 2018 00:05:19 -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=6tRrjzSlkmFVblkflnn8TqQvOWQrIxuEsb+vS8/igTY=; b=iJldpfRIJLD/UYfbOt4HpXAmJdILhHJq6YaDDeLnK22A1Zk75KXZ+oQFE9OsXW/fYK+cWsmXJ5GK/77wqBXGUNo20+xkftc2bXCitGBDyAAwHhw7C3a2FbWEJdOCtWdgtVU/nlwq4uCPa2F4opjAIPbJAb+3eWlDf72SyipKd7o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1046.namprd21.prod.outlook.com (52.132.128.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.1; Thu, 8 Mar 2018 05:05:17 +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:05:17 +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.4 030/101] iommu/omap: Register driver before setting IOMMU ops Thread-Topic: [PATCH AUTOSEL for 4.4 030/101] iommu/omap: Register driver before setting IOMMU ops Thread-Index: AQHTtpqJMTlP5wCqZU6s+wxGYZ1qvw== Date: Thu, 8 Mar 2018 05:01:36 +0000 Message-ID: <20180308050023.8548-30-alexander.levin@microsoft.com> References: <20180308050023.8548-1-alexander.levin@microsoft.com> In-Reply-To: <20180308050023.8548-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; DM5PR2101MB1046; 7:reOOYV1Iwb4HxyIM9RMfJO9VBCAG41pDO0S6OY89jyKonkslYOzasNoYrYK73+5Mr3jqTYgBt+oixLXaAeHKm37JOelpgZeF9K/gnqEKjL5VrBnTO/Mfq+VG/WXap8NLMBZL+duvtaxkQUCAh5+9BvgfOJo5E47L7uO6xw0g76w8PynwzNX48I/Sy6BQLs6ozw9k7gipWXYivSnteI4AMvWVw3Ck0rEmXLCWbyg87mt7nSpZgbSLhDq1mhBn2DCz; 20:efY4MFSvW/40sqQX+B7NOlWNEsYhd9iggIQsHZRQkZQnkWMJsSGrZyeMDH+1gvWaiDUX8MP1AyoiZ8BEuvNlf9iDFpWkWtD6nM9MUpGfW4w5h2SYM+GZWW+uiHV0FbSqPQNyOY99FataQMXTsoUe3sDI0gLehfxMrROP5JPzXtU= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2f1f562c-19de-4645-0d01-08d584b22f39 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1046; x-ms-traffictypediagnostic: DM5PR2101MB1046: 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)(5005006)(8121501046)(3002001)(10201501046)(3231220)(944501244)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB1046; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1046; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(6486002)(53936002)(3660700001)(5660300001)(6436002)(6512007)(36756003)(3846002)(478600001)(105586002)(305945005)(6116002)(1076002)(2900100001)(72206003)(3280700002)(68736007)(7736002)(97736004)(22452003)(14454004)(6666003)(2501003)(106356001)(10090500001)(10290500003)(2950100002)(81156014)(25786009)(54906003)(107886003)(76176011)(6506007)(2906002)(110136005)(99286004)(26005)(186003)(86362001)(102836004)(81166006)(5250100002)(4326008)(8676002)(86612001)(316002)(8936002)(66066001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1046; 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: ycSMeM++Fj+iJPvpNS6i6ah69+fAni3QJ9TzjEzGLbWvxP+MK+ffdcsALJD9tMny5mO5B4Rs+SkZNPz3fUTCNGFuqP0bzKRX6QpC2/j1IJ0zF+S1pU7Y2VtMULj8ofiquzQh7sBEdt2NODqVO0Pmf1/uNwk4MvxjW7pnnHLqvcpE+J9n6DJpB4zqK9Hjn+MQpZd/ziuhJPsB8g1YvwMbvXjQscncSrOhWQQZMy/GZPVf2QU+rgqLCutyTgsP2F+9NUb/uxttw/9xr3YEn1BusH333Mauzj2pPsBmK5jauysa7yugPiPtGOu2VYxhhEjU1v+WAVtuF3KPETD1v6Q4QQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f1f562c-19de-4645-0d01-08d584b22f39 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 05:01:36.9510 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1046 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 3dc5b65f3990..b98d38f95237 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1295,6 +1295,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) @@ -1308,11 +1309,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 */