[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1412659726-29957-43-git-send-email-linux@roeck-us.net>
Date: Mon, 6 Oct 2014 22:28:44 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: linux-kernel@...r.kernel.org
Cc: adi-buildroot-devel@...ts.sourceforge.net,
devel@...verdev.osuosl.org, devicetree@...r.kernel.org,
lguest@...ts.ozlabs.org, linux-acpi@...r.kernel.org,
linux-alpha@...r.kernel.org, linux-am33-list@...hat.com,
linux-cris-kernel@...s.com, linux-efi@...r.kernel.org,
linux-hexagon@...r.kernel.org, linux-m32r-ja@...linux-m32r.org,
linuxppc-dev@...ts.ozlabs.org, linux-s390@...r.kernel.org,
linux-tegra@...r.kernel.org, linux-xtensa@...ux-xtensa.org,
openipmi-developer@...ts.sourceforge.net,
user-mode-linux-devel@...ts.sourceforge.net,
linux-arm-kernel@...ts.infradead.org, linux-c6x-dev@...ux-c6x.org,
linux-ia64@...r.kernel.org, linux-m68k@...ts.linux-m68k.org,
linux-metag@...r.kernel.org, linux-mips@...ux-mips.org,
linux-parisc@...r.kernel.org, linux-pm@...r.kernel.org,
linux-sh@...r.kernel.org, xen-devel@...ts.xenproject.org,
Guenter Roeck <linux@...ck-us.net>,
Matt Fleming <matt.fleming@...el.com>
Subject: [PATCH 42/44] efi: Register poweroff handler with kernel poweroff handler
Register with kernel poweroff handler instead of setting pm_power_off
directly. Register with low priority value of 64 since the efi code
states that this is a poweroff handler of last resort.
Cc: Matt Fleming <matt.fleming@...el.com>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
drivers/firmware/efi/reboot.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
index 9c59d1c..c082439 100644
--- a/drivers/firmware/efi/reboot.c
+++ b/drivers/firmware/efi/reboot.c
@@ -3,6 +3,8 @@
* Copyright (c) 2014 Red Hat, Inc., Mark Salter <msalter@...hat.com>
*/
#include <linux/efi.h>
+#include <linux/notifier.h>
+#include <linux/pm.h>
#include <linux/reboot.h>
int efi_reboot_quirk_mode = -1;
@@ -38,19 +40,32 @@ bool __weak efi_poweroff_required(void)
return false;
}
-static void efi_power_off(void)
+static int efi_power_off(struct notifier_block *this,
+ unsigned long unused1, void *unused2)
{
efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
+
+ return NOTIFY_DONE;
}
+static struct notifier_block efi_poweroff_nb = {
+ .notifier_call = efi_power_off,
+ .priority = 64,
+};
+
static int __init efi_shutdown_init(void)
{
+ int ret = 0;
+
if (!efi_enabled(EFI_RUNTIME_SERVICES))
return -ENODEV;
- if (efi_poweroff_required())
- pm_power_off = efi_power_off;
+ if (efi_poweroff_required()) {
+ ret = register_poweroff_handler(&efi_poweroff_nb);
+ if (ret)
+ pr_err("efi: Failed to register poweroff handler\n");
+ }
- return 0;
+ return ret;
}
late_initcall(efi_shutdown_init);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists