From patchwork Tue Feb 14 23:34:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13141018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1FCEC61DA4 for ; Tue, 14 Feb 2023 23:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xx9D1E2NPdhPJeGu/55O4B3/TqE0FBXxlCn9CZGhs1s=; b=CWgRWDz9tOzdDL crrUqDFDnToKBxQE5qlAjKxg/h6f3/fZ0JDjWulZAZyaS+CYRF9MC7ioqVWA+FWn5xaNDTwfUazj6 F2FcYLXfWea1Yv8ffo4ZkUCRde51h0S4fEovgq51Bo8l9+Kf2EbkiNfDUv5j/xBA6236yv0O+5ts1 m1odewbf2/9jRz8Ta/gWteYzr7+nkYRZ7shEtzS4ZQZRHNWtMHY+3M3SEuTeKxTIW1f4igdnEG3eW fX2sxJvG6+0/txdKfq99WoQi3/nuuavFb6xoa97JJHltYzQFm2J96Zb7NkYAknexFi+1epClsujsm HCiEeu13zDahXk26wr8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS4p5-003uNd-Sd; Tue, 14 Feb 2023 23:34:56 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS4op-003uHa-UG for linux-arm-kernel@lists.infradead.org; Tue, 14 Feb 2023 23:34:41 +0000 Received: by mail-pj1-x1033.google.com with SMTP id fu4-20020a17090ad18400b002341fadc370so371134pjb.1 for ; Tue, 14 Feb 2023 15:34:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BzzlaaQdOYO3fTmzqCVpPsOeF7R3YhY93EWeKNyYWH0=; b=IvW9sTrlPHiPPsZF8G2ve15uZyWaqOq/XVQXgfm/1diVn880slPNVRXM/r5KyifoEw PFZHYp5GVsGjLRZYEW+DZ8tZH8YeB80OJ1wJyo3pnyAlLFrkS6zQccV6L169volamnTO RNN/u6ka4ced0ycGXrHT0zf4251gNi5GQUYwFCtdoIE9KDp3glryKVq2NXHu0TlgR7eA j7jSF8fPFADaLnq8PCqbkHHBtPUP2EGf3fAIbP3CrH0ut0Vs4N6qEUqQcOCTPt+8GehG QMNatjojvfyUmBR0HHRiXIgZSDQBC1wbADkhzxPcSP8RBQPDVQIkS+bsXRBD1gHRg1nu mrXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BzzlaaQdOYO3fTmzqCVpPsOeF7R3YhY93EWeKNyYWH0=; b=KRaDxkumI6VHiNPK5kOnTsqY1WP2KsRFy18dju2xogUsBgQzFLd0X/J3wle8hxxFY/ jkjSIfaCHP0mYx7YrZF1uKaVly6Gt8sy+mvwl3yXlwJ+Vxwaui4H183ROG6Favp1OPI9 xFbEWLHKMA5r9DB6bfCrnaUpkU8kWMYoQwrHwNeN87SjGM0cWLjxcqP35ELdMTujCQRI 12hIs0LfXaO5B6r62Dn+SFpwgiaYoY0CALpKw7ILhZLIto8dk46G0KVJk5B7SKIg8Qfh hWE8cPTcLXNeoOK/CSVp1KSTA3+SJdmbg0O1gabiCixFr+3R9h89SyMeN60N5UIcZmSo F4wQ== X-Gm-Message-State: AO0yUKWJOSupGNn6n13nm2Z9k/vsVot/Ybvvrbozs7FUXUJvZ3NjlKnK wJtE0RmZv0MdTbVyjKgipdotgWaQPiOpmw== X-Google-Smtp-Source: AK7set9BGTlGDBkqA2RV3+Mzj3CGt3c9d1uqr420mbrkrYo47vCblWNGUgNZOkPfJepFh/G4XgnSsA== X-Received: by 2002:a17:902:e750:b0:199:1682:9175 with SMTP id p16-20020a170902e75000b0019916829175mr536755plf.8.1676417676473; Tue, 14 Feb 2023 15:34:36 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id f12-20020a170902684c00b001963a178dfcsm9434801pln.244.2023.02.14.15.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 15:34:35 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Thomas Gleixner , Marc Zyngier , Oliver Upton , linux-kernel@vger.kernel.org (open list:IRQCHIP DRIVERS), Sudeep Holla , Broadcom internal kernel review list Subject: [PATCH 2/3] irqchip/gic-v3: Propagate gic_cpu_pm_init() return code Date: Tue, 14 Feb 2023 15:34:25 -0800 Message-Id: <20230214233426.2994501-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214233426.2994501-1-f.fainelli@gmail.com> References: <20230214233426.2994501-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_153439_996228_814FE710 X-CRM114-Status: GOOD ( 14.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for allocating memory which may fail, propagate the return code from gic_cpu_pm_init(). Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-gic-v3.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index b60fadb7eb44..48b0e9aba27c 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1395,9 +1395,11 @@ static struct notifier_block gic_cpu_pm_notifier_block = { .notifier_call = gic_cpu_pm_notifier, }; -static void gic_cpu_pm_init(void) +static int gic_cpu_pm_init(void) { cpu_pm_register_notifier(&gic_cpu_pm_notifier_block); + + return 0; } #else @@ -1891,7 +1893,9 @@ static int __init gic_init_bases(void __iomem *dist_base, gic_dist_init(); gic_cpu_init(); gic_smp_init(); - gic_cpu_pm_init(); + err = gic_cpu_pm_init(); + if (err) + goto out_set_handle; if (gic_dist_supports_lpis()) { its_init(handle, &gic_data.rdists, gic_data.domain); @@ -1906,6 +1910,8 @@ static int __init gic_init_bases(void __iomem *dist_base, return 0; +out_set_handle: + set_handle_irq(NULL); out_free: if (gic_data.domain) irq_domain_remove(gic_data.domain);