>From 216d5a047f02076e065f85bf7baaa025be7a0403 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Tue, 5 Aug 2008 14:23:14 -0400 Subject: [PATCH] UBUNTU: Backport ability to reset the machine using the RESET_REG of ACPI OriginalAuthor: Aaron Durbin Bug: #249296 commit 4d3870431d17346c4fdd80e087b7d76f1b5941d5 Author: Aaron Durbin Date: Wed Jul 16 23:27:08 2008 +0200 Add the ability to reset the machine using the RESET_REG in ACPI's FADT tabl Signed-off-by: Aaron Durbin Signed-off-by: Andi Kleen Cc: Len Brown Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Stefan Bader --- arch/x86/kernel/reboot_32.c | 7 ++++++ arch/x86/kernel/reboot_64.c | 9 +++++++- drivers/acpi/Makefile | 2 +- drivers/acpi/reboot.c | 50 +++++++++++++++++++++++++++++++++++++++++++ include/acpi/reboot.h | 10 ++++++++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 drivers/acpi/reboot.c create mode 100644 include/acpi/reboot.h diff --git a/arch/x86/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c index bb1a0f8..b6a8d1c 100644 --- a/arch/x86/kernel/reboot_32.c +++ b/arch/x86/kernel/reboot_32.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,9 @@ static int __init reboot_setup(char *str) case 'c': /* "cold" reboot (with memory testing etc) */ reboot_mode = 0x0; break; + case 'a': /* reboot through ACPI BIOS. */ + reboot_thru_bios = 2; + break; case 'b': /* "bios" reboot by jumping through the BIOS */ reboot_thru_bios = 1; break; @@ -357,6 +361,9 @@ static void native_machine_emergency_restart(void) if (efi_enabled) efi.reset_system(EFI_RESET_WARM, EFI_SUCCESS, 0, NULL); + if (reboot_thru_bios == 2) + acpi_reboot(); + machine_real_restart(jump_to_bios, sizeof(jump_to_bios)); } diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c index 53620a9..d9c9c48 100644 --- a/arch/x86/kernel/reboot_64.c +++ b/arch/x86/kernel/reboot_64.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,7 @@ EXPORT_SYMBOL(pm_power_off); static long no_idt[3]; static enum { + BOOT_ACPI = 'a', BOOT_TRIPLE = 't', BOOT_KBD = 'k' } reboot_type = BOOT_KBD; @@ -56,6 +58,7 @@ static int __init reboot_setup(char *str) case 't': case 'b': case 'k': + case 'a': reboot_type = *str; break; case 'f': @@ -146,7 +149,11 @@ void machine_emergency_restart(void) reboot_type = BOOT_KBD; break; - } + case BOOT_ACPI: + reboot_acpi(); + reboot_type = BOOT_KBD; + break; + } } } diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 456446f..945c4cf 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -21,7 +21,7 @@ obj-$(CONFIG_X86) += blacklist.o # # ACPI Core Subsystem (Interpreter) # -obj-y += osl.o utils.o \ +obj-y += osl.o utils.o reboot.o\ dispatcher/ events/ executer/ hardware/ \ namespace/ parser/ resources/ tables/ \ utilities/ diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c new file mode 100644 index 0000000..8a0de95 --- /dev/null +++ b/drivers/acpi/reboot.c @@ -0,0 +1,50 @@ +#include +#include +#include +#include + +void acpi_reboot(void) +{ + struct acpi_generic_address *rr; + struct pci_bus *bus0; + u8 reset_value; + unsigned int devfn; + + if (acpi_disabled) + return; + + rr = &acpi_gbl_FADT.reset_register; + + /* Is the reset register supported? */ + if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) || + rr->bit_width != 8 || rr->bit_offset != 0) + return; + + reset_value = acpi_gbl_FADT.reset_value; + + /* The reset register can only exist in I/O, Memory or PCI config space + * on a device on bus 0. */ + switch (rr->space_id) { + case ACPI_ADR_SPACE_PCI_CONFIG: + /* The reset register can only live on bus 0. */ + bus0 = pci_find_bus(0, 0); + if (!bus0) + return; + /* Form PCI device/function pair. */ + devfn = PCI_DEVFN((rr->address >> 32) & 0xffff, + (rr->address >> 16) & 0xffff); + printk(KERN_DEBUG "Resetting with ACPI PCI RESET_REG."); + /* Write the value that resets us. */ + pci_bus_write_config_byte(bus0, devfn, + (rr->address & 0xffff), reset_value); + break; + + case ACPI_ADR_SPACE_SYSTEM_MEMORY: + case ACPI_ADR_SPACE_SYSTEM_IO: + printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n"); + acpi_hw_low_level_write(8, reset_value, rr); + break; + } + /* Wait ten seconds */ + acpi_os_stall(10000000); +} diff --git a/include/acpi/reboot.h b/include/acpi/reboot.h new file mode 100644 index 0000000..e8deae1 --- /dev/null +++ b/include/acpi/reboot.h @@ -0,0 +1,10 @@ +#ifndef __ACPI_REBOOT_H +#define __ACPI_REBOOT_H + +#ifdef CONFIG_ACPI +extern void acpi_reboot(void); +#else +static inline void acpi_reboot(void) { } +#endif + +#endif -- 1.5.4.3