Re: [PATCH] ACPI poweroff fixes for 2.4.26-pre2

[Willy Tarreau <willy-tRhHnHjXm5DYtjvyW6yDsg@public.gmane.org>]

Hi,

On Sun, Mar 14, 2004 at 03:51:31PM +0000, S?rgio Monteiro Basto wrote:
> Hi 
> the patch 1 can't be applied because 
> we still have on line 341 of drivers/acpi/system.c :
>     status = acpi_system_save_state(state);
> 
> the patch 2 has been applied on acpi-20040311-2.4.26.diff.gz,
>    [ACPI] SMP poweroff (David Shaohua Li)
>    http://bugzilla.kernel.org/show_bug.cgi?id=1141
> and is a little different:
> +       /* Some SMP machines only can poweroff in boot CPU */
> +       set_cpus_allowed(current, 1UL << cpu_logical_map(0));
>                                   ^^^

OK it's equivalent, but cleaner with 1UL.

> have you some suggestion for correction of patch 1 ?

It's really trivial. Try the following one. BTW, be aware that Bruno believes
that this patch and the patch in BK might break IDE in some circumstances
(if interfaces are already powered down if I understand him correctly). So
even if what is done right here is relatively equivalent to current code in BK
without the dependency, it has great chances of not being definitive code.

Bruno, do you think that calling either one or the other pm_send line below
would still make sense and/or break IDE ? I haven't tested yet. IIRC my
notebook stopped correctly if I just disabled APIC in acpi_power_off().
Perhaps we should get back to something more APIC related, but I'm not
confident it will be enough for every hardware (at least it doesn't seem
to be enough if I use the atyfb on this notebook, I'll have to recheck).

Cheers,
Willy

--- linux-2.4.26-pre3-acpi/drivers/acpi/system.c	Mon Mar 15 21:54:55 2004
+++ linux-2.4.26-pre3-acpi-pwoff/drivers/acpi/system.c	Mon Mar 15 21:57:32 2004
@@ -46,13 +46,6 @@
 #include <linux/mc146818rtc.h>
 #include <linux/irq.h>
 #include <asm/hw_irq.h>
-
-acpi_status acpi_system_save_state(u32);
-#else
-static inline acpi_status acpi_system_save_state(u32 state)
-{
-	return AE_OK;
-}
 #endif /* !CONFIG_ACPI_SLEEP */
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
@@ -102,7 +95,8 @@
 		BUG();
 	/* Some SMP machines only can poweroff in boot CPU */
 	set_cpus_allowed(current, 1UL << cpu_logical_map(0));
-	acpi_system_save_state(ACPI_STATE_S5);
+	pm_send_all(PM_SAVE_STATE, (void *)3);
+	pm_send_all(PM_SUSPEND, (void *)3);
 	acpi_enter_sleep_state_prep(ACPI_STATE_S5);
 	ACPI_DISABLE_IRQS();
 	acpi_enter_sleep_state(ACPI_STATE_S5);




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click