From nobody Thu Apr 9 13:57:38 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F01ACC433FE for ; Sat, 5 Nov 2022 21:49:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230146AbiKEVtL (ORCPT ); Sat, 5 Nov 2022 17:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230078AbiKEVsu (ORCPT ); Sat, 5 Nov 2022 17:48:50 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD77213DE7 for ; Sat, 5 Nov 2022 14:48:49 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DF302320027A; Sat, 5 Nov 2022 17:48:48 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 05 Nov 2022 17:48:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667684928; x=1667771328; bh=H8 veXpvoO34Pl6tFHer7gYF/PO/WldpA4cjeFDX9dV0=; b=BOQ+xVr9BgNBJ53Np2 2GVbC01Gy1k7LsisJ6a4HuFQ3aNwUYuzdzm3kSYYjx33wwfxPd0z3fECkRdEfz4F 62Ckj0vTqo+3S0f1R73TNu9D4AXuFNon1dbIpj9aF4IKjZk2tDFoPyojbI0oQ5Ix g4FwJgG5IO77IGz6Jr3cpRjq8dhQogtGz1IRhP3LwNipbhXviPOBoGB0/NIncCQX U6qCvJNceg91LP93s5iTTQdXCfCxWf/1fTzpJYAwa0dbpMGBt99el8lLAPM6Yp7U 8YPb8yfCQd5ZeWTXhK6J515XXEX+UQMNrnHpZaMMKsQ//xhb7epA0EqIw7JVLRUT T8bQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667684928; x=1667771328; bh=H8veXpvoO34Pl 6tFHer7gYF/PO/WldpA4cjeFDX9dV0=; b=ttfz6Ev9+nb8DRzIFbSUQXXoxy9ds MqMYAiRBBZ3/WgwsScVNN2kM2Sgat6JoK3cuvMFUt1Aoicg3XsJDkqDiCmPBy2CE xVzfbYRrCAn7ViWfA2DrzmRnqphG4AkBaJqKRIpfjTH3FZs6uwmdxs1RKs0MPlYY obe6NpNuqQ7Flq1zyG6ykN3p32xcz59OpwqWmcetbOYO38K/MBODaAO6H7SSz5a3 ZwZYYEKPHLxBZ5QkpWMj9Ehqi9tFw8tX6MgvREmHH1+IqcDUZtVj5K6BJLrIQb3l U9cQtO+CZYTwm+FzVVabUcWH9lVZBKk/yzLK2u3Qvnti3H5yt22pP7a3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdeggdefkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 5 Nov 2022 17:48:47 -0400 (EDT) From: Samuel Holland To: Dmitry Osipenko , "Rafael J . Wysocki" , Mark Rutland , Lorenzo Pieralisi Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Subject: [PATCH 2/2] firmware/psci: Switch to the sys-off handler API Date: Sat, 5 Nov 2022 16:48:40 -0500 Message-Id: <20221105214841.7828-3-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221105214841.7828-1-samuel@sholland.org> References: <20221105214841.7828-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Any other poweroff handlers registered at the default priority will run before the legacy pm_power_off() function. Register the PSCI poweroff handler with the correct priority to ensure it runs first. Signed-off-by: Samuel Holland --- drivers/firmware/psci/psci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index e7bcfca4159f..6d528021925d 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -322,9 +321,11 @@ static struct notifier_block psci_sys_reset_nb =3D { .priority =3D 129, }; =20 -static void psci_sys_poweroff(void) +static int psci_sys_poweroff(struct sys_off_data *data) { invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + + return NOTIFY_DONE; } =20 static int psci_features(u32 psci_func_id) @@ -603,7 +604,9 @@ static void __init psci_0_2_set_functions(void) =20 register_restart_handler(&psci_sys_reset_nb); =20 - pm_power_off =3D psci_sys_poweroff; + register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, + SYS_OFF_PRIO_FIRMWARE, + psci_sys_poweroff, NULL); } =20 /* --=20 2.37.3