[PATCH] acpi_wakeup fixes

[PATCH] acpi_wakeup fixes

[Ducrot Bruno]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

Hi Pavel.

This diff should be OK (I hope)

-- 
Ducrot Bruno
http://www.poupinou.org        Page profaissionelle
http://toto.tu-me-saoules.com  Haume page

[-- Attachment #2: 00_acpi_wakeup.S.fix --]
[-- Type: text/plain, Size: 679 bytes --]

--- linux-2.5.52/arch/i386/kernel/acpi_wakeup.S	2002/12/17 19:15:12	1.1
+++ linux-2.5.52/arch/i386/kernel/acpi_wakeup.S	2002/12/17 20:03:40
@@ -41,7 +41,7 @@
 	cmpl	$0x12345678, %eax
 	jne	bogus_real_magic
 
-#if 1
+#if 0
 	lcall   $0xc000,$3
 #endif
 #if 0
@@ -69,8 +69,12 @@
 
 	movl	real_save_cr0 - wakeup_code, %eax
 	movl	%eax, %cr0
+
+	# flush the prefetch queue.
 	jmp 1f
+1:	jmp 1f
 1:
+
 	movw	$0x0e00 + 'n', %fs:(0x14)
 
 	movl	real_magic - wakeup_code, %eax
@@ -160,11 +164,12 @@
 	ALIGN
 
 
-.org	0x2000
+.org	0x800
 wakeup_stack:
-.org	0x3000
+.org	0x900
 ENTRY(wakeup_end)
-.org	0x4000
+# .org	0x1000
+	.align 4096
 
 wakeup_pmode_return:
 	movl	$__KERNEL_DS, %eax

Re: [ACPI] [PATCH] acpi_wakeup fixes

[Pavel Machek]

Hi!

> @@ -41,7 +41,7 @@
>  	cmpl	_0x12345678, %eax
>  	jne	bogus_real_magic
>  
> -#if 1
> +#if 0
>  	lcall   _0xc000,_3
>  #endif
>  #if 0

We should make this runtime configurable...

Anyway disabling this is probably right.

> @@ -69,8 +69,12 @@
>  
>  	movl	real_save_cr0 - wakeup_code, %eax
>  	movl	%eax, %cr0
> +
> +	# flush the prefetch queue.
>  	jmp 1f
> +1:	jmp 1f
>  1:

Is this really neccessary? One jump should be
ok...

> @@ -160,11 +164,12 @@
>  	ALIGN
>  
>  
> -.org	0x2000
> +.org	0x800
>  wakeup_stack:
> -.org	0x3000
> +.org	0x900
>  ENTRY(wakeup_end)
> -.org	0x4000
> +# .org	0x1000
> +	.align 4096

Kill the comment, otherwise ok.

>  wakeup_pmode_return:
>  	movl	___KERNEL_DS, %eax


-- 
				Pavel
Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need...

Re: [ACPI] acpi_wakeup fixes: Patch?

[P. Christeas]

It seems you have been trying to correct the acpi_wakeup code (back at 17 
Dec). Has that been merged to Linus' tree?

I got 2.5.58 today, acpi_wakeup.S is still dated 16 Dec and that patch 
regarding the location of the wakeup asm code (see the '2.5.51: sleep 
broken') has not reached me through Linus' patches.

Re: [ACPI] acpi_wakeup fixes: Patch?

[Ducrot Bruno]

On Tue, Jan 14, 2003 at 07:56:23PM +0200, P. Christeas wrote:
> It seems you have been trying to correct the acpi_wakeup code (back at 17 
> Dec). Has that been merged to Linus' tree?
> 
> I got 2.5.58 today, acpi_wakeup.S is still dated 16 Dec and that patch 
> regarding the location of the wakeup asm code (see the '2.5.51: sleep 
> broken') has not reached me through Linus' patches.

For me, this patch is correct.  Don't know why it is not merged.

Cheers,

-- 
Ducrot Bruno

--  Which is worse:  ignorance or apathy?
--  Don't know.  Don't care.