public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
* RE: Re: S4bios support for 2.5.63
@ 2003-03-03 11:51 Breathnach, Proinnsias (Dublin)
  0 siblings, 0 replies; 5+ messages in thread
From: Breathnach, Proinnsias (Dublin) @ 2003-03-03 11:51 UTC (permalink / raw)
  To: 'bert hubert'; +Cc: ACPI mailing list

Simplify the link somewhat ... avoids wraparound problems :)
http://tardis.linux.ie/714/groups.google.com
tardis.linux.ie is there for this sort of thing ... just an FYI really :)
Proinnsias

> -----Original Message-----
> A data point may be that at one point, swsusp did work just fine for me.
> This was around 2.5.53, 2.5.54:
> 
> http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=200212
> 27142032.GA6945%40outpost.ds9a.nl&rnum=1&prev=/groups%3Fq%3Dswsusp%2Bbert%
> 2Bhubert%26hl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26selm%3D200212271420
> 32.GA6945%2540outpost.ds9a.nl%26rnum%3D1
> 
> I now use gcc 3.2.2 for compiling though. I've tried suspending a few
> times
> with 2.5.63bk5 and I get the BUG every time, so it appears to be
> deterministic and not racey.
> 
> Regards,
> 
> bert
> 



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf

^ permalink raw reply	[flat|nested] 5+ messages in thread
* S4bios support for 2.5.63
@ 2003-02-26 21:13 Pavel Machek
  2003-03-02 13:31 ` bert hubert
  2003-03-02 20:21 ` bert hubert
  0 siblings, 2 replies; 5+ messages in thread
From: Pavel Machek @ 2003-02-26 21:13 UTC (permalink / raw)
  To: Andrew Grover, ACPI mailing list, kernel list

Hi!

This is S4bios support for 2.5.63. I'd like to see it in since it is
easier to understand and more foolproof. Please apply,

							Pavel

--- clean/arch/i386/kernel/acpi/wakeup.S	2003-02-25 21:13:49.000000000 +0100
+++ linux/arch/i386/kernel/acpi/wakeup.S	2003-02-18 00:58:24.000000000 +0100
@@ -319,6 +319,31 @@
 	pushl saved_context_eflags ; popfl
 	ret
 
+ENTRY(do_suspend_lowlevel_s4bios)
+	cmpl $0,4(%esp)
+	jne ret_point
+	call save_processor_state
+
+	movl %esp, saved_context_esp
+	movl %eax, saved_context_eax
+	movl %ebx, saved_context_ebx
+	movl %ecx, saved_context_ecx
+	movl %edx, saved_context_edx
+	movl %ebp, saved_context_ebp
+	movl %esi, saved_context_esi
+	movl %edi, saved_context_edi
+	pushfl ; popl saved_context_eflags
+
+	movl $ret_point,saved_eip
+	movl %esp,saved_esp
+	movl %ebp,saved_ebp
+	movl %ebx,saved_ebx
+	movl %edi,saved_edi
+	movl %esi,saved_esi
+
+	call acpi_enter_sleep_state_s4bios
+	ret
+
 ALIGN
 # saved registers
 saved_gdt:	.long	0,0
--- clean/drivers/acpi/acpi_ksyms.c	2003-02-25 21:17:31.000000000 +0100
+++ linux/drivers/acpi/acpi_ksyms.c	2003-02-15 18:52:15.000000000 +0100
@@ -86,6 +86,7 @@
 EXPORT_SYMBOL(acpi_get_register);
 EXPORT_SYMBOL(acpi_set_register);
 EXPORT_SYMBOL(acpi_enter_sleep_state);
+EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);
 EXPORT_SYMBOL(acpi_get_system_info);
 EXPORT_SYMBOL(acpi_get_devices);
 
--- clean/drivers/acpi/hardware/hwsleep.c	2003-02-25 21:17:34.000000000 +0100
+++ linux/drivers/acpi/hardware/hwsleep.c	2003-02-24 22:36:23.000000000 +0100
@@ -335,6 +335,51 @@
 	return_ACPI_STATUS (AE_OK);
 }
 
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_enter_sleep_state_s4bios
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Perform a s4 bios request.
+ *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_enter_sleep_state_s4bios (
+	void)
+{
+	u32                     in_value;
+	acpi_status             status;
+
+
+	ACPI_FUNCTION_TRACE ("Acpi_enter_sleep_state_s4bios");
+
+	acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_LOCK);
+	acpi_hw_clear_acpi_status();
+
+	acpi_hw_disable_non_wakeup_gpes();
+
+	ACPI_FLUSH_CPU_CACHE();
+
+	status = acpi_os_write_port (acpi_gbl_FADT->smi_cmd, (acpi_integer) acpi_gbl_FADT->S4bios_req, 8);
+
+	do {
+		acpi_os_stall(1000);
+		status = acpi_get_register (ACPI_BITREG_WAKE_STATUS, &in_value, ACPI_MTX_LOCK);
+		if (ACPI_FAILURE (status)) {
+			return_ACPI_STATUS (status);
+		}
+	} while (!in_value);
+ 
+ 	return_ACPI_STATUS (AE_OK);
+ }
+ 
+
 /******************************************************************************
  *
  * FUNCTION:    acpi_leave_sleep_state
--- clean/drivers/acpi/sleep/main.c	2003-02-25 21:17:36.000000000 +0100
+++ linux/drivers/acpi/sleep/main.c	2003-02-18 22:36:39.000000000 +0100
@@ -183,14 +180,21 @@
 		status = acpi_enter_sleep_state(state);
 		break;
 
-	case ACPI_STATE_S2:
 #ifdef CONFIG_SOFTWARE_SUSPEND
+	case ACPI_STATE_S2:
 	case ACPI_STATE_S3:
 		do_suspend_lowlevel(0);
+		break;
 #endif
+	case ACPI_STATE_S4:
+		do_suspend_lowlevel_s4bios(0);
+		break;
+	default:
+		printk(KERN_WARNING PREFIX "don't know how to handle %d state.\n", state);
 		break;
 	}
 	local_irq_restore(flags);
+	printk(KERN_CRIT "Back to C!\n");
 
 	return status;
 }
@@ -211,10 +215,20 @@
 	if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5)
 		return AE_ERROR;
 
+	/* Since we handle S4OS via a different path (swsusp), give up if no s4bios. */
+	if (state == ACPI_STATE_S4 && !acpi_gbl_FACS->S4bios_f)
+		return AE_ERROR;
+
+	/*
+	 * TBD: S1 can be done without device_suspend.  Make a CONFIG_XX
+	 * to handle however when S1 failed without device_suspend.
+	 */
 	freeze_processes();		/* device_suspend needs processes to be stopped */
 
 	/* do we have a wakeup address for S2 and S3? */
