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

["Sérgio Monteiro Basto" <sergiomb-hHo3WeeoaswVhHzd4jOs4w@public.gmane.org>]

On Tue, 2004-03-09 at 23:33, Willy Tarreau wrote:
> On Mon, Mar 08, 2004 at 09:54:44PM +0100, Pavel Machek wrote:
> > Can you replace
> > 
> > acpi_system_save_state() with
> >         pm_send_all(PM_SAVE_STATE, (void *)3);
> >         pm_send_all(PM_SUSPEND, (void *)3);
> > ?
> > That should fix it, too, and does not depend on CONFIG_ACPI_SLEEP.

Patch 1:
> diff -urN linux-2.4.26-pre2/drivers/acpi/system.c linux-2.4.26-pre2-pwoff/drivers/acpi/system.c
> --- linux-2.4.26-pre2/drivers/acpi/system.c	Wed Mar 10 00:36:20 2004
> +++ linux-2.4.26-pre2-pwoff/drivers/acpi/system.c	Wed Mar 10 00:43:48 2004
> @@ -45,13 +45,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
> @@ -99,7 +92,8 @@
>  {
>  	if (unlikely(in_interrupt())) 
>  		BUG();
> -	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);
> 
> 
> Len, do you have any objection against this one ?
> BTW, did you get the previous one dedicated to SMP ? Here it is
> rediffed after this one, just in case :

Patch 2:
> diff -urN linux-2.4.26-pre2-pwoff/drivers/acpi/system.c linux-2.4.26-pre2-pwoff-smp/drivers/acpi/system.c
> --- linux-2.4.26-pre2-pwoff/drivers/acpi/system.c	Wed Mar 10 00:43:48 2004
> +++ linux-2.4.26-pre2-pwoff-smp/drivers/acpi/system.c	Wed Mar 10 00:44:26 2004
> @@ -40,6 +40,7 @@
>  #include <asm/acpi.h>
>  #include <acpi/acpi_bus.h>
>  #include <acpi/acpi_drivers.h>
> +#include <linux/sched.h>
>  
>  #ifdef CONFIG_ACPI_SLEEP
>  #include <linux/mc146818rtc.h>
> @@ -92,6 +93,10 @@
>  {
>  	if (unlikely(in_interrupt())) 
>  		BUG();
> +#ifdef CONFIG_SMP
> +	/* Some SMP machines only can poweroff in boot CPU */
> +	set_cpus_allowed(current, 1 << cpu_logical_map(0));
> +#endif
>  	pm_send_all(PM_SAVE_STATE, (void *)3);
>  	pm_send_all(PM_SUSPEND, (void *)3);
>  	acpi_enter_sleep_state_prep(ACPI_STATE_S5);

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));
                                  ^^^

have you some suggestion for correction of patch 1 ?

thanks
-- 
Sérgio M. B.



-------------------------------------------------------
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\x1470&alloc_id638&op=click