Hi!
Separate ACPI_SLEEP and SOFTWARE_SUSPEND options, plus some printk
cleanups, yenta fix and comment fixes. Please apply,
Pavel
--- /usr/src/tmp/linux/arch/i386/Kconfig 2003-07-14 22:12:12.000000000 +0200
+++ /usr/src/linux/arch/i386/Kconfig 2003-07-17 22:22:58.000000000 +0200
@@ -829,24 +829,19 @@
(patch for sysvinit needed).
It creates an image which is saved in your active swaps. By the next
- booting the, pass 'resume=/path/to/your/swap/file' and kernel will
+ booting the, pass 'resume=/dev/swappartition' and kernel will
detect the saved image, restore the memory from
it and then it continues to run as before you've suspended.
If you don't want the previous state to continue use the 'noresume'
kernel option. However note that your partitions will be fsck'd and
- you must re-mkswap your swap partitions/files.
+ you must re-mkswap your swap partitions. It does not work with swap
+ files.
Right now you may boot without resuming and then later resume but
in meantime you cannot use those swap partitions/files which were
involved in suspending. Also in this case there is a risk that buffers
on disk won't match with saved ones.
- SMP is supported ``as-is''. There's a code for it but doesn't work.
- There have been problems reported relating SCSI.
-
- This option is about getting stable. However there is still some
- absence of features.
-
For more information take a look at Documentation/swsusp.txt.
source "drivers/acpi/Kconfig"
--- /usr/src/tmp/linux/arch/i386/kernel/Makefile 2003-07-06 20:06:50.000000000 +0200
+++ /usr/src/linux/arch/i386/kernel/Makefile 2003-07-17 22:22:58.000000000 +0200
@@ -24,7 +24,8 @@
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o suspend_asm.o
+obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
+obj-$(CONFIG_PM) += suspend_asm.o
obj-$(CONFIG_X86_NUMAQ) += numaq.o
obj-$(CONFIG_X86_SUMMIT) += summit.o
obj-$(CONFIG_EDD) += edd.o
--- /usr/src/tmp/linux/arch/i386/kernel/suspend_asm.S 2003-05-27 13:42:29.000000000 +0200
+++ /usr/src/linux/arch/i386/kernel/suspend_asm.S 2003-07-17 22:22:58.000000000 +0200
@@ -32,6 +32,7 @@
saved_context_eflags:
.long 0
+#ifdef CONFIG_SOFTWARE_SUSPEND
.text
ENTRY(do_magic)
@@ -117,4 +118,4 @@
loop2:
.quad 0
.previous
-
\ No newline at end of file
+#endif
\ No newline at end of file
--- /usr/src/tmp/linux/arch/i386/kernel/sysenter.c 2003-05-27 13:42:29.000000000 +0200
+++ /usr/src/linux/arch/i386/kernel/sysenter.c 2003-07-17 22:22:58.000000000 +0200
@@ -31,8 +31,6 @@
wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0);
wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0);
-
- printk("Enabling SEP on CPU %d\n", cpu);
put_cpu();
}
--- /usr/src/tmp/linux/drivers/acpi/Kconfig 2003-06-24 12:27:45.000000000 +0200
+++ /usr/src/linux/drivers/acpi/Kconfig 2003-07-17 22:22:58.000000000 +0200
@@ -58,8 +58,8 @@
default y
config ACPI_SLEEP
- bool "Sleep States"
- depends on X86 && ACPI && !ACPI_HT_ONLY && SOFTWARE_SUSPEND
+ bool "Sleep States (EXPERIMENTAL)"
+ depends on X86 && ACPI && !ACPI_HT_ONLY && EXPERIMENTAL
---help---
This option adds support for ACPI suspend states.
--- /usr/src/tmp/linux/drivers/acpi/sleep/main.c 2003-07-20 14:51:14.000000000 +0200
+++ /usr/src/linux/drivers/acpi/sleep/main.c 2003-07-20 14:29:39.000000000 +0200
@@ -75,10 +81,6 @@
* First, we call to the device driver layer to save device state.
* Once we have that, we save whatevery processor and kernel state we
* need to memory.
- * If we're entering S4, we then write the memory image to disk.
- *
- * Only then is it safe for us to power down devices, since we may need
- * the disks and upstream buses to write to.
*/
acpi_status
acpi_system_save_state(
@@ -203,7 +205,7 @@
break;
}
local_irq_restore(flags);
- printk(KERN_CRIT "Back to C!\n");
+ printk(KERN_DEBUG "Back to C!\n");
return status;
}
--- /usr/src/tmp/linux/drivers/base/power.c 2003-06-15 22:42:36.000000000 +0200
+++ /usr/src/linux/drivers/base/power.c 2003-07-17 22:22:58.000000000 +0200
@@ -52,8 +52,6 @@
struct device * dev;
int error = 0;
- printk(KERN_EMERG "Suspending devices\n");
-
down_write(&devices_subsys.rwsem);
list_for_each_entry_reverse(dev,&devices_subsys.kset.list,kobj.entry) {
if (dev->driver && dev->driver->suspend) {
@@ -114,8 +112,6 @@
}
}
up_write(&devices_subsys.rwsem);
-
- printk(KERN_EMERG "Devices Resumed\n");
}
/**
@@ -125,8 +121,6 @@
{
struct device * dev;
- printk(KERN_EMERG "Shutting down devices\n");
-
down_write(&devices_subsys.rwsem);
list_for_each_entry_reverse(dev,&devices_subsys.kset.list,kobj.entry) {
pr_debug("shutting down %s: ",dev->name);
--- /usr/src/tmp/linux/drivers/pcmcia/yenta_socket.c 2003-07-14 22:12:19.000000000 +0200
+++ /usr/src/linux/drivers/pcmcia/yenta_socket.c 2003-07-17 22:22:58.000000000 +0200
@@ -899,7 +899,10 @@
static int yenta_dev_suspend (struct pci_dev *dev, u32 state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state, 0);
+ /* FIXME: We should really let devices to act on *all* levels :-(.
+ If you put something else than SUSPEND_SAVE_STATE,
+ pcmcia_socket_dev_suspend() will simply do nothing due to its check. */
+ return pcmcia_socket_dev_suspend(&dev->dev, state, SUSPEND_SAVE_STATE);
}
--- /usr/src/tmp/linux/include/linux/reboot.h 2003-06-15 22:43:36.000000000 +0200
+++ /usr/src/linux/include/linux/reboot.h 2003-07-17 22:22:58.000000000 +0200
@@ -21,7 +21,7 @@
* CAD_OFF Ctrl-Alt-Del sequence sends SIGINT to init task.
* POWER_OFF Stop OS and remove all power from system, if possible.
* RESTART2 Restart system using given command string.
- * SW_SUSPEND Suspend system using Software Suspend if compiled in
+ * SW_SUSPEND Suspend system using software suspend if compiled in.
*/
#define LINUX_REBOOT_CMD_RESTART 0x01234567
--- /usr/src/tmp/linux/include/linux/suspend.h 2003-03-06 23:26:14.000000000 +0100
+++ /usr/src/linux/include/linux/suspend.h 2003-07-17 22:22:58.000000000 +0200
@@ -55,10 +55,6 @@
extern int register_suspend_notifier(struct notifier_block *);
extern int unregister_suspend_notifier(struct notifier_block *);
-extern void refrigerator(unsigned long);
-
-extern int freeze_processes(void);
-extern void thaw_processes(void);
extern unsigned int nr_copy_pages __nosavedata;
extern suspend_pagedir_t *pagedir_nosave __nosavedata;
@@ -75,16 +71,26 @@
extern void do_suspend_lowlevel(int resume);
extern void do_suspend_lowlevel_s4bios(int resume);
+#ifndef CONFIG_PM
+#error Bad config
+#endif
+
#else
-static inline void software_suspend(void)
-{
-}
+static inline void software_suspend(void) { }
#define software_resume() do { } while(0)
#define register_suspend_notifier(a) do { } while(0)
#define unregister_suspend_notifier(a) do { } while(0)
+#endif
+
+#ifdef CONFIG_PM
+extern void refrigerator(unsigned long);
+extern int freeze_processes(void);
+extern void thaw_processes(void);
+#else
#define refrigerator(a) do { BUG(); } while(0)
#define freeze_processes() do { panic("You need CONFIG_SOFTWARE_SUSPEND to do sleeps."); } while(0)
#define thaw_processes() do { } while(0)
#endif
+
#endif /* _LINUX_SWSUSP_H */
--- /usr/src/tmp/linux/kernel/Makefile 2003-05-27 13:44:02.000000000 +0200
+++ /usr/src/linux/kernel/Makefile 2003-07-17 22:22:58.000000000 +0200
@@ -17,7 +17,7 @@
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
-obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
+obj-$(CONFIG_PM) += suspend.o
obj-$(CONFIG_COMPAT) += compat.o
ifneq ($(CONFIG_IA64),y)
diff -ur -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkeymap.c -x uni_hash.tbl -x zImage -x vmlinux -x vmlinuz -x TAGS -x bootsect -x '*RCS*' -x conmakehash -x map -x build -x build -x configure -x '*target*' -x '*.flags' -x '*.bak' -x '*.cmd' /usr/src/tmp/linux/kernel/suspend.c /usr/src/linux/kernel/suspend.c
--- /usr/src/tmp/linux/kernel/suspend.c 2003-07-20 14:51:14.000000000 +0200
+++ /usr/src/linux/kernel/suspend.c 2003-07-20 14:36:04.000000000 +0200
@@ -65,6 +65,7 @@
#include <asm/pgtable.h>
#include <asm/io.h>
+#ifdef CONFIG_SOFTWARE_SUSPEND
extern long sys_sync(void);
unsigned char software_suspend_enabled = 0;
@@ -78,7 +79,6 @@
#undef SUSPEND_CONSOLE
#endif
-#define TIMEOUT (6 * HZ) /* Timeout for stopping processes */
#define __ADDRESS(x) ((unsigned long) phys_to_virt(x))
#define ADDRESS(x) __ADDRESS((x) << PAGE_SHIFT)
#define ADDRESS2(x) __ADDRESS(__pa(x)) /* Needed for x86-64 where some pages are in memory twice */
@@ -139,17 +139,17 @@
static const char name_suspend[] = "Suspend Machine: ";
static const char name_resume[] = "Resume Machine: ";
+#endif
/*
* Debug
*/
-#define DEBUG_DEFAULT
-#undef DEBUG_PROCESS
+#undef DEBUG_DEFAULT
#undef DEBUG_SLOW
#define TEST_SWSUSP 1 /* Set to 1 to reboot instead of halt machine after suspension */
#ifdef DEBUG_DEFAULT
-# define PRINTK(f, a...) do { printk(f, ## a); } while (0)
+# define PRINTK(f, a...) printk(f, ## a)
#else
# define PRINTK(f, a...) do {} while (0)
#endif
@@ -173,6 +173,8 @@
if (p->state == TASK_ZOMBIE) \
continue;
+#define TIMEOUT (6 * HZ) /* Timeout for stopping processes */
+
/* Refrigerator is place where frozen processes are stored :-). */
void refrigerator(unsigned long flag)
{
@@ -260,6 +262,7 @@
MDELAY(500);
}
+#ifdef CONFIG_SOFTWARE_SUSPEND
/*
* Saving part...
*/
@@ -563,7 +566,6 @@
free_suspend_pagedir((unsigned long) pagedir);
return NULL;
}
- printk(".");
SetPageNosave(virt_to_page(p->address));
p->orig_address = 0;
p++;
@@ -585,8 +587,8 @@
return 1;
set_console (SUSPEND_CONSOLE);
- if(vt_waitactive(SUSPEND_CONSOLE)) {
- PRINTK("Bummer. Can't switch VCs.");
+ if (vt_waitactive(SUSPEND_CONSOLE)) {
+ printk(KERN_ERR "Bummer. Can't switch VCs.\n");
return 1;
}
orig_kmsg = kmsg_redirect;
@@ -854,7 +856,6 @@
free_pages((unsigned long) pagedir_nosave, pagedir_order);
spin_unlock_irq(&suspend_pagedir_lock);
mark_swapfiles(((swp_entry_t) {0}), MARK_SWAP_RESUME);
- PRINTK(KERN_WARNING "%sLeaving do_magic_suspend_2...\n", name_suspend);
}
static void do_software_suspend(void)
@@ -1280,4 +1281,5 @@
EXPORT_SYMBOL(software_suspend);
EXPORT_SYMBOL(software_suspend_enabled);
+#endif
EXPORT_SYMBOL(refrigerator);
-- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?] - 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/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:40 EST