From: Robin Holt <holt@sgi.com>
To: akpm@linux-foundation.org
Cc: Robin Holt <holt@sgi.com>, "H. Peter Anvin" <hpa@zytor.com>,
Miguel Boton <mboton.lkml@gmail.com>, Russ Anderson <rja@sgi.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
the arch/x86 maintainers <x86@kernel.org>,
Arm Mailing List <linux-arm-kernel@lists.infradead.org>
Subject: [PATCH -v11 resend 06/11] x86, prepare reboot_mode for moving to generic kernel code.
Date: Thu, 6 Jun 2013 06:47:19 -0500 [thread overview]
Message-ID: <1370519244-49918-7-git-send-email-holt@sgi.com> (raw)
In-Reply-To: <1370519244-49918-1-git-send-email-holt@sgi.com>
This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.
Signed-off-by: Robin Holt <holt@sgi.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Miguel Boton <mboton.lkml@gmail.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: the arch/x86 maintainers <x86@kernel.org>
Cc: Arm Mailing List <linux-arm-kernel@lists.infradead.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/reboot.c | 12 +++++++-----
include/linux/reboot.h | 5 +++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 76fa1e9..f770340 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -36,7 +36,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
static const struct desc_ptr no_idt = {};
-static int reboot_mode;
+static enum reboot_mode reboot_mode;
enum reboot_type reboot_type = BOOT_ACPI;
int reboot_force;
@@ -88,11 +88,11 @@ static int __init reboot_setup(char *str)
switch (*str) {
case 'w':
- reboot_mode = 0x1234;
+ reboot_mode = REBOOT_WARM;
break;
case 'c':
- reboot_mode = 0;
+ reboot_mode = REBOOT_COLD;
break;
#ifdef CONFIG_SMP
@@ -536,6 +536,7 @@ static void native_machine_emergency_restart(void)
int i;
int attempt = 0;
int orig_reboot_type = reboot_type;
+ unsigned short mode;
if (reboot_emergency)
emergency_vmx_disable_all();
@@ -543,7 +544,8 @@ static void native_machine_emergency_restart(void)
tboot_shutdown(TB_SHUTDOWN_REBOOT);
/* Tell the BIOS if we want cold or warm reboot */
- *((unsigned short *)__va(0x472)) = reboot_mode;
+ mode = reboot_mode == REBOOT_WARM ? 0x1234 : 0;
+ *((unsigned short *)__va(0x472)) = mode;
for (;;) {
/* Could also try the reset bit in the Hammer NB */
@@ -585,7 +587,7 @@ static void native_machine_emergency_restart(void)
case BOOT_EFI:
if (efi_enabled(EFI_RUNTIME_SERVICES))
- efi.reset_system(reboot_mode ?
+ efi.reset_system(reboot_mode == REBOOT_WARM ?
EFI_RESET_WARM :
EFI_RESET_COLD,
EFI_SUCCESS, 0, NULL);
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index c6eba21..37d56c3 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -10,6 +10,11 @@
#define SYS_HALT 0x0002 /* Notify of system halt */
#define SYS_POWER_OFF 0x0003 /* Notify of system power off */
+enum reboot_mode {
+ REBOOT_COLD = 0,
+ REBOOT_WARM,
+};
+
extern int register_reboot_notifier(struct notifier_block *);
extern int unregister_reboot_notifier(struct notifier_block *);
--
1.8.2.1
next prev parent reply other threads:[~2013-06-06 11:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 11:47 [PATCH -v11 resend 00/11] Shutdown from reboot_cpuid without stopping other cpus Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 01/11] CPU hotplug: Provide a generic helper to disable/enable CPU hotplug Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 02/11] Migrate shutdown/reboot to boot cpu Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 03/11] Remove -stable friendly PF_THREAD_BOUND define Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 04/11] Move shutdown/reboot related functions to kernel/reboot.c Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 05/11] checkpatch.pl the new kernel/reboot.c file Robin Holt
2013-06-06 11:47 ` Robin Holt [this message]
2013-06-06 11:47 ` [PATCH -v11 resend 07/11] unicore32, prepare reboot_mode for moving to generic kernel code Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 08/11] arm, Remove unused restart_mode fields from some arm subarchs Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 10/11] arm, change reboot_mode to use enum reboot_mode Robin Holt
2013-06-10 22:11 ` Andrew Morton
2013-06-19 10:58 ` Arnd Bergmann
2013-06-19 13:52 ` Arnd Bergmann
2013-06-19 17:21 ` Andrew Morton
2013-06-19 18:16 ` Arnd Bergmann
2013-06-25 21:41 ` Kevin Hilman
2013-06-27 21:28 ` Kevin Hilman
2013-06-27 21:39 ` Kevin Hilman
2013-06-06 11:47 ` [PATCH -v11 resend 11/11] Move arch/x86 reboot= handling to generic kernel Robin Holt
-- strict thread matches above, loose matches on Subject: below --
2013-05-16 16:14 [PATCH -v11 resend 00/11] Shutdown from reboot_cpuid without stopping other cpus Robin Holt
2013-05-16 16:14 ` [PATCH -v11 resend 06/11] x86, prepare reboot_mode for moving to generic kernel code Robin Holt
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=1370519244-49918-7-git-send-email-holt@sgi.com \
--to=holt@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mboton.lkml@gmail.com \
--cc=rja@sgi.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).