The patch titled
x86_64: add ACPI reboot option
has been added to the -mm tree. Its filename is
x86_64-add-acpi-reboot-option.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: add ACPI reboot option
From: Aaron Durbin <adurbin@xxxxxxxxxx>
Add the ability to reboot an x86_64 based machine using the RESET_REG in the
FADT ACPI table.
Signed-off-by: Aaron Durbin <adurbin@xxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/x86_64/boot-options.txt | 5 ++++-
arch/x86/kernel/reboot_64.c | 11 ++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff -puN Documentation/x86_64/boot-options.txt~x86_64-add-acpi-reboot-option Documentation/x86_64/boot-options.txt
--- a/Documentation/x86_64/boot-options.txt~x86_64-add-acpi-reboot-option
+++ a/Documentation/x86_64/boot-options.txt
@@ -110,12 +110,15 @@ Idle loop
Rebooting
- reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
+ reboot=b[ios] | t[riple] | k[bd] | a[cpi] [, [w]arm | [c]old]
bios Use the CPU reboot vector for warm reset
warm Don't set the cold reboot flag
cold Set the cold reboot flag
triple Force a triple fault (init)
kbd Use the keyboard controller. cold reset (default)
+ acpi Use the ACPI RESET_REG in the FADT. If ACPI is not configured or the
+ ACPI reset does not work, the reboot path attempts the reset using
+ the keyboard controller.
Using warm reset will be much faster especially on big memory
systems because the BIOS will not go through the memory check.
diff -puN arch/x86/kernel/reboot_64.c~x86_64-add-acpi-reboot-option arch/x86/kernel/reboot_64.c
--- a/arch/x86/kernel/reboot_64.c~x86_64-add-acpi-reboot-option
+++ a/arch/x86/kernel/reboot_64.c
@@ -9,6 +9,7 @@
#include <linux/pm.h>
#include <linux/kdebug.h>
#include <linux/sched.h>
+#include <acpi/reboot.h>
#include <asm/io.h>
#include <asm/delay.h>
#include <asm/desc.h>
@@ -28,7 +29,8 @@ EXPORT_SYMBOL(pm_power_off);
static long no_idt[3];
static enum {
BOOT_TRIPLE = 't',
- BOOT_KBD = 'k'
+ BOOT_KBD = 'k',
+ BOOT_ACPI = 'a'
} reboot_type = BOOT_KBD;
static int reboot_mode = 0;
int reboot_force;
@@ -38,6 +40,7 @@ int reboot_force;
cold Set the cold reboot flag
triple Force a triple fault (init)
kbd Use the keyboard controller. cold reset (default)
+ acpi Use the RESET_REG in the FADT
force Avoid anything that could hang.
*/
static int __init reboot_setup(char *str)
@@ -53,6 +56,7 @@ static int __init reboot_setup(char *str
break;
case 't':
+ case 'a':
case 'b':
case 'k':
reboot_type = *str;
@@ -142,6 +146,11 @@ void machine_emergency_restart(void)
reboot_type = BOOT_KBD;
break;
+
+ case BOOT_ACPI:
+ acpi_reboot();
+ reboot_type = BOOT_KBD;
+ break;
}
}
}
_
Patches currently in -mm which might be from adurbin@xxxxxxxxxx are
acpi-add-reboot-mechanism.patch
x86_64-add-acpi-reboot-option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
