3 files changed, 75 insertions, 29 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index a2c8b9efd700..cacdd883bf2b 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -618,11 +618,11 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
 #ifdef CONFIG_HPET_TIMER
 #include <asm/hpet.h>
 
+static struct __initdata resource *hpet_res;
+
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
         struct acpi_table_hpet *hpet_tbl;
-        struct resource *hpet_res;
-        resource_size_t res_start;
 
         hpet_tbl = (struct acpi_table_hpet *)table;
         if (!hpet_tbl) {
@@ -636,31 +636,46 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
                 return -1;
         }
 
-#define HPET_RESOURCE_NAME_SIZE 9
-        hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
-        if (hpet_res) {
-                memset(hpet_res, 0, sizeof(*hpet_res));
-                hpet_res->name = (void *)&hpet_res[1];
-                hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
-                         "HPET %u", hpet_tbl->sequence);
-                hpet_res->end = (1 * 1024) - 1;
-        }
-
         hpet_address = hpet_tbl->address.address;
         printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
                hpet_tbl->id, hpet_address);
 
-        res_start = hpet_address;
+        /*
+         * Allocate and initialize the HPET firmware resource for adding into
+         * the resource tree during the lateinit timeframe.
+         */
+#define HPET_RESOURCE_NAME_SIZE 9
+        hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
 
-        if (hpet_res) {
-                hpet_res->start = res_start;
-                hpet_res->end += res_start;
-                insert_resource(&iomem_resource, hpet_res);
-        }
+        if (!hpet_res)
+                return 0;
+
+        memset(hpet_res, 0, sizeof(*hpet_res));
+        hpet_res->name = (void *)&hpet_res[1];
+        hpet_res->flags = IORESOURCE_MEM;
+        snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE, "HPET %u",
+                 hpet_tbl->sequence);
+
+        hpet_res->start = hpet_address;
+        hpet_res->end = hpet_address + (1 * 1024) - 1;
 
         return 0;
 }
+
+/*
+ * hpet_insert_resource inserts the HPET resources used into the resource
+ * tree.
+ */
+static __init int hpet_insert_resource(void)
+{
+        if (!hpet_res)
+                return 1;
+
+        return insert_resource(&iomem_resource, hpet_res);
+}
+
+late_initcall(hpet_insert_resource);
+
 #else
 #define acpi_parse_hpet NULL
 #endif
diff --git a/arch/i386/kernel/acpi/sleep.c b/arch/i386/kernel/acpi/sleep.c
index 4ee83577bf61..c42b5ab49deb 100644
--- a/arch/i386/kernel/acpi/sleep.c
+++ b/arch/i386/kernel/acpi/sleep.c
@@ -14,7 +14,7 @@
 
 /* address in low memory of the wakeup routine. */
 unsigned long acpi_wakeup_address = 0;
-unsigned long acpi_video_flags;
+unsigned long acpi_realmode_flags;
 extern char wakeup_start, wakeup_end;
 
 extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
@@ -68,9 +68,11 @@ static int __init acpi_sleep_setup(char *str)
 {
         while ((str != NULL) && (*str != '\0')) {
                 if (strncmp(str, "s3_bios", 7) == 0)
-                        acpi_video_flags = 1;
+                        acpi_realmode_flags |= 1;
                 if (strncmp(str, "s3_mode", 7) == 0)
-                        acpi_video_flags |= 2;
+                        acpi_realmode_flags |= 2;
+                if (strncmp(str, "s3_beep", 7) == 0)
+                        acpi_realmode_flags |= 4;
                 str = strchr(str, ',');
                 if (str != NULL)
                         str += strspn(str, ", \t");
@@ -80,9 +82,11 @@ static int __init acpi_sleep_setup(char *str)
 
 __setup("acpi_sleep=", acpi_sleep_setup);
 
+/* Ouch, we want to delete this. We already have better version in userspace, in
+   s2ram from suspend.sf.net project */
 static __init int reset_videomode_after_s3(struct dmi_system_id *d)
 {
-        acpi_video_flags |= 2;
+        acpi_realmode_flags |= 2;
         return 0;
 }
 
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index b781b38131c0..ed0a0f2c1597 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -13,6 +13,21 @@
 # cs = 0x1234, eip = 0x05
 # 
 
+#define BEEP \
+        inb     $97, %al;       \
+        outb    %al, $0x80;     \
+        movb    $3, %al;        \
+        outb    %al, $97;       \
+        outb    %al, $0x80;     \
+        movb    $-74, %al;      \
+        outb    %al, $67;       \
+        outb    %al, $0x80;     \
+        movb    $-119, %al;     \
+        outb    %al, $66;       \
+        outb    %al, $0x80;     \
+        movb    $15, %al;       \
+        outb    %al, $66;
+
 ALIGN
         .align  4096
 ENTRY(wakeup_start)
@@ -31,6 +46,11 @@ wakeup_code:
         movw    %cs, %ax
         movw    %ax, %ds                                        # Make ds:0 point to wakeup_start
         movw    %ax, %ss
+
+        testl   $4, realmode_flags - wakeup_code
+        jz      1f
+        BEEP
+1:
         mov     $(wakeup_stack - wakeup_code), %sp              # Private stack is needed for ASUS board
         movw    $0x0e00 + 'S', %fs:(0x12)
 
@@ -41,7 +61,7 @@ wakeup_code:
         cmpl    $0x12345678, %eax
         jne     bogus_real_magic
 
-        testl   $1, video_flags - wakeup_code
+        testl   $1, realmode_flags - wakeup_code
         jz      1f
         lcall   $0xc000,$3
         movw    %cs, %ax
@@ -49,7 +69,7 @@ wakeup_code:
         movw    %ax, %ss
 1:
 
-        testl   $2, video_flags - wakeup_code
+        testl   $2, realmode_flags - wakeup_code
         jz      1f
         mov     video_mode - wakeup_code, %ax
         call    mode_set
@@ -88,7 +108,11 @@ wakeup_code:
         cmpl    $0x12345678, %eax
         jne     bogus_real_magic
 
-        ljmpl   $__KERNEL_CS,$wakeup_pmode_return
+        testl   $8, realmode_flags - wakeup_code
+        jz      1f
+        BEEP
+1:
+        ljmpl   $__KERNEL_CS, $wakeup_pmode_return
 
 real_save_gdt:  .word 0
                 .long 0
@@ -97,7 +121,8 @@ real_save_cr3:	.long 0
 real_save_cr4:  .long 0
 real_magic:     .long 0
 video_mode:     .long 0
-video_flags:    .long 0
+realmode_flags: .long 0
+beep_flags:     .long 0
 real_efer_save_restore: .long 0
 real_save_efer_edx:     .long 0
 real_save_efer_eax:     .long 0
@@ -230,6 +255,7 @@ bogus_magic:
 #
 ENTRY(acpi_copy_wakeup_routine)
 
+        pushl   %ebx
         sgdt    saved_gdt
         sidt    saved_idt
         sldt    saved_ldt
@@ -259,10 +285,11 @@ ENTRY(acpi_copy_wakeup_routine)
 
         movl    saved_videomode, %edx
         movl    %edx, video_mode - wakeup_start (%eax)
-        movl    acpi_video_flags, %edx
-        movl    %edx, video_flags - wakeup_start (%eax)
+        movl    acpi_realmode_flags, %edx
+        movl    %edx, realmode_flags - wakeup_start (%eax)
         movl    $0x12345678, real_magic - wakeup_start (%eax)
         movl    $0x12345678, saved_magic
+        popl    %ebx
         ret
 
 save_registers: