From patchwork Wed Nov 28 14:43:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 10702795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9386915A8 for ; Wed, 28 Nov 2018 14:44:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78B7E2D581 for ; Wed, 28 Nov 2018 14:44:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CB222D509; Wed, 28 Nov 2018 14:44:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DBC122D57A for ; Wed, 28 Nov 2018 14:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JxmfHhm9gtxIwuL0+j6TduI4AIpgNXvR+XugKYOPc3s=; b=HoODd7Zr439Uh7 sX7yIpBlG1p9sLLM04d5Oc9hF0bn3odNzJeAZCJyuOnvBiBjr77zmR0V4Y5WRdYGoH9gF+pF9AKTF OWHScgtt6X1206RffQlzvb0IqwimkNQTsnn5qwrjBQ/1KKdQvjJG89LUWuFmLJ9VzaiTyfHyUYnvu 9FOXNSlnk2JtkTTKWo40YQJQ8njMNFU95zQIVZBG4c1dG96PXgSwsNqWFHD2gHkq1syvyPh6kqBPJ MCJar7wAo4GsCek/Zyf5pblqLRwf1TvWLZgell3+vGeadkkRAMilhzLacEJ+iOvjpqf8JGQbzVTbO w8KNidI1/cbCNIIuq4aw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gS14s-0004GV-RU; Wed, 28 Nov 2018 14:44:34 +0000 Received: from mail-eopbgr730041.outbound.protection.outlook.com ([40.107.73.41] helo=NAM05-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gS13s-00031A-Cg for linux-arm-kernel@lists.infradead.org; Wed, 28 Nov 2018 14:43:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1v6kKh3w8DKI6XhxuOY3njcmMYdey+u44Omf1y5S84A=; b=URrAnWxI1R6Gkfq+ThN9LUbWFuVM+fFFX8FvUk1E74GjpfvCPeyQ+cX5vzCGkXl20sOQ9aQFz7WWsZuIOzy/SMK61wTmB+UzVBYCgu7ZWIjlZ0TkhA0TRVC/JKJnBzKpcSSjD+AlhPWvO6L8LgWVEyEXASEYhcSggggs1wfx6g0= Received: from SN6PR07MB5326.namprd07.prod.outlook.com (52.135.105.33) by SN6PR07MB4269.namprd07.prod.outlook.com (52.135.89.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.16; Wed, 28 Nov 2018 14:43:19 +0000 Received: from SN6PR07MB5326.namprd07.prod.outlook.com ([fe80::ccc7:d111:7f3d:667d]) by SN6PR07MB5326.namprd07.prod.outlook.com ([fe80::ccc7:d111:7f3d:667d%4]) with mapi id 15.20.1361.018; Wed, 28 Nov 2018 14:43:19 +0000 From: Robert Richter To: Marc Zyngier , Thomas Gleixner , Jason Cooper , Stuart Yoder , Laurentiu Tudor Subject: [PATCH v2 05/10] fsl-mc/dprc-driver: Remove domain init order dependencies Thread-Topic: [PATCH v2 05/10] fsl-mc/dprc-driver: Remove domain init order dependencies Thread-Index: AQHUhyi0qFdjTljGQU2/GluYiC9iqw== Date: Wed, 28 Nov 2018 14:43:19 +0000 Message-ID: <20181128144240.28727-6-rrichter@cavium.com> References: <20181128144240.28727-1-rrichter@cavium.com> In-Reply-To: <20181128144240.28727-1-rrichter@cavium.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0042.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::19) To SN6PR07MB5326.namprd07.prod.outlook.com (2603:10b6:805:73::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Robert.Richter@cavium.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [77.14.124.106] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN6PR07MB4269; 6:IiDzMSj3Y7nYs0NGN+hwht0rNSKcpJl4b5J4T4HgL9IczbX08AymcmIQg+HIZvVLNTpGtEIcVSGnsM/nGPgZP2bA66UQqmGzFxR3p1IBUN7TzO9dWdjvKi8Rir4zzDTFriFHcLAwLQrxfd1oOEVVfP+86j6m6eLK1zZCbsGK0yI+fGwS801BGtPuvO1WCh/7Vygmgd9m0GxtoF3dD9sNinfyuEx641qUZ2RAA/gnnCiExTTvFriYusGzMwoHS62G3+G55jd9eyKhu61BMIeveqIlpZ5m6+1Mg96lIQldi+7415uF9FSM2MOuIqh+3SEUTE+iNQx3mk1CUQfNV8Fcceq6cXgRO1GI5PpSXk4M0JcI0KJ7KrE+W7bCSJop117YAmaI/I8Ug166Xgk/whvQfh4GSn8Dm8ch+Qd+nJrLS7qIxPkTacR7uZyssBFfjxog8kWYBeafc2+ZtSkKDru0AA==; 5:N5QMj/3v5kUB1Ok5f/Nz/oDbLIJGYCOgkJaN9t1cKLs5gtfZlZIA6oMlG7rRq1QQXzLZ9SrRTMvhpvCUrAxQCI5DtA989O9TOlQyS6TukIoFUWc7Vom7Mj+AnlqPST2uYE20KmIeYt1vOZcqE3Kn3opo0OGaHGsjLqIbJaca+lk=; 7:hOCh7JddnjWORnrCCmoM1hULJVI4PnhmEOZOzYjWNPXXykqFJuBRwkPq5y2POQGxT69JZNnL1tJV2yCMsbn2G4hbB5igdWTQpi0t/akfLd20OJik+7B9VPCAXMe5PNr9hijVIV+cWAXMSPjKykSMpw== x-ms-office365-filtering-correlation-id: 19a8e64c-f72a-4bb5-3d32-08d6553fd68b x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN6PR07MB4269; x-ms-traffictypediagnostic: SN6PR07MB4269: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231443)(999002)(944501410)(52105112)(10201501046)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:SN6PR07MB4269; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4269; x-forefront-prvs: 0870212862 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(39860400002)(136003)(366004)(199004)(189003)(3846002)(4326008)(97736004)(14444005)(105586002)(106356001)(110136005)(8936002)(81156014)(66066001)(54906003)(71200400001)(81166006)(256004)(71190400001)(316002)(6486002)(14454004)(8676002)(2906002)(39060400002)(186003)(76176011)(52116002)(6116002)(6506007)(68736007)(7416002)(25786009)(72206003)(478600001)(1076002)(53936002)(6512007)(99286004)(446003)(26005)(11346002)(6436002)(476003)(102836004)(7736002)(36756003)(305945005)(5660300001)(386003)(2616005)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4269; H:SN6PR07MB5326.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: woZ1/ylx1G6aqHPdyjLJEnu9Ly6z8QBo7p1jPv5ScAlDsiBNGGj6EZglMf8Acuxz6ySido8sMMVhIR9dNOKQiSdfFW1c2rGGchGCT6y1uI1/kZqGnVpaMyqiJosGOaeX6yAH6Y8md6ccTG+QIppGlg/cpuKsyDctxYtym5bZ8Beksg4z6g7Q4bH+hismhnwEMrFoNOlx+IrEfujUNcmsdQcvLiapDdYTAHoR301j/qKXoiuPZuqJLsZi6KM66XyAHagS8jMALKx4U1RJ+GSey3vYSFQmtJPVd1vR7+fpehL2s0hqVsvbsvHq+oxXnddYIWXADPwatQfxEJ3aG2sgyHoaF0eXuUwrypWpBU2qXJc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19a8e64c-f72a-4bb5-3d32-08d6553fd68b X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2018 14:43:19.5878 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4269 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181128_064332_564483_B11855BD X-CRM114-Status: GOOD ( 16.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Julien Thierry , Will Deacon , "linux-kernel@vger.kernel.org" , "Richter, Robert" , Matthias Brugger , "linux-arm-kernel@lists.infradead.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use new irq_domain_request_host_*() interface which allows independent parent and child initialization using an irq domain request handler. This makes it possible to move its initialization to a later point during boot. All domains can be initialized in the same initcall level then. Signed-off-by: Robert Richter --- drivers/bus/fsl-mc/dprc-driver.c | 41 ++++++++++++++++++++++++++++++++++++++++ drivers/bus/fsl-mc/fsl-mc-msi.c | 6 +----- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c index 52c7e15143d6..2f41886c8e00 100644 --- a/drivers/bus/fsl-mc/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -10,7 +10,9 @@ #include #include #include +#include #include +#include #include #include "fsl-mc-private.h" @@ -575,6 +577,40 @@ static int dprc_setup_irq(struct fsl_mc_device *mc_dev) return error; } +static int dprc_probe(struct fsl_mc_device *mc_dev); + +static int dprc_probe_late(struct irq_domain *parent, void *priv) +{ + struct fsl_mc_device *mc_dev = priv; + + of_node_put(mc_dev->dev.parent->of_node); + of_node_put(irq_domain_get_of_node(parent)); + + return dprc_probe(mc_dev); +} + +static int dprc_register_msi_domain(struct fsl_mc_device *mc_dev) +{ + struct device_node *mc_of_node, *msi_np; + int err = -EINVAL; + + mc_of_node = of_node_get(mc_dev->dev.parent->of_node); + + msi_np = of_parse_phandle(mc_of_node, "msi-parent", 0); + if (msi_np && !of_property_read_bool(msi_np, "#msi-cells")) + err = irq_domain_request_host(msi_np, DOMAIN_BUS_FSL_MC_MSI, + dprc_probe_late, mc_dev); + + if (err) { + pr_err("Unable to find fsl-mc MSI domain for %pOF\n", + mc_of_node); + of_node_put(msi_np); + of_node_put(mc_of_node); + } + + return err; +} + /** * dprc_probe - callback invoked when a DPRC is being bound to this driver * @@ -641,6 +677,11 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) error = fsl_mc_find_msi_domain(parent_dev, &mc_msi_domain); + + if (error == -ENOENT) + /* initialize later */ + return dprc_register_msi_domain(mc_dev); + if (error < 0) { dev_warn(&mc_dev->dev, "WARNING: MC bus without interrupt support\n"); diff --git a/drivers/bus/fsl-mc/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c index 8b9c66d7c4ff..550d2ed07f69 100644 --- a/drivers/bus/fsl-mc/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -185,12 +185,8 @@ int fsl_mc_find_msi_domain(struct device *mc_platform_dev, msi_domain = of_msi_get_domain(mc_platform_dev, mc_of_node, DOMAIN_BUS_FSL_MC_MSI); - if (!msi_domain) { - pr_err("Unable to find fsl-mc MSI domain for %pOF\n", - mc_of_node); - + if (!msi_domain) return -ENOENT; - } *mc_msi_domain = msi_domain; return 0;