-	if (state == ACPI_STATE_S2 || state == ACPI_STATE_S3) {
+	/* Here, we support only S4BIOS, those we set the wakeup address */
+	/* S4OS is only supported for now via swsusp.. */
+	if (state == ACPI_STATE_S2 || state == ACPI_STATE_S3 || ACPI_STATE_S4) {
 		if (!acpi_wakeup_address)
 			return AE_ERROR;
 		acpi_set_firmware_waking_vector((acpi_physical_address) acpi_wakeup_address);
@@ -268,6 +282,10 @@
 			sleep_states[i] = 1;
 			printk(" S%d", i);
 		}
+		if (i == ACPI_STATE_S4 && acpi_gbl_FACS->S4bios_f) {
+			sleep_states[i] = 1;
+			printk(" S4bios");
+		}
 	}
 	printk(")\n");
 
--- clean/drivers/acpi/sleep/proc.c	2003-02-25 21:17:37.000000000 +0100
+++ linux/drivers/acpi/sleep/proc.c	2003-02-15 18:57:55.000000000 +0100
@@ -27,8 +27,11 @@
 	ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show");
 
 	for (i = 0; i <= ACPI_STATE_S5; i++) {
-		if (sleep_states[i])
+		if (sleep_states[i]) {
 			seq_printf(seq,"S%d ", i);
+			if (i == ACPI_STATE_S4 && acpi_gbl_FACS->S4bios_f)
+				seq_printf(seq, "S4bios ");
+		}
 	}
 
 	seq_puts(seq, "\n");
--- clean/include/acpi/acpixf.h	2003-02-25 21:20:49.000000000 +0100
+++ linux/include/acpi/acpixf.h	2003-02-24 22:36:42.000000000 +0100
@@ -399,6 +399,10 @@
 	u8                              sleep_state);
 
 acpi_status
+acpi_enter_sleep_state_s4bios (
+	void);
+
+acpi_status
 acpi_leave_sleep_state (
 	u8                              sleep_state);
 
--- clean/include/linux/suspend.h	2003-02-25 21:22:36.000000000 +0100
+++ linux/include/linux/suspend.h	2003-02-10 18:17:01.000000000 +0100
@@ -73,6 +73,7 @@
 /* Communication between acpi and arch/i386/suspend.c */
 
 extern void do_suspend_lowlevel(int resume);
+extern void do_suspend_lowlevel_s4bios(int resume);
 
 #else
 static inline void software_suspend(void)

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2003-03-06 18:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20030306072229.GA750@budgie.we1.client2.attbi.com>
     [not found] ` <20030306072229.GA750-peapQs0eLv2IgHrOsx/gaWNy84NFWbr7VpNB7YpNyf8@public.gmane.org>
2003-03-06  7:42   ` Re: S4bios support for 2.5.63 Ken Hughes
     [not found]     ` <20030306074226.GC750-peapQs0eLv2IgHrOsx/gaWNy84NFWbr7VpNB7YpNyf8@public.gmane.org>
2003-03-06 18:40       ` Nigel Cunningham
2003-03-03 11:51 Breathnach, Proinnsias (Dublin)
  -- strict thread matches above, loose matches on Subject: below --
2003-02-26 21:13 Pavel Machek
2003-03-02 13:31 ` bert hubert
2003-03-02 18:44   ` Nigel Cunningham
2003-03-02 20:21 ` bert hubert
2003-03-02 22:22   ` Alan Cox
     [not found]     ` <1046643757.3700.20.camel-MMxVpc8zpTQVh3rx8e9g/fyykp6/JSeS3vcXtXqGYxw@public.gmane.org>
2003-03-03  7:42       ` Chris Bennett
2003-03-03  0:39   ` Roger Luethi
2003-03-03  2:08     ` [ACPI] " Nigel Cunningham
2003-03-03 11:31       ` bert hubert
2003-03-03 12:23         ` Pavel Machek
2003-03-03 12:35           ` bert hubert
2003-03-03 12:41             ` Pavel Machek
     [not found]               ` <20030303124133.GH20929-jyMamyUUXNJG4ohzP4jBZS1Fcj925eT/@public.gmane.org>
2003-03-03 14:07                 ` Troels Haugboelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox