PM: Optional beeping during resume from suspend to RAM
Subsystems (4)
cover PM: Optional beeping during resume from suspend to RAM
Hi,
The following two patches:
* add a feature allowing the user to make the system beep during a resume from RAM on i386 and x86_64 (useful for users with broken resume, so that they can check if the control reaches the kernel after a wake-up event)
* integrate the new feature with the existing acpi_sleep flags
* fix acpi_sleep_setup so that the order of parameters in the command line does not matter.
Greetings,
Rafael
Signature · 1 line
"Premature optimization is the root of all evil." - Donald Knuth
PATCH 1/2 PM: Optional beeping during resume from suspend to RAM
From: Nigel Cunningham <[email protected]>
Add a feature allowing the user to make the system beep during a resume from suspend to RAM, on x86_64 and i386.
This is useful for the users with broken resume from RAM, so that they can verify if the control reaches the kernel after a wake-up event.
--- arch/i386/kernel/acpi/wakeup.S | 27 +++++++++++++++++++++++++++ arch/x86_64/kernel/acpi/wakeup.S | 25 +++++++++++++++++++++++++ include/linux/acpi.h | 1 + kernel/power/main.c | 23 +++++++++++++++++++++++ 4 files changed, 76 insertions(+)
arch/i386/kernel/acpi/wakeup.S +27 -0
@@ -28,6 +28,21 @@ movb $15, %al; \ outb %al, $66; +#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)
@@ -49,6 +64,11 @@ wakeup_code: movw %cs, %ax movw %ax, %ds # Make ds:0 point to wakeup_start movw %ax, %ss + + testl $1, beep_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)
@@ -106,6 +126,10 @@ wakeup_code: cmpl $0x12345678, %eax jne bogus_real_magic + testl $2, beep_flags - wakeup_code + jz 1f + BEEP +1: ljmpl $__KERNEL_CS,$wakeup_pmode_return real_save_gdt: .word 0
@@ -116,6 +140,7 @@ real_save_cr4: .long 0 real_magic: .long 0 video_mode: .long 0 video_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
@@ -280,6 +305,8 @@ ENTRY(acpi_copy_wakeup_routine) movl %edx, video_mode - wakeup_start (%eax) movl acpi_video_flags, %edx movl %edx, video_flags - wakeup_start (%eax) + movl s2ram_beep, %edx + movl %edx, beep_flags - wakeup_start (%eax) movl $0x12345678, real_magic - wakeup_start (%eax) movl $0x12345678, saved_magic popl %ebx
arch/x86_64/kernel/acpi/wakeup.S +25 -0
@@ -16,6 +16,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 16
@@ -33,6 +48,13 @@ wakeup_code: movw %cs, %ax movw %ax, %ds # Make ds:0 point to wakeup_start movw %ax, %ss + + # Data segment must be set up before we can see whether to beep. + testl $1, beep_flags - wakeup_code + jz 1f + BEEP +1: + # Private stack is needed for ASUS board mov $(wakeup_stack - wakeup_code), %sp
@@ -229,6 +251,7 @@ gdt_48a: .long gdta - wakeup_code # gdt base (relocated in later) real_magic: .quad 0 +beep_flags: .quad 0 video_mode: .quad 0 video_flags: .quad 0
@@ -344,6 +367,8 @@ ENTRY(acpi_copy_wakeup_routine) pushq %rax pushq %rdx + movl s2ram_beep, %edx + movl %edx, beep_flags - wakeup_start (,%rdi) movl saved_video_mode, %edx movl %edx, video_mode - wakeup_start (,%rdi) movl acpi_video_flags, %edx
include/linux/acpi.h +1 -0
@@ -121,6 +121,7 @@ extern int pci_mmcfg_config_num;extern int sbf_port;extern unsigned long acpi_video_flags; +extern unsigned long s2ram_beep;#else /* !CONFIG_ACPI */
kernel/power/main.c +23 -0
@@ -332,6 +332,27 @@ static ssize_t state_store(struct kset *power_attr (state); +unsigned long s2ram_beep =0 ; + +static ssize_t s2ram_beep_show (struct kset *kset,char *buf) +{ +return sprintf (buf,"%d\n" , s2ram_beep); +} + +static ssize_t +s2ram_beep_store (struct kset *kset,const char *buf,size_t n) +{ +int val; + +if (sscanf (buf,"%d" , &val) >0 ) { + s2ram_beep = val; +return n; + } +return -EINVAL ; +} + +power_attr (s2ram_beep); +#ifdef CONFIG_PM_TRACE int pm_trace_enabled;
@@ -357,11 +378,13 @@ power_attr(pm_trace);static struct attribute * g[] = { &state_attr.attr, &pm_trace_attr.attr, + &s2ram_beep_attr.attr,NULL , };#else static struct attribute * g[] = { &state_attr.attr, + &s2ram_beep_attr.attr,NULL , };#endif /* CONFIG_PM_TRACE */
Quoted 9 lines · Rafael J. Wysocki
From: Nigel Cunningham <[email protected]>
Add a feature allowing the user to make the system beep during a resume from suspend to RAM, on
x86_64and i386.This is useful for the users with broken resume from RAM, so that they can verify if the control reaches the kernel after a wake-up event.
Signed-off-by Rafael J. Wysocki <[email protected]>
ACK... (but this should really go in with the second patch in series.)
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 2/2 PM: Integrate beeping flag with existing acpi_sleep flags
In reply to Rafael J. WysockiFrom: Pavel Machek <[email protected]>
Move "debug during resume from s2ram" into the variable we already use for real-mode flags to simplify code. It also closes nasty trap for the user in acpi_sleep_setup; order of parameters actually mattered there, acpi_sleep=s3_bios,s3_mode doing something different from acpi_sleep=s3_mode,s3_bios.
--- arch/i386/kernel/acpi/sleep.c | 12 ++++++++---- arch/i386/kernel/acpi/wakeup.S | 18 ++++++++---------- arch/x86_64/kernel/acpi/sleep.c | 8 +++++--- arch/x86_64/kernel/acpi/wakeup.S | 15 ++++++--------- include/linux/acpi.h | 3 +-- kernel/power/main.c | 23 ----------------------- kernel/sysctl.c | 2 +- 7 files changed, 29 insertions(+), 52 deletions(-)
arch/i386/kernel/acpi/sleep.c +8 -4
@@ -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 {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__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 ; }
arch/i386/kernel/acpi/wakeup.S +8 -10
@@ -65,7 +65,7 @@ wakeup_code: movw %ax, %ds # Make ds:0 point to wakeup_start movw %ax, %ss - testl $1, beep_flags - wakeup_code + testl $4, realmode_flags - wakeup_code jz 1f BEEP 1:
@@ -79,7 +79,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
@@ -87,7 +87,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
@@ -126,11 +126,11 @@ wakeup_code: cmpl $0x12345678, %eax jne bogus_real_magic - testl $2, beep_flags - wakeup_code + testl $8, realmode_flags - wakeup_code jz 1f BEEP 1: - ljmpl $__KERNEL_CS,$wakeup_pmode_return + ljmpl $__KERNEL_CS, $wakeup_pmode_return real_save_gdt: .word 0 .long 0
@@ -139,7 +139,7 @@ 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
@@ -303,10 +303,8 @@ 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 s2ram_beep, %edx - movl %edx, beep_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
arch/x86_64/kernel/acpi/sleep.c +5 -3
@@ -55,7 +55,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 acpi_copy_wakeup_routine (unsigned long );
@@ -103,9 +103,11 @@ static int __init acpi_sleep_setup(char {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" );
arch/x86_64/kernel/acpi/wakeup.S +6 -9
@@ -50,7 +50,7 @@ wakeup_code: movw %ax, %ss # Data segment must be set up before we can see whether to beep. - testl $1, beep_flags - wakeup_code + testl $4, realmode_flags - wakeup_code jz 1f BEEP 1:
@@ -70,7 +70,7 @@ wakeup_code: testl %eax, %eax jnz no_longmode - testl $1, video_flags - wakeup_code + testl $1, realmode_flags - wakeup_code jz 1f lcall $0xc000,$3 movw %cs, %ax
@@ -78,7 +78,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_seta
@@ -251,9 +251,8 @@ gdt_48a: .long gdta - wakeup_code # gdt base (relocated in later) real_magic: .quad 0 -beep_flags: .quad 0 video_mode: .quad 0 -video_flags: .quad 0 +realmode_flags: .quad 0 .code16 bogus_real_magic:
@@ -367,12 +366,10 @@ ENTRY(acpi_copy_wakeup_routine) pushq %rax pushq %rdx - movl s2ram_beep, %edx - movl %edx, beep_flags - wakeup_start (,%rdi) movl saved_video_mode, %edx movl %edx, video_mode - wakeup_start (,%rdi) - movl acpi_video_flags, %edx - movl %edx, video_flags - wakeup_start (,%rdi) + movl acpi_realmode_flags, %edx + movl %edx, realmode_flags - wakeup_start (,%rdi) movq $0x12345678, real_magic - wakeup_start (,%rdi) movq $0x123456789abcdef0, %rdx movq %rdx, saved_magic
include/linux/acpi.h +1 -2
@@ -120,8 +120,7 @@ extern struct acpi_mcfg_allocation *pci_extern int pci_mmcfg_config_num;extern int sbf_port; -extern unsigned long acpi_video_flags; -extern unsigned long s2ram_beep; +extern unsigned long acpi_realmode_flags;#else /* !CONFIG_ACPI */
kernel/power/main.c +0 -23
@@ -332,27 +332,6 @@ static ssize_t state_store(struct kset *power_attr (state); -unsigned long s2ram_beep =0 ; - -static ssize_t s2ram_beep_show (struct kset *kset,char *buf) -{ -return sprintf (buf,"%d\n" , s2ram_beep); -} - -static ssize_t -s2ram_beep_store (struct kset *kset,const char *buf,size_t n) -{ -int val; - -if (sscanf (buf,"%d" , &val) >0 ) { - s2ram_beep = val; -return n; - } -return -EINVAL ; -} - -power_attr (s2ram_beep); -#ifdef CONFIG_PM_TRACE int pm_trace_enabled;
@@ -378,13 +357,11 @@ power_attr(pm_trace);static struct attribute * g[] = { &state_attr.attr, &pm_trace_attr.attr, - &s2ram_beep_attr.attr,NULL , };#else static struct attribute * g[] = { &state_attr.attr, - &s2ram_beep_attr.attr,NULL , };#endif /* CONFIG_PM_TRACE */
kernel/sysctl.c +1 -1
@@ -699,7 +699,7 @@ static ctl_table kern_table[] = { { .ctl_name = KERN_ACPI_VIDEO_FLAGS, .procname = "acpi_video_flags", - .data = &acpi_video_flags, + .data = &acpi_realmode_flags, .maxlen = sizeof (unsigned long), .mode = 0644, .proc_handler = &proc_doulongvec_minmax,