[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: kacpid respawning under linux-2.4.20 on Toshiba Satellite 5105

[Ken Hughes]

A follow-up to my last post:

I traced my problem to this code in drivers/acpi/osl.c in 
acpi_os_derive_pci_id():

        /* any nicer way to get bus number of bridge ? */
        status = acpi_os_read_pci_configuration(pci_id, 0x0e, &tu8, 8);
       if (ACPI_SUCCESS(status) && (tu8 & 0x7f) == 1) {
                status = acpi_os_read_pci_configuration(pci_id,0x19, 
&tu8, 8);
                if (ACPI_SUCCESS(status))
                        pci_id->bus = tu8;

If I replace the assignment to pci_id->bus with a printk, the zombie 
kacpidpc
processes go away.  The value shown for tu8 is 2.  pci_id->device is 
0x1e and
pci_id->function is 0 at this point.

I don't know if it's related, but I also see the following messages 
earlier
via dmesg:


PCI: Probing PCI hardware (bus 00)
Transparent bridge - Intel Corp. 82801BAM/CAM PCI Bridge
ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]
ACPI: PCI Interrupt Routing Table [\_SB_.PCI0.PCIB._PRT]
pci_bind-0194 [05] acpi_pci_bind         : Device 00:02:0a.00 not 
present in PCI namespace
pci_bind-0194 [05] acpi_pci_bind         : Device 00:02:0a.01 not 
present in PCI namespace
ACPI: PCI Interrupt Routing Table [\_SB_.PCI0.PCI1._PRT]

Here's my lspci output:

29 budgie: lspci 00:00.0 Host bridge: Intel Corp. 82845 845 (Brookdale) 
Chipset Host Bridge (rev 04)
00:01.0 PCI bridge: Intel Corp. 82845 845 (Brookdale) Chipset AGP 
Bridge (rev 04)
00:1d.0 USB Controller: Intel Corp. 82801CA/CAM USB (Hub #1) (rev 02)
00:1d.1 USB Controller: Intel Corp. 82801CA/CAM USB (Hub #2) (rev 02)
00:1d.2 USB Controller: Intel Corp. 82801CA/CAM USB (Hub #3) (rev 02)
00:1e.0 PCI bridge: Intel Corp. 82801BAM/CAM PCI Bridge (rev 42)
00:1f.0 ISA bridge: Intel Corp. 82801CAM ISA Bridge (LPC) (rev 02)
00:1f.1 IDE interface: Intel Corp. 82801CAM IDE U100 (rev 02)
00:1f.5 Multimedia audio controller: Intel Corp. 82801CA/CAM AC'97 
Audio (rev 02)
00:1f.6 Modem: Intel Corp. 82801CA/CAM AC'97 Modem (rev 02)
01:00.0 VGA compatible controller: nVidia Corporation NV17 [GeForce4 
440 Go] (rev a3)
02:07.0 FireWire (IEEE 1394): Texas Instruments TSB43AB22 1394a-2000 
Controller
02:08.0 Ethernet controller: Intel Corp. 82801CAM (ICH3) Chipset 
Ethernet Controller (rev 42)
02:0b.0 CardBus bridge: Toshiba America Info Systems ToPIC95 PCI to 
Cardbus Bridge with ZV Support (rev 32)
02:0b.1 CardBus bridge: Toshiba America Info Systems ToPIC95 PCI to 
Cardbus Bridge with ZV Support (rev 32)
02:0c.0 System peripheral: Toshiba America Info Systems: Unknown device 
0804 (rev 03)
02:0d.0 System peripheral: Toshiba America Info Systems: Unknown device 
0805 (rev 03)

Any ideas?

Ken


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

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.