Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756741AbYATXjQ (ORCPT ); Sun, 20 Jan 2008 18:39:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756151AbYATXjA (ORCPT ); Sun, 20 Jan 2008 18:39:00 -0500 Received: from gprs189-60.eurotel.cz ([160.218.189.60]:58006 "EHLO amd.ucw.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756153AbYATXi7 (ORCPT ); Sun, 20 Jan 2008 18:38:59 -0500 Date: Mon, 21 Jan 2008 00:39:12 +0100 From: Pavel Machek To: Ingo Molnar Cc: Andrew Morton , "Rafael J. Wysocki" , Zan Lynx , Thomas Gleixner , Len Brown , linux-kernel@vger.kernel.org Subject: Re: echo mem > /sys/power/state Message-ID: <20080120233912.GA4844@elf.ucw.cz> References: <20080116222445.6f7ff66e.akpm@linux-foundation.org> <1200591411.34145.4.camel@localhost> <20080117111355.29554f38.akpm@linux-foundation.org> <200801172238.17176.rjw@sisk.pl> <20080118083610.GA19792@elte.hu> <20080118004725.dcd132ee.akpm@linux-foundation.org> <20080118121803.GF11044@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080118121803.GF11044@elte.hu> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5032 Lines: 181 Hi! Ingo wanted simple sleep self-test... Here's something. set_alarm needs to move into rtc-cmos, and I guess I should boottest it... Pavel ~be careful what you wish for~ Machek diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 29cf145..d830ed2 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -78,7 +78,7 @@ static inline int is_intr(u8 rtc_intr) /*----------------------------------------------------------------*/ -static int cmos_read_time(struct device *dev, struct rtc_time *t) +int cmos_read_time(struct device *dev, struct rtc_time *t) { /* REVISIT: if the clock has a "century" register, use * that instead of the heuristic in get_rtc_time(). @@ -170,7 +170,7 @@ static int cmos_read_alarm(struct device return 0; } -static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t) +int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t) { struct cmos_rtc *cmos = dev_get_drvdata(dev); unsigned char mon, mday, hrs, min, sec; @@ -394,6 +394,7 @@ static const struct rtc_class_ops cmos_r /*----------------------------------------------------------------*/ static struct cmos_rtc cmos_rtc; +struct device *pc_rtc_device; static irqreturn_t cmos_interrupt(int irq, void *p) { @@ -431,6 +432,8 @@ cmos_do_probe(struct device *dev, struct if (cmos_rtc.dev) return -EBUSY; + pc_rtc_device = dev; + if (!ports) return -ENODEV; @@ -546,7 +549,7 @@ cleanup0: static void cmos_do_shutdown(void) { - unsigned char rtc_control; + unsigned char rtc_control; spin_lock_irq(&rtc_lock); rtc_control = CMOS_READ(RTC_CONTROL); diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 8e186c6..2886056 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -53,14 +53,20 @@ config PM_TRACE RTC across reboots, so that you can debug a machine that just hangs during suspend (or more commonly, during resume). - To use this debugging feature you should attempt to suspend the machine, - then reboot it, then run + To use this debugging feature you should attempt to suspend the + machine, then reboot it, then run dmesg -s 1000000 | grep 'hash matches' CAUTION: this option will cause your machine's real-time clock to be set to an invalid time after a resume. +config PM_SLEEPY_TEST + bool "Test suspend/resume during bootup" + depends on PM_DEBUG && PM_SLEEP + ---help--- + This option will suspend/resume your machine during bootup. + config PM_SLEEP_SMP bool depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE diff --git a/kernel/power/Makefile b/kernel/power/Makefile index f7dfff2..e5693d6 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -5,7 +5,7 @@ endif obj-y := main.o obj-$(CONFIG_PM_LEGACY) += pm.o -obj-$(CONFIG_PM_SLEEP) += process.o console.o +obj-$(CONFIG_PM_SLEEP) += process.o console.o sleepy.o obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o diff --git a/kernel/power/sleepy.c b/kernel/power/sleepy.c new file mode 100644 index 0000000..bb9bbaa --- /dev/null +++ b/kernel/power/sleepy.c @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2007 Pavel Machek + * + * This file is released under the GPLv2 + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "power.h" + + +extern struct device *pc_rtc_device; +extern int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t); +extern int cmos_read_time(struct device *dev, struct rtc_time *t); + +int set_alarm(int length) +{ + ssize_t retval; + unsigned long now, alarm; + struct rtc_wkalrm alm; + struct rtc_device *rtc = to_rtc_device(pc_rtc_device); + + retval = cmos_read_time(pc_rtc_device, &alm.time); + if (retval < 0) { + printk("Auto sleep: can't get time?\n"); + return retval; + } + rtc_tm_to_time(&alm.time, &now); + printk("Auto sleep: Now %ld\n", now); + + alarm = now+length; + rtc_time_to_tm(alarm, &alm.time); + + retval = cmos_set_alarm(rtc, &alm); + if (retval < 0) { + printk("Auto sleep: can't set alarm.\n"); + return retval; + } + printk("Auto sleep: Alarm set\n"); +} + +#ifdef CONFIG_SLEEPY_TEST +static int +test_sleep(void) +{ + set_alarm(1); + pm_suspend(PM_SUSPEND_MEM); + return 0; +} + +late_initcall(test_sleep); +#endif -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/