From bb2ecb427d4b623fe25b8a8ccc4fa6fe5bae0997 Mon Sep 17 00:00:00 2001
From: Aaron Durbin <adurbin@google.com>
Date: Wed, 16 Jul 2008 23:27:08 +0200
Subject: [PATCH] --- yaml --- r: 102063 b: refs/heads/master c:
 4d3870431d17346c4fdd80e087b7d76f1b5941d5 h: refs/heads/master i:   102061:
 0a665db35a3c98ede6d3ef066f3f988916e19cbb   102059:
 0d8d7876e5994d1b49e9c2399ce2301e7387194c   102055:
 7264565dd25362369627d0c055f9105f3dbc8b89   102047:
 8bce2e79432c82a7f65261f23cf53f1d8afe3650 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/acpi/Makefile |  2 +-
 trunk/drivers/acpi/reboot.c | 50 +++++++++++++++++++++++++++++++++++++
 trunk/include/acpi/reboot.h | 14 ++++++-----
 4 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 trunk/drivers/acpi/reboot.c

diff --git a/[refs] b/[refs]
index 04cd7049ca98..214838c5b7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c83642d5123225a22cccd75adea6e97c245714cb
+refs/heads/master: 4d3870431d17346c4fdd80e087b7d76f1b5941d5
diff --git a/trunk/drivers/acpi/Makefile b/trunk/drivers/acpi/Makefile
index 40b0fcae4c78..4efbe598c817 100644
--- a/trunk/drivers/acpi/Makefile
+++ b/trunk/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/trunk/drivers/acpi/reboot.c b/trunk/drivers/acpi/reboot.c
new file mode 100644
index 000000000000..a6b662c00b67
--- /dev/null
+++ b/trunk/drivers/acpi/reboot.c
@@ -0,0 +1,50 @@
+
+#include <linux/pci.h>
+#include <linux/acpi.h>
+#include <acpi/reboot.h>
+
+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/trunk/include/acpi/reboot.h b/trunk/include/acpi/reboot.h
index 8857f57e0b78..0419184ce886 100644
--- a/trunk/include/acpi/reboot.h
+++ b/trunk/include/acpi/reboot.h
@@ -1,9 +1,11 @@
+#ifndef __ACPI_REBOOT_H
+#define __ACPI_REBOOT_H
+
+#ifdef CONFIG_ACPI
+extern void acpi_reboot(void);
+#else
+static inline void acpi_reboot(void) { }
+#endif
 
-/*
- * Dummy placeholder to make the EFI patches apply to the x86 tree.
- * Andrew/Len, please just kill this file if you encounter it.
- */
-#ifndef acpi_reboot
-# define acpi_reboot() do { } while (0)
 #endif