From patchwork Tue Aug 8 12:22:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 9888005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42F24601EB for ; Tue, 8 Aug 2017 12:24:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32AA328843 for ; Tue, 8 Aug 2017 12:24:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2764928859; Tue, 8 Aug 2017 12:24:17 +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=-1.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 97AAC28843 for ; Tue, 8 Aug 2017 12:24:16 +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:References:In-Reply-To: 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=KlXciAdv5ja8EHGFQPY3YdBZATB06Q/DgSQehKZE+ko=; b=n8XE0gnDhxArwo OFaslLSZpwwmGdM/rtklNLM+0piUolUSQlQyG+DQc/GePoYKbM7beM0x5cFEiJudyTOj3ofPVpDOr HcLCnghoEcG3DdizO6tHuinIvipkN7gC1dZpdLLDC8IPi8oeTp3xe4NtvicN0/GKZQbeLEBEI92VI gkBnVMyDtO3uIDFqMMB3Ip0ZBCbbI3fuPxcfs1h0M9SgWWGRuM6VWLgw8VoDYDNTU9EPEm7D57TxP dAbxhMJqC2psDcY+diST2SS6SZF4tKCESboqdnz1z6I2XKrovkyhUfLPz+uJkIbBYR+f4rR+IFNrb OXBcj0M4/npGXYrffchw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1df3YT-0004f2-En; Tue, 08 Aug 2017 12:24:13 +0000 Received: from mail-by2nam03on0089.outbound.protection.outlook.com ([104.47.42.89] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1df3Y5-0003yo-6I for linux-arm-kernel@lists.infradead.org; Tue, 08 Aug 2017 12:23:54 +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; bh=FncNozdikoNxCRa+ueVhYNd84sddRXAB1/tayza3vqs=; b=ocUHJ6aqhUxeRvWEg6S4V2aXlb8R0ngKchLaH8Y12nmeUWsjoNJEIcyaLB7hPb0LBDvO+KP9L4+G9UN1O64aVb4MOOLf1j2No3FIip47kMhJEMhU0rYFmELofUiRUFGjYiH8+sJxCr5y4lt0QN+Doa/EYNGWXpJNtrmTL3xsrlQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Robert.Richter@cavium.com; Received: from rric.localdomain (78.55.120.224) by CY1PR07MB2346.namprd07.prod.outlook.com (10.166.194.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Tue, 8 Aug 2017 12:23:28 +0000 From: Robert Richter To: Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH v3 3/8] irqchip/gic-v3-its: Split probing from its node initialization Date: Tue, 8 Aug 2017 14:22:53 +0200 Message-Id: <20170808122259.6299-4-rrichter@cavium.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170808122259.6299-1-rrichter@cavium.com> References: <20170808122259.6299-1-rrichter@cavium.com> MIME-Version: 1.0 X-Originating-IP: [78.55.120.224] X-ClientProxiedBy: AM5PR06CA0030.eurprd06.prod.outlook.com (10.167.168.43) To CY1PR07MB2346.namprd07.prod.outlook.com (10.166.194.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87f1a1d5-933a-4acb-2462-08d4de58474a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR07MB2346; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2346; 3:9GmFXG9Yf2MnYUcQsrj+Gv1RYKF22dLVpV9pPYEF61T2vvFA8XQ6N4YEbsLif+VdX/GBbAo/v3mCMeuwugOPVfv+i703WwQPcJCSTPNgbkN/vmgflxRXyT4HCv4y9+flb/mU8d+uFxL4L8toHATTu3R18HADj2IqFFYjjcJ2wkNdrX3/lpglf3iowKnh7twJWGSJCydQWodFZmVzNwp6cQCXX41s+0GpXQTa+QO8WG1GwG1f2392AnGQes2tfR8O; 25:nJUivf88IyZDQFov7g0Cos0GyOmnGZX7dopiGLd4LAGFUqzLJuu+MyX5IAeaXpgcRGbLRuCZwCWSFCaM+HLYZqOcWhK8/gU6H/3ye+LeKmjTIgIcSGmbPLTdc0SvUJKUJ0f/1VFxWsy8c+h2R/vY+cJ4fP+6w/80CAdU6sFFydUgvY2rdyLFiIzrJeBDkC6m9eJa7C5iMiWfaEaCz3S9g4nRm0PhnSJfdxt9Eb2rome161pd++fA3VSvfNJ1dwrKoxIMt+f1XdXQnR9Ur3UCrz00Il3JAtRyiHRP0cqicnJ4kBfBIP7WoEzZP+gy4X7hs391TQVE+irQs3/PWkr2mQ==; 31:62vmv5KvXPFuAcMYiIpVqZZqGyj3AA72ad6pGiVKszfG09cpFvIrXs38BrOPeFL1Zb+lo4FRsfXBoCgHnou6byyihp0Xmt+8p69o+KW6WLUYaTHCNp8r0JSKm2yWIChb1Ktv4MSLHLT48CZqUKxRIBi+uixP55L4IswqJfrkweNn9AtWoh6wvzVhmB97CIi1ajLckI/tCeFSv0fF8Nk3vz1eOauFF0a/7v8cq74QSLo= X-MS-TrafficTypeDiagnostic: CY1PR07MB2346: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2346; 20:2LwdjyC5PvIrlUZbISwLouoRHOmiOH1JyGj1Mc/2030MmoNdNDGUAlKpeWeF/z5QPuuzPUHv7c0r7WsKBItR7G59kRqiY4mQS5YP+oUAjoVWtSOOQyimTzWM6QqcqGoyOYOPJ/rVEeyvuYD6BJq/dX66mbfjrcZq21i11h2beJSytbuKyPVSJ2te4wLh+NfN3bbmuth908SY8ky41LhWX3hirhE7NX30LmscU+sTVTBDf5gt5kp9Iw624Uomgs+YNom7nLYSUp2iWafbHF+WYg7NVse5nhDaRCfYClfSgt/PS7J6Uh4BAZ/WocOlchX+egm6wowxDtekAvWAiYCbabFwpRUGqdt4r/LFwG3hkjanWKmo42wnDdvVKs/vVnrvS5YubjScjdFRa8NtMnJUPVNvEiQ00MZCwsm/F1XocvvbiG53uJwwHhVq271wljabzFFQCyvPsN+BdCv8mQ7h7SqcnW54H4TOF2DwFaFqiCuqaB5LqRW1qRSrHZW2blO2; 4:GxOQYYNhJjK0hy9X4ejGnZtAT9N7J1Tj8kyvTg7XLFt82qlByFRE/Fj3ZBKLDRkgJ6BVFqKqNb5BlQNh3gbSEBY7vcdKuy9XKEX/esj+e6lfBVhlKM8lqfQShGeVzn3cBTVxlhxMf2TadI4owICse0Ffe5ES2e7LbMAUD9LbFX384IWTQORkbnGlwOwB6lYRY78zqTtu6ZJH37WBQM/KVAkx0amhZzciG9RHCUo0QteKRlVgwRnjMLpUNfTpF9j9 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR07MB2346; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR07MB2346; X-Forefront-PRVS: 03932714EB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39840400002)(39410400002)(39850400002)(39400400002)(39450400003)(199003)(189002)(33646002)(66066001)(106356001)(68736007)(2950100002)(189998001)(54906002)(6116002)(3846002)(97736004)(72206003)(6666003)(81166006)(50226002)(6486002)(25786009)(5003940100001)(107886003)(38730400002)(4326008)(305945005)(50986999)(101416001)(5660300001)(42186005)(81156014)(230783001)(2906002)(7736002)(6512007)(36756003)(76176999)(1076002)(105586002)(7350300001)(6506006)(48376002)(47776003)(478600001)(53936002)(50466002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2346; H:rric.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2346; 23:1Yx93wy10NOVl+s/Ta3XCf2NWqAu8+kaYMg0geEGj?= =?us-ascii?Q?ZSJou9Kbom7I9CMDC2n7/IAmGZ7ZAlJuTFprraq13pcuIwdIpUGQNuy9Grsl?= =?us-ascii?Q?+B28L2ZZmSt8/zQH3oDc4lLDAof3lhqQOKAP3Wc+YHJhu4YjJbBQn+CuFOPq?= =?us-ascii?Q?upPh+ybpcMbaWfaiWKigIdKB4/g5PkI9GAr61zlq8ZSiKvQBEakNVDRvEVSj?= =?us-ascii?Q?gEjHo3MjGAiX0l9TwS+Lju5uol6RkCBbVgCOAbiVESiz74bCXFGvPV1zaUo+?= =?us-ascii?Q?SfF/dy5ACtBiCKd65JhdrBiU97MLSkavxOxQ+77s3hG2tg7gVvdjrxgz4gB/?= =?us-ascii?Q?GBto8ws6bpUUgQUgC06mq7byY9P03fT9kvtdFEShVEDlq+2r3RkaJg18nF8v?= =?us-ascii?Q?vBppaytwy6OI2f6icOoyqMdnXcoG/EwsugxwRoQetS1n3YkdQrrohTIOzFUd?= =?us-ascii?Q?UXKibHWK7wN8ASDbNW4IPHkvAB6eh3OLxW3ubS8xJKw1XjsBW25ofpfaonqp?= =?us-ascii?Q?+MyKtOWJoKORieMGbmLsdODcB/j94DJhASOttzZGxO1qLatsSlTb4rPrhHGP?= =?us-ascii?Q?YdBSA7J53hden+zwxvRzXnXjuErHkhAIIJn9o9McKecpmTYe2kO4RxLnan/C?= =?us-ascii?Q?NLV2L/LtsfeNKknaZZsltlwzh3ZvYyHBmTvea3BSFWQDskHBplLBMu3ZAGz8?= =?us-ascii?Q?AMmsVI4L5H9rWr8t0cDyfN6J9dugjr5Lu79L8mW5SdDOyG0ruJi7gEu5g/rG?= =?us-ascii?Q?rL4RsijQFD6UYOquSfhthQEy1js9q+voUVY04zS6/UUGqCHOwXOnLSFhLWtm?= =?us-ascii?Q?R+x64ko8H715OvFzwhit3i5iqwTzly1aC7mCwfBw8i4Uj4GxRQ1RNole+Mik?= =?us-ascii?Q?h8UcljUoA1qjDTZJ2n8B8oLm6eFQLdTJbot/He7FsfGgFDHaQv2tLiGtxRhg?= =?us-ascii?Q?VLdCb+24Fr2yU4J0CK5b4h8YM7VkKf7La0DHsG+ItYFN74L/fqA9gxf1JVQu?= =?us-ascii?Q?Jx6JFTHNQoEaTERvcTBitgEVdOupeto6I21OPSmycleK/GL3uEFNwoW6tfKB?= =?us-ascii?Q?Z5oFku2iG2ARUUXfT61vea/hq4O3VvI9B0GgJ96KutImT6H2wk5BhP8veeIi?= =?us-ascii?Q?a3JeykGW0kd1frquONvN8OHpkKVxdtNU7z0QBdliTBhaU5ZVEtGGwCaSlMLK?= =?us-ascii?Q?1MuN22kIZLuNy42l8Wadpa/bsM62sXaTQYXK4A4q1gMNIFpL2VhR0/UJTOhN?= =?us-ascii?Q?dG7rub+sguYcZ/1Cc8tAM8aIb2kgWktWuhcK4NkdbYYYe81/b/dPDWsLBpKt?= =?us-ascii?B?dz09?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2346; 6:zo7q/EeFzHgPLn7tDQu+2NU9RtUrmYcSWvfFQtfiyd8+aB2KCXXwxj1e8AdQ3dLqQNcUytYTUKmF6s+2/F+jsqFTzzgl3imIHgGD8t7wIb1+nZV+pmEV4U/Uov6qO89ptldqPqOmioAgE7kkV6gJZ9PhHsH6J+n3ORUzn2gYBPX96uXgx5eQ18lwm3GvB+QHMJSUTYyB3e/JbRMf4EQ3+2Xo56UcMDd+PJ691bWnCrvOw2AQKgSk1VoEjB1iD8bXGrUaGeqKNNviCKhfkZzr72QI13qQWlSkWWTtdiM8KTYB5JdZsmbSnnQr0yWdRFYwQ1NjN0U4ffem2zKs1DHPcQ==; 5:EsB2Hv4cps9kkAFMeNjkaWs9GbUI6JIBxC6dbWUNk79tWPMvUG5oYlVA9KRr/Lufn1Pb/K2LS/5Q9LDjzGUq1lFmB4wFJSp476uGCQ5+bVsHP2yhAItOV6zngvj3Y4j+HaIS2euQHk5KFXcFJMwnNw==; 24:h0IEijohWgvv17dCUPAvhpnLDaaCWHN/FSf/A3MYJIIJSdfxMZLcV7LTKW1mcLEA2Ap+4v4WewCZUFehpVSjqeeURSzrY0RJpMUesW/3J7Y=; 7:qajF8wWzxJ5D+Xvc/G/XWfLrPg918cQadlD6NiGccErzhdqyyM0pByKBa4YLNFI5zggsXx8wtCTrnIITsAUVvQ7fAASmSjlIMJTpX65WhUVj9LoYU4esSKa/CMk+XXmEZp8uUWnxdm25PnYJyqi6QGN6iGUThX4VzRkceLZonPp2NkHg700M6DyBYPJTJDHDmmsHOZs0A4Tjv/D+Iit2E5Dtw8svtNJedi8J0RT6jGA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2017 12:23:28.5142 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2346 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170808_052349_344069_30D8D3E2 X-CRM114-Status: GOOD ( 14.85 ) 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: Robert Richter , linux-arm-kernel@lists.infradead.org, Shanker Donthineni , linux-kernel@vger.kernel.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 To initialize the its nodes at a later point during boot, we need to split probing from initialization. Collect all information required for initialization in struct its_node. We can then use the its node list for initialization. Signed-off-by: Robert Richter --- drivers/irqchip/irq-gic-v3-its.c | 95 ++++++++++++++++++++++++++------------ drivers/irqchip/irq-gic-v3.c | 2 +- include/linux/irqchip/arm-gic-v3.h | 4 +- 3 files changed, 68 insertions(+), 33 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 92c66c86a63f..b51a1208588b 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -75,10 +75,12 @@ struct its_baser { * list of devices writing to it. */ struct its_node { + struct fwnode_handle *fwnode; raw_spinlock_t lock; struct list_head entry; void __iomem *base; phys_addr_t phys_base; + phys_addr_t phys_size; struct its_cmd_block *cmd_base; struct its_cmd_block *cmd_write; struct its_baser tables[GITS_BASER_NR_REGS]; @@ -1647,7 +1649,7 @@ static void its_enable_quirks(struct its_node *its) gic_enable_quirks(iidr, its_quirks, its); } -static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) +static int its_init_domain(struct its_node *its) { struct irq_domain *inner_domain; struct msi_domain_info *info; @@ -1656,7 +1658,7 @@ static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) if (!info) return -ENOMEM; - inner_domain = irq_domain_create_tree(handle, &its_domain_ops, its); + inner_domain = irq_domain_create_tree(its->fwnode, &its_domain_ops, its); if (!inner_domain) { kfree(info); return -ENOMEM; @@ -1672,55 +1674,83 @@ static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) return 0; } +static void its_free(struct its_node *its) +{ + spin_lock(&its_lock); + list_del(&its->entry); + spin_unlock(&its_lock); + + kfree(its); +} + +static int __init its_init_one(struct its_node *its); + static int __init its_probe_one(struct resource *res, struct fwnode_handle *handle, int numa_node) { struct its_node *its; + int err; + + its = kzalloc(sizeof(*its), GFP_KERNEL); + if (!its) + return -ENOMEM; + + raw_spin_lock_init(&its->lock); + INIT_LIST_HEAD(&its->entry); + INIT_LIST_HEAD(&its->its_device_list); + its->fwnode = handle; + its->phys_base = res->start; + its->phys_size = resource_size(res); + its->numa_node = numa_node; + + spin_lock(&its_lock); + list_add_tail(&its->entry, &its_nodes); + spin_unlock(&its_lock); + + pr_info("ITS %pR\n", res); + + err = its_init_one(its); + if (err) + its_free(its); + + return err; +} + +static int __init its_init_one(struct its_node *its) +{ void __iomem *its_base; u32 val; u64 baser, tmp; int err; - its_base = ioremap(res->start, resource_size(res)); + its_base = ioremap(its->phys_base, its->phys_size); if (!its_base) { - pr_warn("ITS@%pa: Unable to map ITS registers\n", &res->start); - return -ENOMEM; + pr_warn("ITS@%pa: Unable to map ITS registers\n", &its->phys_base); + err = -ENOMEM; + goto fail; } val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK; if (val != 0x30 && val != 0x40) { - pr_warn("ITS@%pa: No ITS detected, giving up\n", &res->start); + pr_warn("ITS@%pa: No ITS detected, giving up\n", &its->phys_base); err = -ENODEV; goto out_unmap; } err = its_force_quiescent(its_base); if (err) { - pr_warn("ITS@%pa: Failed to quiesce, giving up\n", &res->start); - goto out_unmap; - } - - pr_info("ITS %pR\n", res); - - its = kzalloc(sizeof(*its), GFP_KERNEL); - if (!its) { - err = -ENOMEM; + pr_warn("ITS@%pa: Failed to quiesce, giving up\n", &its->phys_base); goto out_unmap; } - raw_spin_lock_init(&its->lock); - INIT_LIST_HEAD(&its->entry); - INIT_LIST_HEAD(&its->its_device_list); its->base = its_base; - its->phys_base = res->start; its->ite_size = ((gic_read_typer(its_base + GITS_TYPER) >> 4) & 0xf) + 1; - its->numa_node = numa_node; its->cmd_base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(ITS_CMD_QUEUE_SZ)); if (!its->cmd_base) { err = -ENOMEM; - goto out_free_its; + goto out_unmap; } its->cmd_write = its->cmd_base; @@ -1762,13 +1792,11 @@ static int __init its_probe_one(struct resource *res, gits_write_cwriter(0, its->base + GITS_CWRITER); writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR); - err = its_init_domain(handle, its); + err = its_init_domain(its); if (err) goto out_free_tables; - spin_lock(&its_lock); - list_add_tail(&its->entry, &its_nodes); - spin_unlock(&its_lock); + pr_info("ITS@%pa: ITS node added\n", &its->phys_base); return 0; @@ -1776,11 +1804,10 @@ static int __init its_probe_one(struct resource *res, its_free_tables(its); out_free_cmd: free_pages((unsigned long)its->cmd_base, get_order(ITS_CMD_QUEUE_SZ)); -out_free_its: - kfree(its); out_unmap: iounmap(its_base); - pr_err("ITS@%pa: failed probing (%d)\n", &res->start, err); +fail: + pr_err("ITS@%pa: failed probing (%d)\n", &its->phys_base, err); return err; } @@ -1956,8 +1983,10 @@ static void __init its_acpi_probe(void) static void __init its_acpi_probe(void) { } #endif -int __init its_init(struct fwnode_handle *handle, struct rdists *rdists, - struct irq_domain *parent_domain) +static int __init its_init(void); + +int __init its_probe(struct fwnode_handle *handle, struct rdists *rdists, + struct irq_domain *parent_domain) { struct device_node *of_node; @@ -1974,5 +2003,11 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists, } gic_rdists = rdists; + + return its_init(); +} + +static int __init its_init(void) +{ return its_alloc_lpi_tables(); } diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index dbffb7ab6203..886e70ab2159 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -952,7 +952,7 @@ static int __init gic_init_bases(void __iomem *dist_base, set_handle_irq(gic_handle_irq); if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis()) - its_init(handle, &gic_data.rdists, gic_data.domain); + its_probe(handle, &gic_data.rdists, gic_data.domain); gic_smp_init(); gic_dist_init(); diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 6a1f87ff94e2..c4f9c968728f 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -492,8 +492,8 @@ struct rdists { struct irq_domain; struct fwnode_handle; int its_cpu_init(void); -int its_init(struct fwnode_handle *handle, struct rdists *rdists, - struct irq_domain *domain); +int its_probe(struct fwnode_handle *handle, struct rdists *rdists, + struct irq_domain *domain); static inline bool gic_enable_sre(void) {