From: Samuel Holland <samuel@sholland.org>
To: Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
Sudeep Holla <sudeep.holla@arm.com>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Cc: Samuel Holland <samuel@sholland.org>,
John Ogness <john.ogness@linutronix.de>,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Petr Mladek <pmladek@suse.com>,
YueHaibing <yuehaibing@huawei.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, tangmeng <tangmeng@uniontech.com>
Subject: [PATCH v2 2/2] firmware/psci: Switch to the sys-off handler API
Date: Sun, 1 Jan 2023 12:17:15 -0600 [thread overview]
Message-ID: <20230101181715.42199-3-samuel@sholland.org> (raw)
In-Reply-To: <20230101181715.42199-1-samuel@sholland.org>
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.
PSCI_0_2_FN_SYSTEM_OFF never returns, so the value returned from
psci_sys_poweroff() is meaningless, but that function must return
some value to have the right prototype for a notifier callback.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
Changes in v2:
- Update commit messages
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 <linux/errno.h>
#include <linux/linkage.h>
#include <linux/of.h>
-#include <linux/pm.h>
#include <linux/printk.h>
#include <linux/psci.h>
#include <linux/reboot.h>
@@ -322,9 +321,11 @@ static struct notifier_block psci_sys_reset_nb = {
.priority = 129,
};
-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;
}
static int psci_features(u32 psci_func_id)
@@ -603,7 +604,9 @@ static void __init psci_0_2_set_functions(void)
register_restart_handler(&psci_sys_reset_nb);
- pm_power_off = psci_sys_poweroff;
+ register_sys_off_handler(SYS_OFF_MODE_POWER_OFF,
+ SYS_OFF_PRIO_FIRMWARE,
+ psci_sys_poweroff, NULL);
}
/*
--
2.37.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-01 18:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-01 18:17 [PATCH v2 0/2] firmware/psci: Switch to the sys-off handler API Samuel Holland
2023-01-01 18:17 ` [PATCH v2 1/2] kernel/reboot: Use the static sys-off handler for any priority Samuel Holland
2023-01-01 18:17 ` Samuel Holland [this message]
2023-01-25 16:50 ` [PATCH v2 2/2] firmware/psci: Switch to the sys-off handler API Sudeep Holla
2023-01-25 12:53 ` [PATCH v2 0/2] " Dmitry Osipenko
2023-02-07 3:32 ` Samuel Holland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230101181715.42199-3-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=dmitry.osipenko@collabora.com \
--cc=john.ogness@linutronix.de \
--cc=kai.heng.feng@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mcgrof@kernel.org \
--cc=pmladek@suse.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sudeep.holla@arm.com \
--cc=tangmeng@uniontech.com \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox