* Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
@ 2008-06-13 5:38 Zhao Yakui
0 siblings, 0 replies; 3+ messages in thread
From: Zhao Yakui @ 2008-06-13 5:38 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, akpm, adurbin
Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
From: Aaron Durbin <adurbin@google.com>
Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
Signed-off-by: Aaron Durbin <adurbin@google.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/acpi/Makefile | 2 +-
drivers/acpi/reboot.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
include/acpi/reboot.h | 13 +++++++------
3 files changed, 58 insertions(+), 7 deletions(-)
Index: linux-2.6/include/acpi/reboot.h
===================================================================
--- linux-2.6.orig/include/acpi/reboot.h
+++ linux-2.6/include/acpi/reboot.h
@@ -1,9 +1,10 @@
+#ifndef __ACPI_REBOOT_H
+#define __ACPI_REBOOT_H
-/*
- * 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)
+#ifdef CONFIG_ACPI
+extern void acpi_reboot(void);
+#else
+static inline void acpi_reboot(void) { }
#endif
+#endif
Index: linux-2.6/drivers/acpi/reboot.c
===================================================================
--- /dev/null
+++ linux-2.6/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);
+}
Index: linux-2.6/drivers/acpi/Makefile
===================================================================
--- linux-2.6.orig/drivers/acpi/Makefile
+++ linux-2.6/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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
@ 2008-07-14 9:49 Zhao Yakui
2008-07-14 12:31 ` Andi Kleen
0 siblings, 1 reply; 3+ messages in thread
From: Zhao Yakui @ 2008-07-14 9:49 UTC (permalink / raw)
To: Andi Kleen; +Cc: linux-acpi, akpm, adurbin, lenb
Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
From: Aaron Durbin <adurbin@google.com>
Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
Signed-off-by: Aaron Durbin <adurbin@google.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/acpi/Makefile | 2 +-
drivers/acpi/reboot.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
include/acpi/reboot.h | 13 +++++++------
3 files changed, 58 insertions(+), 7 deletions(-)
Index: linux-2.6/include/acpi/reboot.h
===================================================================
--- linux-2.6.orig/include/acpi/reboot.h
+++ linux-2.6/include/acpi/reboot.h
@@ -1,9 +1,10 @@
+#ifndef __ACPI_REBOOT_H
+#define __ACPI_REBOOT_H
-/*
- * 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)
+#ifdef CONFIG_ACPI
+extern void acpi_reboot(void);
+#else
+static inline void acpi_reboot(void) { }
#endif
+#endif
Index: linux-2.6/drivers/acpi/reboot.c
===================================================================
--- /dev/null
+++ linux-2.6/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);
+}
Index: linux-2.6/drivers/acpi/Makefile
===================================================================
--- linux-2.6.orig/drivers/acpi/Makefile
+++ linux-2.6/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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
2008-07-14 9:49 Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table Zhao Yakui
@ 2008-07-14 12:31 ` Andi Kleen
0 siblings, 0 replies; 3+ messages in thread
From: Andi Kleen @ 2008-07-14 12:31 UTC (permalink / raw)
To: Zhao Yakui; +Cc: linux-acpi, akpm, adurbin, lenb
Zhao Yakui wrote:
> Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table
> From: Aaron Durbin <adurbin@google.com>
>
> Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
Why are you retransmitting this patch? Did you change something?
If yes please always add a version number and a changelog.
-Andi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-14 12:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-14 9:49 Subject: ACPI: Add the abity to reset the system using RESET_REG in FADT table Zhao Yakui
2008-07-14 12:31 ` Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2008-06-13 5:38 Zhao Yakui
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.