>From: Satoru Takeuchi <takeuchi_satoru@xxxxxxxxxxxxxx>
>
>Currently wakeup capability is available if and only if
>CONFIG_ACPI_SLEEP=y. But S5 is not a sleep state. This patch
>makes ACPI
>subsystem to be able to wakeup from S5 state even if sleep mode is not
>supported.
Is the goal to use wakeup devices for S5
with a kernel that has CONFIG_ACPI_SLEEP=n?
Why is it important not to have CONFIG_ACPI_SLEEP=y?
I'm not excited about all the ifdefs.
-Len
>Signed-off-by: Satoru Takeuchi <takeuchi_satoru@xxxxxxxxxxxxxx>
>Cc: "Brown, Len" <len.brown@xxxxxxxxx>
>Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
>Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
>---
>
> drivers/acpi/sleep/Makefile | 3 +--
> drivers/acpi/sleep/poweroff.c | 1 +
> drivers/acpi/sleep/proc.c | 16 ++++++++++++++++
> drivers/acpi/sleep/wakeup.c | 2 ++
> 4 files changed, 20 insertions(+), 2 deletions(-)
>
>diff -puN
>drivers/acpi/sleep/Makefile~acpi-ia64-wake-on-lan-fix
>drivers/acpi/sleep/Makefile
>---
>devel/drivers/acpi/sleep/Makefile~acpi-ia64-wake-on-lan-fix
>2006-03-28 14:03:06.000000000 -0800
>+++ devel-akpm/drivers/acpi/sleep/Makefile 2006-03-28
>14:03:06.000000000 -0800
>@@ -1,5 +1,4 @@
>-obj-y := poweroff.o wakeup.o
>+obj-y := poweroff.o wakeup.o proc.o
> obj-$(CONFIG_ACPI_SLEEP) += main.o
>-obj-$(CONFIG_ACPI_SLEEP_PROC_FS) += proc.o
>
> EXTRA_CFLAGS += $(ACPI_CFLAGS)
>diff -puN
>drivers/acpi/sleep/poweroff.c~acpi-ia64-wake-on-lan-fix
>drivers/acpi/sleep/poweroff.c
>---
>devel/drivers/acpi/sleep/poweroff.c~acpi-ia64-wake-on-lan-fix
>2006-03-28 14:03:06.000000000 -0800
>+++ devel-akpm/drivers/acpi/sleep/poweroff.c 2006-03-28
>14:03:06.000000000 -0800
>@@ -45,6 +45,7 @@ void acpi_power_off(void)
> /* acpi_sleep_prepare(ACPI_STATE_S5) should have
>already been called */
> printk("%s called\n", __FUNCTION__);
> local_irq_disable();
>+ acpi_enable_wakeup_device(ACPI_STATE_S5);
> /* Some SMP machines only can poweroff in boot CPU */
> acpi_enter_sleep_state(ACPI_STATE_S5);
> }
>diff -puN drivers/acpi/sleep/proc.c~acpi-ia64-wake-on-lan-fix
>drivers/acpi/sleep/proc.c
>--- devel/drivers/acpi/sleep/proc.c~acpi-ia64-wake-on-lan-fix
>2006-03-28 14:03:06.000000000 -0800
>+++ devel-akpm/drivers/acpi/sleep/proc.c 2006-03-28
>14:03:06.000000000 -0800
>@@ -70,6 +70,7 @@ acpi_system_write_sleep(struct file *fil
> }
> #endif /*
>CONFIG_ACPI_SLEEP_PROC_SLEEP */
>
>+#ifdef CONFIG_ACPI_SLEEP
> static int acpi_system_alarm_seq_show(struct seq_file *seq,
>void *offset)
> {
> u32 sec, min, hr;
>@@ -339,6 +340,7 @@ acpi_system_write_alarm(struct file *fil
> end:
> return_VALUE(result ? result : count);
> }
>+#endif /* CONFIG_ACPI_SLEEP */
>
> extern struct list_head acpi_wakeup_device_list;
> extern spinlock_t acpi_device_lock;
>@@ -357,6 +359,10 @@ acpi_system_wakeup_device_seq_show(struc
>
> if (!dev->wakeup.flags.valid)
> continue;
>+#ifndef CONFIG_ACPI_SLEEP
>+ if (dev->wakeup.sleep_state != ACPI_STATE_S5)
>+ continue;
>+#endif
> spin_unlock(&acpi_device_lock);
> seq_printf(seq, "%4s %4d %s%8s\n",
> dev->pnp.bus_id,
>@@ -394,6 +400,10 @@ acpi_system_write_wakeup_device(struct f
> container_of(node, struct acpi_device, wakeup_list);
> if (!dev->wakeup.flags.valid)
> continue;
>+#ifndef CONFIG_ACPI_SLEEP
>+ if (dev->wakeup.sleep_state != ACPI_STATE_S5)
>+ continue;
>+#endif
>
> if (!strncmp(dev->pnp.bus_id, str, 4)) {
> dev->wakeup.state.enabled =
>@@ -452,6 +462,7 @@ static struct file_operations acpi_syste
> };
> #endif /*
>CONFIG_ACPI_SLEEP_PROC_SLEEP */
>
>+#ifdef CONFIG_ACPI_SLEEP
> static struct file_operations acpi_system_alarm_fops = {
> .open = acpi_system_alarm_open_fs,
> .read = seq_read,
>@@ -467,6 +478,7 @@ static u32 rtc_handler(void *context)
>
> return ACPI_INTERRUPT_HANDLED;
> }
>+#endif /* CONFIG_ACPI_SLEEP */
>
> static int acpi_sleep_proc_init(void)
> {
>@@ -484,12 +496,14 @@ static int acpi_sleep_proc_init(void)
> entry->proc_fops = &acpi_system_sleep_fops;
> #endif
>
>+#ifdef CONFIG_ACPI_SLEEP
> /* 'alarm' [R/W] */
> entry =
> create_proc_entry("alarm", S_IFREG | S_IRUGO | S_IWUSR,
> acpi_root_dir);
> if (entry)
> entry->proc_fops = &acpi_system_alarm_fops;
>+#endif
>
> /* 'wakeup device' [R/W] */
> entry =
>@@ -498,7 +512,9 @@ static int acpi_sleep_proc_init(void)
> if (entry)
> entry->proc_fops = &acpi_system_wakeup_device_fops;
>
>+#ifdef CONFIG_ACPI_SLEEP
> acpi_install_fixed_event_handler(ACPI_EVENT_RTC,
>rtc_handler, NULL);
>+#endif
> return 0;
> }
>
>diff -puN
>drivers/acpi/sleep/wakeup.c~acpi-ia64-wake-on-lan-fix
>drivers/acpi/sleep/wakeup.c
>---
>devel/drivers/acpi/sleep/wakeup.c~acpi-ia64-wake-on-lan-fix
>2006-03-28 14:03:06.000000000 -0800
>+++ devel-akpm/drivers/acpi/sleep/wakeup.c 2006-03-28
>14:03:06.000000000 -0800
>@@ -48,6 +48,7 @@ void acpi_enable_wakeup_device_prep(u8 s
> }
> spin_unlock(&acpi_device_lock);
> }
>+#endif
>
> /**
> * acpi_enable_wakeup_device - enable wakeup devices
>@@ -100,6 +101,7 @@ void acpi_enable_wakeup_device(u8 sleep_
> spin_unlock(&acpi_device_lock);
> }
>
>+#ifdef CONFIG_ACPI_SLEEP
> /**
> * acpi_disable_wakeup_device - disable devices' wakeup capability
> * @sleep_state: ACPI state
>_
>-
>To unsubscribe from this list: send the line "unsubscribe
>linux-acpi" in
>the body of a message to majordomo@xxxxxxxxxxxxxxx
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
