Re: port-i386/44581: MacBook1,1 won't resume after suspend

[Jukka Ruohonen <jruohonen%iki.fi@localhost>]

On Wed, Feb 16, 2011 at 04:40:04PM +0000, Taylor R Campbell wrote:
>  If I disable Firewire, the machine seems to reliably resume.  However,
>  after it resumes, there is an interrupt storm on ioapic0 pin 9.  This
>  happens whether I use `drvctl -d fwohci0' or whether I add `no fwohci*
>  at pci?' to my kernel configuration, so it doesn't seem related to
>  Firewire.  (fwohci0 takes ioapic0 pin 19.)
>  
>  Suggestions?

This is kind of shot in the dark, but can you try the following small patch?

- Jukka.

Index: acpi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi.c,v
retrieving revision 1.235
diff -u -p -r1.235 acpi.c
--- acpi.c      15 Feb 2011 20:24:11 -0000      1.235
+++ acpi.c      16 Feb 2011 17:36:22 -0000
@@ -1370,9 +1370,9 @@ acpi_enter_sleep_state(int state)
                                AcpiEnable();
 
                        (void)pmf_system_bus_resume(PMF_Q_NONE);
+                       (void)pmf_system_resume(PMF_Q_NONE);
                        (void)AcpiLeaveSleepState(state);
                        (void)AcpiSetFirmwareWakingVector(0);
-                       (void)pmf_system_resume(PMF_Q_NONE);
                }
 
                break;