Re: [stable] Suspend regression in stable kernel 2.6.27.4 on Mac mini Core Duo

[Rafael J. Wysocki]

On Wednesday, 12 of November 2008, Rafael J. Wysocki wrote:
> On Tuesday, 11 of November 2008, Tino Keitel wrote:
> > On Tue, Nov 11, 2008 at 15:16:08 +0100, Rafael J. Wysocki wrote:
> > 
> > [...]
> > 
> > > This really is not a good news, because this commit evidently fixes at least
> > > several systems.
> > > 
> > > First, let's try to remove things that we shouldn't be doing.
> > > 
> > > Please apply the patch below to 2.6.27.5 without reverting that commit and see
> > > if that works.
> > 
> > It doesn't work. 2.6.27.5 with the patch applied hangs at resume.
> 
> Well, this appears to be a broken BIOS thing.  Perhaps we'll have to blacklist
> the box or something.
> 
> Is there any possibility to get some information about where exactly it hangs?

Also, can you check this patch on top of 2.6.27.4 and see what happens?

Rafael

---
 drivers/acpi/pci_link.c   |    4 ----
 drivers/acpi/sleep/main.c |    3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

Index: linux-2.6/drivers/acpi/pci_link.c
===================================================================
--- linux-2.6.orig/drivers/acpi/pci_link.c
+++ linux-2.6/drivers/acpi/pci_link.c
@@ -796,10 +796,6 @@ static int irqrouter_resume(struct sys_d
 	struct list_head *node = NULL;
 	struct acpi_pci_link *link = NULL;
 
-
-	/* Make sure SCI is enabled again (Apple firmware bug?) */
-	acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
-
 	list_for_each(node, &acpi_link.entries) {
 		link = list_entry(node, struct acpi_pci_link, node);
 		if (!link) {
Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/main.c
+++ linux-2.6/drivers/acpi/sleep/main.c
@@ -249,7 +249,8 @@ static int acpi_suspend_enter(suspend_st
 	}
 
 	/* If ACPI is not enabled by the BIOS, we need to enable it here. */
-	acpi_enable();
+	acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
+	/*acpi_enable();*/
 	/* Reprogram control registers and execute _BFS */
 	acpi_leave_sleep_state_prep(acpi_state);
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/