Ticket #4459: acpi_reboot.diff

src/system/kernel/arch/x86/arch_cpu.cpp

@@ -103 +103 @@
 
 
 static status_t
-acpi_shutdown(void)
+acpi_shutdown(bool rebootSystem)
 {
     if (debug_debugger_running())
         return B_ERROR;
@@ -112 +112 @@
     if (get_module(B_ACPI_MODULE_NAME, (module_info**)&acpi) != B_OK)
         return B_NOT_SUPPORTED;
 
+    if (rebootSystem)
+        return acpi->reboot();
+
     status_t status = acpi->prepare_sleep_state(ACPI_POWER_STATE_OFF, NULL, 0);
     if (status == B_OK) {
         //cpu_status state = disable_interrupts();
@@ -822 +825 @@
 status_t
 arch_cpu_shutdown(bool rebootSystem)
 {
-    if (!rebootSystem) {
-        status_t status = acpi_shutdown();
-        if (status != B_OK)
-            status = apm_shutdown();
-
-        return status;
-    }
-
+    acpi_shutdown(rebootSystem);
+    
+    if (!rebootSystem)
+        return apm_shutdown();
+    
     cpu_status state = disable_interrupts();
 
     // try to reset the system using the keyboard controller

src/add-ons/kernel/bus_managers/acpi/acpi_busman.c

@@ -1 +1 @@
 /*
+ * Copyright 2009, Vincent Duvert, vincent.duvert@free.fr
  * Copyright 2009, Clemens Zeidler, haiku@clemens-zeidler.de
  * Copyright 2008, Axel Dörfler, axeld@pinc-software.de.
  * Copyright 2006, Bryan Varner. All rights reserved.
@@ -533 +534 @@
 }
 
 
+static status_t
+reboot(void)
+{
+    ACPI_STATUS status;
+
+    TRACE("reboot\n");
+
+    if (AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER == 0)
+        return B_UNSUPPORTED;
+
+    status = AcpiHwLowLevelWrite(AcpiGbl_FADT.ResetRegister.BitWidth,
+        AcpiGbl_FADT.ResetValue, &AcpiGbl_FADT.ResetRegister);
+    
+    if (status != AE_OK) {
+        ERROR("Reset failed, status = %d\n", status);
+        return B_ERROR;
+    }
+    
+    snooze(1000000);
+    ERROR("Reset failed, timeout\n");   
+    return B_ERROR;
+}
+
 struct acpi_module_info gACPIModule = {
     {
         B_ACPI_MODULE_NAME,
@@ -566 +590 @@
     evaluate_object,
     evaluate_method,
     prepare_sleep_state,
-    enter_sleep_state
+    enter_sleep_state,
+    reboot
 };

headers/os/drivers/ACPI.h

@@ -224 +224 @@
     status_t    (*prepare_sleep_state)(uint8 state, void (*wakeFunc)(void),
                     size_t size);
     status_t    (*enter_sleep_state)(uint8 state);
+    status_t    (*reboot)(void);
 };