Suspend 2 merge
Subsystems (9)
Quoted 7 lines
My machine suspends in 7 seconds, and that's swsusp1. According to your numbers, suspend2 should suspend it in 1 second and LZE compressed should be .5 second.
I'd say "who cares". 7 seconds seems like fast enough for me. And I'm *not* going to add 2000 lines of code for 500msec speedup during suspend.
Lucky you. My machine takes minutes.
(To be precise, it prints about a line and a half of dots in the count_data_pages() loop, and often takes 2 seconds per dot.)
AMD Athlon XP, 1066 MHz, 768K RAM, VIA KT133 chipset. Stock 2.6.10-rc1.
I could really use a speedup.
Remember, Linux is the aggregate of a lot of people scratching their itches. It's okay to criticize *how* people go about addressing what's annoying them, since that has a long-term maintenance effect, if nothing else. But complaining that it doesn't annoy *you* isn't the most valid argument.
That's what's fundamentally wrong with people complainging about wanting to "stabilize" 2.6.x. Stability is in the eye of the beholder. Unless you want no changes at all (and you can get that easily enough), what it means is that the bugs that particularly annoy you get fixed.
But the point is, every bug fixed particularly annoys *someone*; that's why it's getting fixed.
Hi!
Quoted 8 lines
Quoted 7 lines
My machine suspends in 7 seconds, and that's swsusp1. According to your numbers, suspend2 should suspend it in 1 second and LZE compressed should be .5 second.
I'd say "who cares". 7 seconds seems like fast enough for me. And I'm *not* going to add 2000 lines of code for 500msec speedup during suspend.
Quoted 8 lines
Lucky you. My machine takes minutes.
(To be precise, it prints about a line and a half of dots in thecount_data_pages()loop, and often takes 2 seconds per dot.)AMD Athlon XP, 1066 MHz, 768K RAM, VIA KT133 chipset. Stock 2.6.10-rc1.
I could really use a speedup.
Yep, that's O(n^2) algorithm slowing it down. I have fix for it, but 2.6.10 is now too frozen for performance fix to go in. See "bigdiff" I sent to hugang, or wait few minutes and you'll get really ugly diff in private email, that should solve it, too.
[I'll be glad when you report results. It should make count_data_pages < 1 second].
Quoted 2 lines
if nothing else. But complaining that it doesn't annoy *you* isn't the most valid argument.
Ok, it is the scale. Half a second speedup is not enough to justify new compression algorithm in the kernel.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Quoted 3 lines · Previously [email protected] wrote:
Lucky you. My machine takes minutes.
(To be precise, it prints about a line and a half of dots in thecount_data_pages()loop, and often takes 2 seconds per dot.)
It also seems to vary wildly. Most of the time it goes pretty fast for me (under one minute) but occasionaly it will take well over 10 minutes. Never managed to time it exactly since my battery tends to run out in the middle of a suspend when that happens.
Wichert.
Signature · 2 lines
Wichert Akkerman <[email protected]> It is simple to make things. http://www.wiggy.net/ It is hard to make things simple.
Hi!
Quoted 8 lines
Quoted 3 lines
Lucky you. My machine takes minutes.
(To be precise, it prints about a line and a half of dots in thecount_data_pages()loop, and often takes 2 seconds per dot.)It also seems to vary wildly. Most of the time it goes pretty fast for me (under one minute) but occasionaly it will take well over 10 minutes. Never managed to time it exactly since my battery tends to run out in the middle of a suspend when that happens.
It depends on memory fragmentation; after updatedb it tends to be slow. Patch exists, see archives.
Pavel
Signature · 1 line
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms
software suspend patch [1/6]
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.
core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.
i386.diff
ppc.diff
i386 and powerpc suspend update.
pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.
ppcfix.diff
fix compile error.
$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
drivers/base/class.c renamed from /drivers/base/class.c +21 -0
@@ -465,6 +465,25 @@ void class_device_put(struct class_devickobject_put (&class_dev->kobj); } +struct class *class_find (char * name) +{ +struct class * this_class; + +if (!name) +return NULL ; + +down_read (&class_subsys.rwsem); +list_for_each_entry (this_class, &class_subsys.kset.list, subsys.kset.kobj.entry) { +if (!(strcmp (this_class->name, name))) { +class_get (this_class); +up_read (&class_subsys.rwsem); +return this_class; + } + } +up_read (&class_subsys.rwsem); + +return NULL ; +}int class_interface_register (struct class_interface *class_intf) {
@@ -547,3 +566,5 @@ EXPORT_SYMBOL(class_device_remove_file);EXPORT_SYMBOL (class_interface_register);EXPORT_SYMBOL (class_interface_unregister); + +EXPORT_SYMBOL (class_find);
drivers/base/power/Makefile renamed from /drivers/base/power/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-y := shutdown.o -obj-$(CONFIG_PM) += main.o suspend.o resume.o runtime.o sysfs.o +obj-$(CONFIG_PM) += main.o suspend.o resume.o runtime.o sysfs.o tree.o ifeq ($(CONFIG_DEBUG_DRIVER),y) EXTRA_CFLAGS += -DDEBUG
drivers/base/power/main.c renamed from /drivers/base/power/main.c +19 -5
@@ -4,6 +4,9 @@* Copyright (c) 2003 Patrick Mochel * Copyright (c) 2003 Open Source Development Lab * +* Partial tree additions +* Copyright (c) 2004 Nigel Cunningham +* * This file is released under the GPLv2 * *
@@ -23,10 +26,18 @@#include <linux/device.h> #include "power.h" -LIST_HEAD (dpm_active); -LIST_HEAD (dpm_off); -LIST_HEAD (dpm_off_irq); - +struct partial_device_tree default_device_tree = +{ + .dpm_active =LIST_HEAD_INIT (default_device_tree.dpm_active), + .dpm_off =LIST_HEAD_INIT (default_device_tree.dpm_off), + .dpm_off_irq =LIST_HEAD_INIT (default_device_tree.dpm_off_irq), +}; +EXPORT_SYMBOL (default_device_tree); + +/* +* One mutex for all trees because we can be moving items +* between trees. +*/ DECLARE_MUTEX (dpm_sem);/*
@@ -76,7 +87,9 @@ int device_pm_add(struct device * dev) dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);atomic_set (&dev->power.pm_users,0 );down (&dpm_sem); -list_add_tail (&dev->power.entry, &dpm_active); +list_add_tail (&dev->power.entry, &default_device_tree.dpm_active); + dev->current_list =DEVICE_LIST_DPM_ACTIVE ; + dev->tree = &default_device_tree;device_pm_set_parent (dev, dev->parent);if ((error =dpm_sysfs_add (dev)))list_del (&dev->power.entry);
@@ -92,6 +105,7 @@ void device_pm_remove(struct device * dedpm_sysfs_remove (dev);device_pm_release (dev->power.pm_parent);list_del (&dev->power.entry); + dev->current_list =DEVICE_LIST_NONE ;up (&dpm_sem); }
drivers/base/power/power.h renamed from /drivers/base/power/power.h +17 -3
@@ -30,10 +30,22 @@ extern struct semaphore dpm_sem;/* * The PM lists. */ -extern struct list_head dpm_active; -extern struct list_head dpm_off; -extern struct list_head dpm_off_irq; +struct partial_device_tree +{ +struct list_head dpm_active; +struct list_head dpm_off; +struct list_head dpm_off_irq; +}; + +enum { +DEVICE_LIST_NONE , +DEVICE_LIST_DPM_ACTIVE , +DEVICE_LIST_DPM_OFF , +DEVICE_LIST_DPM_OFF_IRQ , +}; + +extern struct partial_device_tree default_device_tree;static inline struct dev_pm_info *to_pm_info (struct list_head * entry) {
@@ -59,7 +71,9 @@ extern void dpm_sysfs_remove(struct devi* resume.c */ +extern void dpm_resume_tree (struct partial_device_tree * tree);extern void dpm_resume (void ); +extern void dpm_power_up_tree (struct partial_device_tree * tree);extern void dpm_power_up (void );extern int resume_device (struct device *);
drivers/base/power/resume.c renamed from /drivers/base/power/resume.c +81 -9
129 lines not on this page · raw message
drivers/base/power/shutdown.c renamed from /drivers/base/power/shutdown.c +1 -0
@@ -66,3 +66,4 @@ void device_shutdown(void)sysdev_shutdown (); } +EXPORT_SYMBOL (device_shutdown);
drivers/base/power/suspend.c renamed from /drivers/base/power/suspend.c +27 -13
@@ -51,7 +51,7 @@ int suspend_device(struct device * dev,/** -* device_suspend - Save state and stop all devices in system. +* device_suspend_tree - Save state and stop all devices in system. * @state: Power state to put each device in. * * Walk the dpm_active list, call ->suspend() for each device, and move
@@ -60,7 +60,7 @@ int suspend_device(struct device * dev,* the device to the dpm_off list. If it returns -EAGAIN, we move it to * the dpm_off_irq list. If we get a different error, try and back out. * -* If we hit a failure with any of the devices, call device_resume() +* If we hit a failure with any of the devices, call device_resume_tree() * above to bring the suspended devices back to life. * * Note this function leaves dpm_sem held to
@@ -70,22 +70,24 @@ int suspend_device(struct device * dev,* */ -int device_suspend (pm_message_t state) +int device_suspend_tree (pm_message_t state,struct partial_device_tree * tree) {int error =0 ;down (&dpm_sem); -while (!list_empty (&dpm_active)) { -struct list_head * entry = dpm_active.prev; +while (!list_empty (&tree->dpm_active)) { +struct list_head * entry = tree->dpm_active.prev;struct device * dev =to_device (entry); error =suspend_device (dev, state);if (!error) {list_del (&dev->power.entry); -list_add (&dev->power.entry, &dpm_off); +list_add (&dev->power.entry, &tree->dpm_off); + dev->current_list =DEVICE_LIST_DPM_OFF ; }else if (error == -EAGAIN ) {list_del (&dev->power.entry); -list_add (&dev->power.entry, &dpm_off_irq); +list_add (&dev->power.entry, &tree->dpm_off_irq); + dev->current_list =DEVICE_LIST_DPM_OFF_IRQ ; }else {printk (KERN_ERR "Could not suspend device %s: " "error %d\n" ,kobject_name (&dev->kobj), error);
@@ -96,10 +98,15 @@ int device_suspend(pm_message_t state)up (&dpm_sem);return error; Error: -dpm_resume (); +dpm_resume_tree (tree); goto Done; } +EXPORT_SYMBOL (device_suspend_tree); +int device_suspend (pm_message_t state) +{ +return device_suspend_tree (state, &default_device_tree); +}EXPORT_SYMBOL (device_suspend);
@@ -112,19 +119,17 @@ EXPORT_SYMBOL(device_suspend);* done, power down system devices. */ -int device_power_down (pm_message_t state) +int device_power_down_tree (pm_message_t state,struct partial_device_tree * tree) {int error =0 ;struct device * dev; -list_for_each_entry_reverse (dev, &dpm_off_irq, power.entry) { +list_for_each_entry_reverse (dev, &tree->dpm_off_irq, power.entry) {if ((error =suspend_device (dev, state)))break ; }if (error) goto Error; -if ((error =sysdev_suspend (state))) - goto Error; Done:return error; Error:
@@ -132,5 +137,14 @@ int device_power_down(pm_message_t state goto Done; } -EXPORT_SYMBOL (device_power_down); +EXPORT_SYMBOL (device_power_down_tree); +int device_power_down (pm_message_t state) +{ +int error; + +if (!(error =device_power_down_tree (state, &default_device_tree))) + error =sysdev_suspend (state); +return error; +} +EXPORT_SYMBOL (device_power_down);
drivers/base/power/tree.c new file +105 -0
105 lines not on this page · raw message
drivers/base/sys.c renamed from /drivers/base/sys.c +2 -1
@@ -337,7 +337,7 @@ int sysdev_suspend(u32 state) }return 0 ; } - +EXPORT_SYMBOL (sysdev_suspend);/** * sysdev_resume - Bring system devices back to life.
@@ -384,6 +384,7 @@ int sysdev_resume(void) }return 0 ; } +EXPORT_SYMBOL (sysdev_resume);int __init system_bus_init (void )
include/linux/pm.h renamed from /include/linux/pm.h +14 -2
@@ -231,13 +231,25 @@ struct dev_pm_info { };extern void device_pm_set_parent (struct device * dev,struct device * parent); +struct partial_device_tree ; +extern struct partial_device_tree default_device_tree;extern int device_suspend (pm_message_t state); +extern int device_suspend_tree (pm_message_t state,struct partial_device_tree * tree);extern int device_power_down (pm_message_t state); +extern int device_power_down_tree (pm_message_t state,struct partial_device_tree * tree);extern void device_power_up (void ); +extern void device_power_up_tree (struct partial_device_tree * tree);extern void device_resume (void ); - - +extern void device_resume_tree (struct partial_device_tree * tree); +extern void device_merge_tree (struct partial_device_tree * source, +struct partial_device_tree * dest); +extern void device_switch_trees (struct device * dev,struct partial_device_tree * tree); +extern void dpm_power_up_tree (struct partial_device_tree * tree); +extern int sysdev_suspend (u32 state); +extern int sysdev_resume (void ); +extern struct partial_device_tree *device_create_tree (void ); +extern void device_destroy_tree (struct partial_device_tree * tree);#endif /* __KERNEL__ */ #endif /* _LINUX_PM_H */
include/linux/device.h renamed from /include/linux/device.h +6 -0
@@ -162,6 +162,7 @@ extern void class_unregister(struct clasextern struct class *class_get (struct class *);extern void class_put (struct class *); +extern struct class *class_find (char * name);struct class_attribute {
@@ -288,6 +289,11 @@ struct device {override */ void (*release)(struct device * dev); + +struct partial_device_tree * tree;/* Which tree of devices this +device is in */ +int current_list;/* Which list within the tree the +device is on (speeds moving) */ }; static inline struct device *
--
Hu Gang / Steve
Linux Registered User 204016
GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [2/6]
Quoted 25 lines · On Mon, Nov 29, 2004 at 12:23:20AM +0800, [email protected] wrote:
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Quoted 7 lines
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
include/linux/reboot.h renamed from /include/linux/reboot.h +2 -0
@@ -42,6 +42,8 @@extern int register_reboot_notifier (struct notifier_block *);extern int unregister_reboot_notifier (struct notifier_block *); +/* For use by swsusp only */ +extern struct notifier_block *reboot_notifier_list;/* * Architecture-specific implementations of sys_reboot commands.
include/linux/suspend.h renamed from /include/linux/suspend.h +1 -1
@@ -1,7 +1,7 @@#ifndef _LINUX_SWSUSP_H#define _LINUX_SWSUSP_H -#ifdef CONFIG_X86 +#if (defined(CONFIG_X86 )) || (defined (CONFIG_PPC32 ))#include <asm/suspend.h> #endif #include <linux/swap.h>
include/linux/sysctl.h renamed from /include/linux/sysctl.h +1 -0
@@ -170,6 +170,7 @@ enumVM_VFS_CACHE_PRESSURE =26 ,/* dcache/icache reclaim pressure */ VM_LEGACY_VA_LAYOUT =27 ,/* legacy/compatibility virtual address space layout */ VM_HARDMAPLIMIT =28 ,/* Make mapped a hard limit */ + VM_SWSUSP_PAGECACHE=29, /* Enable/Disable Suspend PageCaches */ };
kernel/power/disk.c renamed from /kernel/power/disk.c +18 -49
140 lines not on this page · raw message
kernel/power/main.c renamed from /kernel/power/main.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2003 Patrick Mochel * Copyright (c) 2003 Open Source Development Lab * -* This file is release under the GPLv2 +* This file is released under the GPLv2 * */
kernel/power/swsusp.c renamed from /kernel/power/swsusp.c +912 -308
1,521 lines not on this page · raw message
kernel/sys.c renamed from /kernel/sys.c +1 -1
@@ -84,7 +84,7 @@ int cad_pid = 1;* and the like. */ -static struct notifier_block *reboot_notifier_list; +struct notifier_block *reboot_notifier_list;rwlock_t notifier_lock =RW_LOCK_UNLOCKED ;/**
kernel/sysctl.c renamed from /kernel/sysctl.c +16 -0
@@ -66,6 +66,10 @@ extern int min_free_kbytes;extern int printk_ratelimit_jiffies;extern int printk_ratelimit_burst; +#if defined(CONFIG_SOFTWARE_SUSPEND ) +extern int swsusp_pagecache; +#endif +#if defined(CONFIG_X86_LOCAL_APIC ) && defined(__i386__)int unknown_nmi_panic; extern int proc_unknown_nmi_panic(ctl_table *, int, struct file *,
@@ -792,6 +796,18 @@ static ctl_table vm_table[] = { .strategy = &sysctl_intvec, .extra1 = &zero, }, +#if defined(CONFIG_SOFTWARE_SUSPEND ) + { + .ctl_name = VM_SWSUSP_PAGECACHE, + .procname = "swsusp_pagecache", + .data = &swsusp_pagecache, + .maxlen = sizeof(swsusp_pagecache), + .mode = 0644, + .proc_handler = &proc_dointvec, + .strategy = &sysctl_intvec, + .extra1 = &zero, + }, +#endif { .ctl_name = VM_BLOCK_DUMP, .procname = "block_dump",
Signature · 4 lines
-- Hu Gang / Steve Linux Registered User 204016 GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [2/6]
Hi!
Quoted 13 lines
kernel/power/swsusp.c renamed from /kernel/power/swsusp.c +9
-0@@ -222,8 +221,105 @@ static void lock_swapdevices(void) }swap_list_unlock (); } + +#define ONE_PAGE_PBE_NUM (PAGE_SIZE/sizeof(struct pbe)) +#define PBE_IS_PAGE_END (x) \ + ( PAGE_SIZE - sizeof(struct pbe) == ((x) - ((~(PAGE_SIZE - 1)) & (x))) ) + +#define pgdir_for_each_safe (pos, n, head) \ + for(pos = head, n = pos ? (suspend_pagedir_t*)pos->dummy.val : NULL; \ + pos != NULL; \ + pos = n, n = pos ? (suspend_pagedir_t *)pos->dummy.val : NULL)
kernel/power/swsusp.c static void lock_swapdevices(void) · line 242
Quoted 10 lines
kernel/power/swsusp.c renamed from /kernel/power/swsusp.c +10
-0+ +#define pbe_for_each_safe (pos, n, index, max, head) \ + for(pos = head, index = 0, \ + n = pos ? (struct pbe *)pos->dummy.val : NULL; \ + (pos != NULL) && (index < max); \ + pos = (PBE_IS_PAGE_END((unsigned long)pos)) ? n : \ + ((struct pbe *)((unsigned long)pos + sizeof(struct pbe))), \ + index ++, \ + n = pos ? (struct pbe*)pos->dummy.val : NULL) +
_safe suffix means it is safe to delete while traversing. I do not think your macros can handle that, so you should not have _safe suffix.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: software suspend patch [3/6]
In reply to [email protected]Quoted 25 lines · On Mon, Nov 29, 2004 at 12:23:20AM +0800, [email protected] wrote:
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Quoted 8 lines
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
arch/i386/kernel/signal.c renamed from /arch/i386/kernel/signal.c +1 -0
@@ -587,6 +587,7 @@ int fastcall do_signal(struct pt_regs *rif (current->flags &PF_FREEZE ) {refrigerator (0 ); +recalc_sigpending ();if (!signal_pending (current)) goto no_signal; }
arch/i386/power/swsusp.S renamed from /arch/i386/power/swsusp.S +27 -18
51 lines not on this page · raw message
Signature · 4 lines
-- Hu Gang / Steve Linux Registered User 204016 GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [4/6]
In reply to [email protected]Quoted 25 lines · On Mon, Nov 29, 2004 at 12:23:20AM +0800, [email protected] wrote:
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Quoted 7 lines
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
drivers/ide/ppc/pmac.c +3 -2
@@ -32,6 +32,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/pci.h> +#include <linux/pm.h> #include <linux/adb.h> #include <linux/pmu.h>
@@ -1364,7 +1365,7 @@ pmac_ide_macio_suspend(struct macio_devide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata (&mdev->ofdev.dev);int rc =0 ; -if (state != mdev->ofdev.dev.power_state && state >=2 ) { +if (state != mdev->ofdev.dev.power_state && state ==PM_SUSPEND_MEM ) { rc =pmac_ide_do_suspend (hwif);if (rc ==0 ) mdev->ofdev.dev.power_state = state;
@@ -1472,7 +1473,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdeide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata (pdev);int rc =0 ; -if (state != pdev->dev.power_state && state >=2 ) { +if (state != pdev->dev.power_state && state ==PM_SUSPEND_MEM ) { rc =pmac_ide_do_suspend (hwif);if (rc ==0 ) pdev->dev.power_state = state;
drivers/macintosh/Kconfig +1 -6
@@ -80,7 +80,7 @@ config ADB_PMU config PMAC_PBOOK bool "Power management support for PowerBooks" - depends on ADB_PMU + depends on PM && ADB_PMU ---help--- This provides support for putting a PowerBook to sleep; it also enables media bay support. Power management works on the
@@ -97,11 +97,6 @@ config PMAC_PBOOK have it autoloaded. The act of removing the module shuts down the sound hardware for more power savings. -config PM - bool - depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK - default y - config PMAC_APM_EMU tristate "APM emulation" depends on PMAC_PBOOK
drivers/macintosh/via-pmu.c +84 -2
110 lines not on this page · raw message
include/asm-ppc/suspend.h new file +12 -0
@@ -0,0 +1,12 @@ +static inline int arch_prepare_suspend (void ) +{ +return 0 ; +} + +static inline void save_processor_state (void ) +{ +} + +static inline void restore_processor_state (void ) +{ +}
arch/ppc/Kconfig +2 -0
@@ -983,6 +983,8 @@ config PROC_HARDWARE source "drivers/zorro/Kconfig" +source kernel/power/Kconfig + endmenu menu "Bus options"
arch/ppc/kernel/Makefile +1 -0
@@ -16,6 +16,7 @@ obj-y := entry.o traps.o irq.o idle.o semaphore.o syscalls.o setup.o \ cputable.o ppc_htab.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o +obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_POWER4) += cpu_setup_power4.o obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
arch/ppc/kernel/signal.c +11 -0
@@ -28,6 +28,7 @@#include <linux/elf.h> #include <linux/tty.h> #include <linux/binfmts.h> +#include <linux/suspend.h> #include <asm/ucontext.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
@@ -604,6 +605,15 @@ int do_signal(sigset_t *oldset, struct punsigned long frame, newsp;int signr, ret; +if (current->flags &PF_FREEZE ) { +refrigerator (0 ); + signr =0 ; + ret = regs->gpr[3 ]; +recalc_sigpending (); +if (!signal_pending (current)) + goto no_signal; + } +if (!oldset) oldset = ¤t->blocked;
@@ -626,6 +636,7 @@ int do_signal(sigset_t *oldset, struct p regs->gpr[3 ] =EINTR ;/* note that the cr0.SO bit is already set */ }else { +no_signal: regs->nip -=4 ;/* Back up & retry system call */ regs->result =0 ; regs->trap =0 ;
arch/ppc/kernel/swsusp.S new file +366 -0
366 lines not on this page · raw message
arch/ppc/kernel/vmlinux.lds.S +6 -0
@@ -74,6 +74,12 @@ SECTIONS CONSTRUCTORS } + . = ALIGN(4096); + __nosave_begin = .; + .data_nosave : { *(.data.nosave) } + . = ALIGN(4096); + __nosave_end = .; + . = ALIGN(32); .data.cacheline_aligned : { *(.data.cacheline_aligned) }
arch/ppc/platforms/pmac_feature.c +1 -1
@@ -2146,7 +2146,7 @@ static struct pmac_mb_def pmac_mb_defs[] }, {"PowerBook6,1" ,"PowerBook G4 12\"" ,PMAC_TYPE_UNKNOWN_INTREPID , intrepid_features, -PMAC_MB_HAS_FW_POWER |PMAC_MB_MOBILE , +PMAC_MB_CAN_SLEEP |PMAC_MB_HAS_FW_POWER |PMAC_MB_MOBILE , }, { "PowerBook6,2", "PowerBook G4", PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
arch/ppc/platforms/pmac_setup.c +59 -0
82 lines not on this page · raw message
Signature · 4 lines
-- Hu Gang / Steve Linux Registered User 204016 GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [4/6]
Hi!
Quoted 20 lines
drivers/ide/ppc/pmac.c +2
-1@@ -32,6 +32,7 @@#include <linux/notifier.h> #include <linux/reboot.h> #include <linux/pci.h> +#include <linux/pm.h> #include <linux/adb.h> #include <linux/pmu.h> @@ -1364,7 +1365,7 @@ pmac_ide_macio_suspend(struct macio_devide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata (&mdev->ofdev.dev);int rc =0 ; -if (state != mdev->ofdev.dev.power_state && state >=2 ) { +if (state != mdev->ofdev.dev.power_state && state ==PM_SUSPEND_MEM ) { rc =pmac_ide_do_suspend (hwif);if (rc ==0 ) mdev->ofdev.dev.power_state = state;
drivers/ide/ppc/pmac.c pmac_ide_pci_suspend(struct pci_dev *pde · line 1479
Quoted 8 lines
drivers/ide/ppc/pmac.c +1
-1@@ -1472,7 +1473,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdeide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata (pdev);int rc =0 ; -if (state != pdev->dev.power_state && state >=2 ) { +if (state != pdev->dev.power_state && state ==PM_SUSPEND_MEM ) { rc =pmac_ide_do_suspend (hwif);if (rc ==0 ) pdev->dev.power_state = state;
Please wait with this one.
Quoted 13 lines
drivers/macintosh/Kconfig +1
-1@@ -80,7 +80,7 @@ config ADB_PMU config PMAC_PBOOK bool "Power management support for PowerBooks" - depends on ADB_PMU + depends on PM && ADB_PMU ---help--- This provides support for putting a PowerBook to sleep; it also enables media bay support. Power management works on the@@ -97,11 +97,6 @@ config PMAC_PBOOK have it autoloaded. The act of removing the module shuts down the
drivers/macintosh/Kconfig config PMAC_PBOOK · line 102
Quoted 10 lines
drivers/macintosh/Kconfig +0
-5sound hardware for more power savings. -config PM - bool - depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK - default y - config PMAC_APM_EMU tristate "APM emulation" depends on PMAC_PBOOK
Ok, merge with BenH.
Quoted 100 lines
drivers/macintosh/via-pmu.c +71
-2@@ -43,6 +43,7 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/device.h> +#include <linux/sysdev.h> #include <linux/suspend.h> #include <linux/syscalls.h> #include <asm/prom.h> @@ -2326,7 +2327,7 @@ pmac_suspend_devices(void)/* Sync the disks. */ /* XXX It would be nice to have some way to ensure that * nobody is dirtying any new buffers while we wait. That -* could be acheived using the refrigerator for processes +* could be achieved using the refrigerator for processes * that swsusp uses */ sys_sync ();@@ -2379,7 +2380,6 @@ pmac_suspend_devices(void)/* Wait for completion of async backlight requests */ while (!bright_req_1.complete || !bright_req_2.complete || - !batt_req.complete)pmu_poll ();@@ -3048,6 +3048,88 @@ pmu_polled_request(struct adb_request *r }#endif /* DEBUG_SLEEP */ + +/* FIXME: This is a temporary set of callbacks to enable us +* to do suspend-to-disk. +*/ + +#ifdef CONFIG_PM + +static int pmu_sys_suspended =0 ; + +static int pmu_sys_suspend (struct sys_device *sysdev,pm_message_t state) +{ +if (state !=PMSG_FREEZE || pmu_sys_suspended) +return 0 ; + +/* Suspend PMU event interrupts */ +pmu_suspend (); + + pmu_sys_suspended =1 ; +return 0 ; +} + +static int pmu_sys_resume (struct sys_device *sysdev) +{ +struct adb_request req; + +if (!pmu_sys_suspended) +return 0 ; + +/* Tell PMU we are ready */ +pmu_request (&req,NULL ,2 ,PMU_SYSTEM_READY ,2 ); +pmu_wait_complete (&req); + +/* Resume PMU event interrupts */ +pmu_resume (); + + pmu_sys_suspended =0 ; + +return 0 ; +} + +#endif /* CONFIG_PM */ + +static struct sysdev_class pmu_sysclass = { +set_kset_name ("pmu" ), +}; + +static struct sys_device device_pmu = { + .id =0 , + .cls = &pmu_sysclass, +}; + +static struct sysdev_driver driver_pmu = { +#ifdef CONFIG_PM + .suspend = &pmu_sys_suspend, + .resume = &pmu_sys_resume, +#endif /* CONFIG_PM */ +}; + +static int __init init_pmu_sysfs (void ) +{ +int rc; + + rc =sysdev_class_register (&pmu_sysclass); +if (rc) { +printk (KERN_ERR "Failed registering PMU sys class\n" ); +return -ENODEV ; + } + rc =sysdev_register (&device_pmu); +if (rc) {
drivers/macintosh/via-pmu.c pmu_polled_request(struct adb_request *r · line 3129
Quoted 10 lines
drivers/macintosh/via-pmu.c +10
-0+printk (KERN_ERR "Failed registering PMU sys device\n" ); +return -ENODEV ; + } + rc =sysdev_driver_register (&pmu_sysclass, &driver_pmu); +if (rc) { +printk (KERN_ERR "Failed registering PMU sys driver\n" ); +return -ENODEV ; + } +return 0 ; +}
The error handling is not okay:
Quoted 63 lines
include/asm-ppc/suspend.h new file +12
-0@@ -0,0 +1,12 @@ +static inline int arch_prepare_suspend (void ) +{ +return 0 ; +} + +static inline void save_processor_state (void ) +{ +} + +static inline void restore_processor_state (void ) +{ +}arch/ppc/Kconfig +2
-0@@ -983,6 +983,8 @@ config PROC_HARDWARE source "drivers/zorro/Kconfig" +source kernel/power/Kconfig + endmenu menu "Bus options"arch/ppc/kernel/Makefile +1
-0@@ -16,6 +16,7 @@ obj-y := entry.o traps.o irq.o idle.o semaphore.o syscalls.o setup.o \ cputable.o ppc_htab.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o +obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o obj-$(CONFIG_POWER4) += cpu_setup_power4.o obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.oarch/ppc/kernel/signal.c +10
-0@@ -28,6 +28,7 @@#include <linux/elf.h> #include <linux/tty.h> #include <linux/binfmts.h> +#include <linux/suspend.h> #include <asm/ucontext.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -604,6 +605,15 @@ int do_signal(sigset_t *oldset, struct punsigned long frame, newsp;int signr, ret; +if (current->flags &PF_FREEZE ) { +refrigerator (0 ); + signr =0 ; + ret = regs->gpr[3 ]; +recalc_sigpending (); +if (!signal_pending (current)) + goto no_signal; + } +if (!oldset) oldset = ¤t->blocked;
arch/ppc/kernel/signal.c int do_signal(sigset_t *oldset, struct p · line 642
Quoted 7 lines
arch/ppc/kernel/signal.c +1
-0@@ -626,6 +636,7 @@ int do_signal(sigset_t *oldset, struct p regs->gpr[3 ] =EINTR ;/* note that the cr0.SO bit is already set */ }else { +no_signal: regs->nip -=4 ;/* Back up & retry system call */ regs->result =0 ; regs->trap =0 ;
Ok, merge with BenH.
Quoted 359 lines
arch/ppc/kernel/swsusp.S new file +356
-0@@ -0,0 +1,366 @@ +#include <linux/config.h> +#include <linux/threads.h> +#include <asm/processor.h> +#include <asm/page.h> +#include <asm/cputable.h> +#include <asm/thread_info.h> +#include <asm/ppc_asm.h> +#include <asm/offsets.h> + + +/* + * Structure for storing CPU registers on the save area. + */ +#define SL_SP 0 +#define SL_PC 4 +#define SL_MSR 8 +#define SL_SDR1 0xc +#define SL_SPRG0 0x10 /* 4 sprg's */ +#define SL_DBAT0 0x20 +#define SL_IBAT0 0x28 +#define SL_DBAT1 0x30 +#define SL_IBAT1 0x38 +#define SL_DBAT2 0x40 +#define SL_IBAT2 0x48 +#define SL_DBAT3 0x50 +#define SL_IBAT3 0x58 +#define SL_TB 0x60 +#define SL_R2 0x68 +#define SL_CR 0x6c +#define SL_LR 0x70 +#define SL_R12 0x74 /* r12 to r31 */ +#define SL_SIZE (SL_R12 + 80) + + .section .data + .align 5 + +_GLOBAL(swsusp_save_area) + .space SL_SIZE + + + .section .text + .align 5 + +_GLOBAL(swsusp_arch_suspend) + + lis r11,swsusp_save_area@h + ori r11,r11,swsusp_save_area@l + + mflr r0 + stw r0,SL_LR(r11) + mfcr r0 + stw r0,SL_CR(r11) + stw r1,SL_SP(r11) + stw r2,SL_R2(r11) + stmw r12,SL_R12(r11) + + /* Save MSR & SDR1 */ + mfmsr r4 + stw r4,SL_MSR(r11) + mfsdr1 r4 + stw r4,SL_SDR1(r11) + + /* Get a stable timebase and save it */ +1: mftbu r4 + stw r4,SL_TB(r11) + mftb r5 + stw r5,SL_TB+4(r11) + mftbu r3 + cmpw r3,r4 + bne 1b + + /* Save SPRGs */ + mfsprg r4,0 + stw r4,SL_SPRG0(r11) + mfsprg r4,1 + stw r4,SL_SPRG0+4(r11) + mfsprg r4,2 + stw r4,SL_SPRG0+8(r11) + mfsprg r4,3 + stw r4,SL_SPRG0+12(r11) + + /* Save BATs */ + mfdbatu r4,0 + stw r4,SL_DBAT0(r11) + mfdbatl r4,0 + stw r4,SL_DBAT0+4(r11) + mfdbatu r4,1 + stw r4,SL_DBAT1(r11) + mfdbatl r4,1 + stw r4,SL_DBAT1+4(r11) + mfdbatu r4,2 + stw r4,SL_DBAT2(r11) + mfdbatl r4,2 + stw r4,SL_DBAT2+4(r11) + mfdbatu r4,3 + stw r4,SL_DBAT3(r11) + mfdbatl r4,3 + stw r4,SL_DBAT3+4(r11) + mfibatu r4,0 + stw r4,SL_IBAT0(r11) + mfibatl r4,0 + stw r4,SL_IBAT0+4(r11) + mfibatu r4,1 + stw r4,SL_IBAT1(r11) + mfibatl r4,1 + stw r4,SL_IBAT1+4(r11) + mfibatu r4,2 + stw r4,SL_IBAT2(r11) + mfibatl r4,2 + stw r4,SL_IBAT2+4(r11) + mfibatu r4,3 + stw r4,SL_IBAT3(r11) + mfibatl r4,3 + stw r4,SL_IBAT3+4(r11) + +#if 0 + /* Backup various CPU config stuffs */ + bl __save_cpu_setup +#endif + /* Call the low level suspend stuff (we should probably have made + * a stackframe... + */ + bl swsusp_save + + /* Restore LR from the save area */ + lis r11,swsusp_save_area@h + ori r11,r11,swsusp_save_area@l + lwz r0,SL_LR(r11) + mtlr r0 + + blr + + +/* Resume code */ +_GLOBAL(swsusp_arch_resume) + + /* Stop pending alitvec streams and memory accesses */ +BEGIN_FTR_SECTION + DSSALL +END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) + sync + + /* Disable MSR:DR to make sure we don't take a TLB or + * hash miss during the copy, as our hash table will + * for a while be unuseable. For .text, we assume we are + * covered by a BAT. This works only for non-G5 at this + * point. G5 will need a better approach, possibly using + * a small temporary hash table filled with large mappings, + * disabling the MMU completely isn't a good option for + * performance reasons. + * (Note that 750's may have the same performance issue as + * the G5 in this case, we should investigate using moving + * BATs for these CPUs) + */ + mfmsr r0 + sync + rlwinm r0,r0,0,28,26 /* clear MSR_DR */ + mtmsr r0 + sync + isync + + /* Load ptr the list of pages to copy in r11 */ + lis r9,pagedir_nosave@ha + addi r9,r9,pagedir_nosave@l + tophys(r9,r9) + lwz r9, 0(r9) +#if 0 + twi 31,r0,0 /* triger trap */ +#endif + cmpwi r9, 0 + beq copy_loop_end +copy_loop: + tophys(r9,r9) + lwz r6, 12(r9) + li r10, 0 +copy_one_pgdir: + lwz r11, 4(r9) + addi r8,r10,1 + cmpwi r11, 0 + addi r7,r9,16 + beq copy_loop_end + li r0, 256 + mtctr r0 + lwz r9,0(r9) +#if 0 + twi 31,r0,0 /* triger trap */ +#endif + tophys(r10,r11) + tophys(r11,r9) +copy_one_page: + lwz r0, 0(r11) + stw r0, 0(r10) + lwz r9, 4(r11) + stw r9, 4(r10) + lwz r0, 8(r11) + stw r0, 8(r10) + lwz r9, 12(r11) + addi r11,r11,16 + stw r9, 12(r10) + addi r10,r10,16 + bdnz copy_one_page + mr r10, r8 + cmplwi r10, 255 + mr r9, r7 + ble copy_one_pgdir + mr r9, r6 + bne copy_loop +copy_loop_end: + + /* Do a very simple cache flush/inval of the L1 to ensure + * coherency of the icache + */ + lis r3,0x0002 + mtctr r3 + li r3, 0 +1: + lwz r0,0(r3) + addi r3,r3,0x0020 + bdnz 1b + isync + sync + + /* Now flush those cache lines */ + lis r3,0x0002 + mtctr r3 + li r3, 0 +1: + dcbf 0,r3 + addi r3,r3,0x0020 + bdnz 1b + sync + + /* Ok, we are now running with the kernel data of the old + * kernel fully restored. We can get to the save area + * easily now. As for the rest of the code, it assumes the + * loader kernel and the booted one are exactly identical + */ + lis r11,swsusp_save_area@h + ori r11,r11,swsusp_save_area@l + tophys(r11,r11) + +#if 0 + /* Restore various CPU config stuffs */ + bl __restore_cpu_setup +#endif + /* Restore the BATs, and SDR1. Then we can turn on the MMU. + * This is a bit hairy as we are running out of those BATs, + * but first, our code is probably in the icache, and we are + * writing the same value to the BAT, so that should be fine, + * though a better solution will have to be found long-term + */ + lwz r4,SL_SDR1(r11) + mtsdr1 r4 + lwz r4,SL_SPRG0(r11) + mtsprg 0,r4 + lwz r4,SL_SPRG0+4(r11) + mtsprg 1,r4 + lwz r4,SL_SPRG0+8(r11) + mtsprg 2,r4 + lwz r4,SL_SPRG0+12(r11) + mtsprg 3,r4 + +#if 0 + lwz r4,SL_DBAT0(r11) + mtdbatu 0,r4 + lwz r4,SL_DBAT0+4(r11) + mtdbatl 0,r4 + lwz r4,SL_DBAT1(r11) + mtdbatu 1,r4 + lwz r4,SL_DBAT1+4(r11) + mtdbatl 1,r4 + lwz r4,SL_DBAT2(r11) + mtdbatu 2,r4 + lwz r4,SL_DBAT2+4(r11) + mtdbatl 2,r4 + lwz r4,SL_DBAT3(r11) + mtdbatu 3,r4 + lwz r4,SL_DBAT3+4(r11) + mtdbatl 3,r4 + lwz r4,SL_IBAT0(r11) + mtibatu 0,r4 + lwz r4,SL_IBAT0+4(r11) + mtibatl 0,r4 + lwz r4,SL_IBAT1(r11) + mtibatu 1,r4 + lwz r4,SL_IBAT1+4(r11) + mtibatl 1,r4 + lwz r4,SL_IBAT2(r11) + mtibatu 2,r4 + lwz r4,SL_IBAT2+4(r11) + mtibatl 2,r4 + lwz r4,SL_IBAT3(r11) + mtibatu 3,r4 + lwz r4,SL_IBAT3+4(r11) + mtibatl 3,r4 +#endif + +BEGIN_FTR_SECTION + li r4,0 + mtspr SPRN_DBAT4U,r4 + mtspr SPRN_DBAT4L,r4 + mtspr SPRN_DBAT5U,r4 + mtspr SPRN_DBAT5L,r4 + mtspr SPRN_DBAT6U,r4 + mtspr SPRN_DBAT6L,r4 + mtspr SPRN_DBAT7U,r4 + mtspr SPRN_DBAT7L,r4 + mtspr SPRN_IBAT4U,r4 + mtspr SPRN_IBAT4L,r4 + mtspr SPRN_IBAT5U,r4 + mtspr SPRN_IBAT5L,r4 + mtspr SPRN_IBAT6U,r4 + mtspr SPRN_IBAT6L,r4 + mtspr SPRN_IBAT7U,r4 + mtspr SPRN_IBAT7L,r4 +END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS) + + /* Flush all TLBs */ + lis r4,0x1000 +1: addic. r4,r4,-0x1000 + tlbie r4 + blt 1b + sync + + /* restore the MSR and turn on the MMU */ + lwz r3,SL_MSR(r11) + bl turn_on_mmu + tovirt(r11,r11) + + /* Restore TB */ + li r3,0 + mttbl r3 + lwz r3,SL_TB(r11) + lwz r4,SL_TB+4(r11) + mttbu r3 + mttbl r4 + + /* Kick decrementer */ + li r0,1 + mtdec r0 + + /* Restore the callee-saved registers and return */ + lwz r0,SL_CR(r11) + mtcr r0 + lwz r2,SL_R2(r11) + lmw r12,SL_R12(r11) + lwz r1,SL_SP(r11) + lwz r0,SL_LR(r11) + mtlr r0 + + // XXX Note: we don't really need to call swsusp_resume + + li r3,0 + blr + +/* FIXME:This construct is actually not useful since we don't shut
arch/ppc/kernel/swsusp.S line 366
Quoted 10 lines
arch/ppc/kernel/swsusp.S new file +10
-0+ * down the instruction MMU, we could just flip back MSR-DR on. + */ +turn_on_mmu: + mflr r4 + mtsrr0 r4 + mtsrr1 r3 + sync + isync + rfi +
This version will probably not work with 2.6.9 kernel (if you have version that works with 2.6.9, it would be even better to merge that).
Quoted 18 lines
arch/ppc/kernel/vmlinux.lds.S +6
-0@@ -74,6 +74,12 @@ SECTIONS CONSTRUCTORS } + . = ALIGN(4096); + __nosave_begin = .; + .data_nosave : { *(.data.nosave) } + . = ALIGN(4096); + __nosave_end = .; + . = ALIGN(32); .data.cacheline_aligned : { *(.data.cacheline_aligned) }
arch/ppc/platforms/pmac_feature.c static struct pmac_mb_def pmac_mb_defs[] · line 2152
Quoted 8 lines
arch/ppc/platforms/pmac_feature.c +1
-1@@ -2146,7 +2146,7 @@ static struct pmac_mb_def pmac_mb_defs[] }, {"PowerBook6,1" ,"PowerBook G4 12\"" ,PMAC_TYPE_UNKNOWN_INTREPID , intrepid_features, -PMAC_MB_HAS_FW_POWER |PMAC_MB_MOBILE , +PMAC_MB_CAN_SLEEP |PMAC_MB_HAS_FW_POWER |PMAC_MB_MOBILE , }, { "PowerBook6,2", "PowerBook G4", PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
Ok, merge with BenH.
Quoted 76 lines
arch/ppc/platforms/pmac_setup.c +55
-0@@ -51,6 +51,7 @@#include <linux/irq.h> #include <linux/seq_file.h> #include <linux/root_dev.h> +#include <linux/suspend.h> #include <asm/reg.h> #include <asm/sections.h> @@ -70,6 +71,8 @@#include <asm/pmac_feature.h> #include <asm/time.h> #include <asm/of_device.h> +#include <asm/mmu_context.h> +#include "pmac_pic.h" #include "mem_pieces.h" @@ -420,11 +423,67 @@ find_boot_device(void)#endif } +/* TODO: Merge the suspend-to-ram with the common code !!! +* currently, this is a stub implementation for suspend-to-disk +* only +*/ + +#ifdef CONFIG_PM + +extern void enable_kernel_altivec (void ); + +static int pmac_pm_prepare (suspend_state_t state) +{ +printk (KERN_DEBUG "pmac_pm_prepare(%d)\n" , state); + +return 0 ; +} + +static int pmac_pm_enter (suspend_state_t state) +{ +printk (KERN_DEBUG "pmac_pm_enter(%d)\n" , state); + +/* Giveup the lazy FPU & vec so we don't have to back them +* up from the low level code +*/ +enable_kernel_fp (); + +#ifdef CONFIG_ALTIVEC +if (cur_cpu_spec[0 ]->cpu_features &CPU_FTR_ALTIVEC ) +enable_kernel_altivec (); +#endif /* CONFIG_ALTIVEC */ + +return 0 ; +} + +static int pmac_pm_finish (suspend_state_t state) +{ +printk (KERN_DEBUG "pmac_pm_finish(%d)\n" , state); + +/* Restore userland MMU context */ +set_context (current->active_mm->context, current->active_mm->pgd); + +return 0 ; +} + +static struct pm_ops pmac_pm_ops = { + .pm_disk_mode =PM_DISK_SHUTDOWN , + .prepare = pmac_pm_prepare, + .enter = pmac_pm_enter, + .finish = pmac_pm_finish, +}; + +#endif /* CONFIG_PM */ +static int initializing =1 ;
arch/ppc/platforms/pmac_setup.c find_boot_device(void) · line 488
Quoted 10 lines
arch/ppc/platforms/pmac_setup.c +4
-0static int pmac_late_init (void ) { initializing =0 ; + +#ifdef CONFIG_PM +pm_set_ops (&pmac_pm_ops); +#endif /* CONFIG_PM */ return 0 ; }
Ok, merge with BenH.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: software suspend patch [5/6]
In reply to [email protected]Quoted 25 lines · On Mon, Nov 29, 2004 at 12:23:20AM +0800, [email protected] wrote:
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Quoted 8 lines
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
kernel/sched.c +6 -0
@@ -2656,6 +2656,12 @@ asmlinkage void __sched schedule(void)* Otherwise, whine if we are scheduling when we should not be. */ if (likely (!(current->state & (TASK_DEAD |TASK_ZOMBIE )))) { +#ifdef CONFIG_PM +extern int swsusp_pagecache; +if (unlikely (swsusp_pagecache ==2 ))/* slient warning message when + writing pagecache */ +#endif +if (unlikely (in_atomic ())) {printk (KERN_ERR "bad: scheduling while atomic!\n" );dump_stack ();
mm/page-writeback.c +12 -0
@@ -359,6 +359,9 @@ static void wb_kupdate(unsigned long argunsigned long start_jif;unsigned long next_jif;long nr_to_write; +#ifdef CONFIG_PM +extern int swsusp_pagecache; +#endif struct writeback_state wbs;struct writeback_control wbc = { .bdi =NULL ,
@@ -369,6 +372,14 @@ static void wb_kupdate(unsigned long arg .for_kupdate = 1, }; +#ifdef CONFIG_PM +if (unlikely (swsusp_pagecache ==2 )) { + start_jif = jiffies; + next_jif = start_jif + (dirty_writeback_centisecs *HZ ) /100 ; + goto out; + } +#endif +sync_supers ();get_writeback_state (&wbs);
@@ -389,6 +400,7 @@ static void wb_kupdate(unsigned long arg } nr_to_write -=MAX_WRITEBACK_PAGES - wbc.nr_to_write; } +out:if (time_before (next_jif, jiffies +HZ )) next_jif = jiffies +HZ ;if (dirty_writeback_centisecs)
Signature · 4 lines
-- Hu Gang / Steve Linux Registered User 204016 GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [1/6]
In reply to [email protected]Quoted 25 lines · On Mon, Nov 29, 2004 at 12:23:20AM +0800, [email protected] wrote:
Hi Pavel Machek, Nigel Cunningham:
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Quoted 8 lines
I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
arch/ppc/syslib/open_pic.c +2 -1
@@ -776,7 +776,8 @@ static void openpic_mapirq(u_int irq, cpif (ISR [irq] ==0 )return ;if (!cpus_empty (keepmask)) { -cpumask_t irqdest = { .bits[0 ] =openpic_read (&ISR [irq]->Destination) }; +cpumask_t irqdest; + irqdest.bits[0 ] =openpic_read (&ISR [irq]->Destination);cpus_and (irqdest, irqdest, keepmask);cpus_or (physmask, physmask, irqdest); }
Signature · 4 lines
-- Hu Gang / Steve Linux Registered User 204016 GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [1/6]
Hi!
Quoted 35 lines
Quoted 31 lines
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
arch/ppc/syslib/open_pic.c static void openpic_mapirq(u_int irq, cp · line 783
Quoted 9 lines
arch/ppc/syslib/open_pic.c +2
-1@@ -776,7 +776,8 @@ static void openpic_mapirq(u_int irq, cpif (ISR [irq] ==0 )return ;if (!cpus_empty (keepmask)) { -cpumask_t irqdest = { .bits[0 ] =openpic_read (&ISR [irq]->Destination) }; +cpumask_t irqdest; + irqdest.bits[0 ] =openpic_read (&ISR [irq]->Destination);cpus_and (irqdest, irqdest, keepmask);cpus_or (physmask, physmask, irqdest); }
ACK. Send this to Andrew Morton, Cc: Rusty trivial patch monkey Russell <[email protected]>.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: software suspend patch [1/6]
Quoted 34 lines · Pavel Machek
Hi!
Quoted 32 lines
Quoted 31 lines
device-tree.diff
base from suspend2 with a little changed.core.diff
1: redefine struct pbe for using _no_ continuous as pagedir. 2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)I'm using 2.6.9-ck3 With above patch, swsusp1 works prefect in my PowerPC and x86 PC with Highmem and prepempt option enabled.
I hope the core.diff@1,@2,@3 i386.diff ppc.diff will merge into mainline kernel ASAP, :). from I view point device-tree.diff is very usefuly when using pagecache saving and pagecachs_addon.diff that's really hack for making pagecache saving safe.
Quoted 12 lines
arch/ppc/syslib/open_pic.c static void openpic_mapirq(u_int irq, cp · line 783
Quoted 12 lines
arch/ppc/syslib/open_pic.c +2
-1@@ -776,7 +776,8 @@ static void openpic_mapirq(u_int irq, cpif (ISR [irq] ==0 )return ;if (!cpus_empty (keepmask)) { -cpumask_t irqdest = { .bits[0 ] =openpic_read (&ISR [irq]->Destination) }; +cpumask_t irqdest; + irqdest.bits[0 ] =openpic_read (&ISR [irq]->Destination);cpus_and (irqdest, irqdest, keepmask);cpus_or (physmask, physmask, irqdest); }
Doesn't the former mean initialize irqdest.bits as a whole to zero and .bits[0] to openpic_read(...), while the later only sets iqdest.bits[0] to openpic_read(...)?
I think this is wrong.
Cheers,
-- Guido
Re: software suspend patch [1/6]
In reply to [email protected]Hi!
I can not merge anything before 2.6.10. As you have seen, I have quite a lot of patches in my tree, and I do not want mix them with these...
Quoted 2 lines
device-tree.diff
base from suspend2 with a little changed.
I do not want this one.
Quoted 2 lines
core.diff
1: redefine struct pbe for using _no_ continuous as pagedir.
Can I get this one as a separate diff?
Quoted 7 lines
2: make shrink memory as little as possible.
3: using a bitmap speed up collide check in page relocating. 4: pagecache saving ready.i386.diff
ppc.diff
i386 and powerpc suspend update.
ppc changes look good, you should send them to ppc maintainer...
Quoted 9 lines
pagecachs_addon.diff
if enable page caches saving, must using it, it making saving pagecaches safe. idea from suspend2.ppcfix.diff
fix compile error.$ gcc -v .... gcc version 2.95.4 20011002 (Debian prerelease)
Send this one to Andrew Morton, now, it is a bugfix.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: software suspend patch [1/6]
Quoted 8 lines · Pavel Machek
Hi!
I can not merge anything before 2.6.10. As you have seen, I have quite a lot of patches in my tree, and I do not want mix them with these...
Quoted 2 lines
device-tree.diff
base from suspend2 with a little changed.
Quoted 6 lines
I do not want this one.
Quoted 2 lines
core.diff
1: redefine struct pbe for using _no_ continuous as pagedir.Can I get this one as a separate diff?
Here is it.
=== kernel/power/swsusp.c
==================================================================
power/swsusp.c (local) renamed from power/swsusp.c (revision 24520) +455 -195
@@ -74,9 +74,6 @@ /* References to section boundaries */ extern char __nosave_begin, __nosave_end; -/* Variables to be preserved over suspend */ -static int pagedir_order_check; - extern char resume_file[]; static dev_t resume_device; /* Local variables that should not be affected by save */
@@ -97,7 +94,6 @@ */ suspend_pagedir_t *pagedir_nosave __nosavedata = NULL; static suspend_pagedir_t *pagedir_save; -static int pagedir_order __nosavedata = 0; #define SWSUSP_SIG "S1SUSPEND"
@@ -223,9 +219,63 @@ swap_list_unlock(); } +#define ONE_PAGE_PBE_NUM (PAGE_SIZE/sizeof(struct pbe)) +#define PBE_IS_PAGE_END(x) \ + ( PAGE_SIZE - sizeof(struct pbe) == ((x) - ((~(PAGE_SIZE - 1)) & (x))) ) +#define pgdir_for_each(pos, n, head) \ + for(pos = head, n = pos ? (suspend_pagedir_t*)pos->dummy.val : NULL; \ + pos != NULL; \ + pos = n, n = pos ? (suspend_pagedir_t *)pos->dummy.val : NULL) +#define pbe_for_each(pos, n, index, max, head) \ + for(pos = head, index = 0, \ + n = pos ? (struct pbe *)pos->dummy.val : NULL; \ + (pos != NULL) && (index < max); \ + pos = (PBE_IS_PAGE_END((unsigned long)pos)) ? n : \ + ((struct pbe *)((unsigned long)pos + sizeof(struct pbe))), \ + index ++, \ + n = pos ? (struct pbe*)pos->dummy.val : NULL) /** + * find_pbe_by_index - + * @pgdir: + * @index: + * + * + */ +static struct pbe *find_pbe_by_index(struct pbe *pgdir, int index) +{ + unsigned long p = 0; + struct pbe *pbe, *next; + + pr_debug("find_pbe_by_index: %p, 0x%03x", pgdir, index); + pgdir_for_each(pbe, next, pgdir) { + if (p == index / ONE_PAGE_PBE_NUM) { + pbe = (struct pbe *)((unsigned long)pbe + + (index % ONE_PAGE_PBE_NUM) * sizeof(struct pbe)); + pr_debug(" %p, o{%p} c{%p}\n", + pbe, (void*)pbe->orig_address, (void*)pbe->address); + return pbe; + } + p ++; + } + return (NULL); +} + +/** + * pagedir_free - + * @head: + * + */ +static void pagedir_free(suspend_pagedir_t *head) +{ + suspend_pagedir_t *next, *cur; + pgdir_for_each(cur, next, head) + free_page((unsigned long)cur); +} + + +/** * write_swap_page - Write one page to a fresh swap location. * @addr: Address we're writing. * @loc: Place to store the entry we used.
@@ -269,19 +319,76 @@ { swp_entry_t entry; int i; + struct pbe *next, *pos; - for (i = 0; i < nr_copy_pages; i++) { - entry = (pagedir_nosave + i)->swap_address; + pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) { + entry = pos->swap_address; if (entry.val) swap_free(entry); else break; - (pagedir_nosave + i)->swap_address = (swp_entry_t){0}; + pos->swap_address = (swp_entry_t){0}; } } +static int mod_progress = 1; +static void inline mod_printk_progress(int i) +{ + if (mod_progress == 0) mod_progress = 1; + if (!(i%100)) + printk( "\b\b\b\b%3d%%", i / mod_progress ); +} + /** + * write_one_pbe - + * @p: + * @data: + * @cur: + * + */ +static int write_one_pbe(struct pbe *p, void *data, int cur) +{ + int error = 0; + + mod_printk_progress(cur); + + pr_debug("write_one_pbe: %p, o{%p} c{%p} %d ", + p, (void *)p->orig_address, (void *)p->address, cur); + error = write_page((unsigned long)data, &p->swap_address); + if (error) return error; + pr_debug("%lu\n", swp_offset(p->swap_address)); + + return 0; +} + +static int bio_read_page(pgoff_t page_off, void * page); + +/** + * read_one_pbe - + * @p: + * @data: + * @cur + * + */ +static int read_one_pbe(struct pbe *p, void *data, int cur) +{ + int error = 0; + + mod_printk_progress(cur); + + pr_debug("read_one_pbe: %p, o{%p} c{%p} %lu\n", + p, (void *)p->orig_address, data, + swp_offset(p->swap_address)); + + error = bio_read_page(swp_offset(p->swap_address), data); + if (error) return error; + + return 0; +} + + +/** * data_write - Write saved image to swap. * * Walk the list of pages in the image and sync each one to swap.
@@ -291,17 +398,15 @@ { int error = 0; int i; - unsigned int mod = nr_copy_pages / 100; + struct pbe *pos, *next; - if (!mod) - mod = 1; + mod_progress = nr_copy_pages / 100; printk( "Writing data to swap (%d pages)... ", nr_copy_pages ); - for (i = 0; i < nr_copy_pages && !error; i++) { - if (!(i%mod)) - printk( "\b\b\b\b%3d%%", i / mod ); - error = write_page((pagedir_nosave+i)->address, - &((pagedir_nosave+i)->swap_address)); + pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) { + BUG_ON(pos->orig_address == 0); + error = write_one_pbe(pos, (void*)pos->address, i); + if (error) break; } printk("\b\b\b\bdone\n"); return error;
@@ -371,15 +476,17 @@ static int write_pagedir(void) { - unsigned long addr = (unsigned long)pagedir_nosave; int error = 0; - int n = SUSPEND_PD_PAGES(nr_copy_pages); - int i; + int n = 0; + suspend_pagedir_t *pgdir, *next; + pgdir_for_each(pgdir, next, pagedir_nosave) { + error = write_page((unsigned long)pgdir, &swsusp_info.pagedir[n]); + if (error) break; + n ++; + } + printk( "Writing pagedir (%d pages)\n", n); swsusp_info.pagedir_pages = n; - printk( "Writing pagedir (%d pages)\n", n); - for (i = 0; i < n && !error; i++, addr += PAGE_SIZE) - error = write_page(addr, &swsusp_info.pagedir[i]); return error; }
@@ -564,7 +671,7 @@ { struct zone *zone; unsigned long zone_pfn; - struct pbe * pbe = pagedir_nosave; + struct pbe * pbe = NULL; int pages_copied = 0; for_each_zone(zone) {
@@ -574,11 +681,14 @@ for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) { if (saveable(zone, &zone_pfn)) { struct page * page; + pbe = find_pbe_by_index(pagedir_nosave, pages_copied); + BUG_ON(pbe == NULL); page = pfn_to_page(zone_pfn + zone->zone_start_pfn); pbe->orig_address = (long) page_address(page); + BUG_ON(pbe->orig_address == 0); + BUG_ON(pbe->address == 0); /* copy_page is not usable for copying task structs. */ memcpy((void *)pbe->address, (void *)pbe->orig_address, PAGE_SIZE); - pbe++; pages_copied++; } }
@@ -587,67 +697,160 @@ nr_copy_pages = pages_copied; } +#define pointer2num(x) ((x - PAGE_OFFSET) >> 12) +#define num2pointer(x) ((x << 12) + PAGE_OFFSET) +static inline void collide_set_bit(unsigned char *bitmap, + unsigned long bitnum) +{ + bitnum = pointer2num(bitnum); + bitmap[bitnum / 8] |= (1 << (bitnum%8)); +} +static inline int collide_is_bit_set(unsigned char *bitmap, + unsigned long bitnum) +{ + bitnum = pointer2num(bitnum); + return !!(bitmap[bitnum / 8] & (1 << (bitnum%8))); +} +static void collide_bitmap_free(unsigned char *bitmap) +{ + free_pages((unsigned long)bitmap, 2); +} +/* ((1 << COLLIDE_BITMAP_ORDER) * PAGE_SIZE * 8) << 12 + PAGE_OFFSET */ +#define COLLIDE_BITMAP_ORDER 3 + +static unsigned char *collide_bitmap_init(struct pbe *pgdir) +{ + unsigned char *bitmap = + (unsigned char *)__get_free_pages(GFP_ATOMIC | __GFP_COLD, + COLLIDE_BITMAP_ORDER); + struct pbe *next; + + if (bitmap == NULL) { + return NULL; + } + memset(bitmap, 0, (1 << COLLIDE_BITMAP_ORDER) * PAGE_SIZE); + + /* do base check */ + BUG_ON(collide_is_bit_set(bitmap, (unsigned long)bitmap) == 1); + collide_set_bit(bitmap, (unsigned long)bitmap); + BUG_ON(collide_is_bit_set(bitmap, (unsigned long)bitmap) == 0); + while (pgdir != NULL) { + unsigned long nums; + next = (struct pbe*)pgdir->dummy.val; + for (nums = 0; nums < ONE_PAGE_PBE_NUM; nums++) { + collide_set_bit(bitmap, (unsigned long)pgdir); + collide_set_bit(bitmap, (unsigned long)pgdir->orig_address); + pgdir ++; + } + pgdir = next; + } + return bitmap; +} + +static void **eaten_memory = NULL; + +static void *swsusp_get_safe_free_page(unsigned char *collide) +{ + void *addr = NULL; + void **c = eaten_memory; + + do { + if (addr) { + eaten_memory = (void**)addr; + *eaten_memory = c; + c = eaten_memory; + } + addr = (void*)__get_free_pages(GFP_ATOMIC | __GFP_COLD, 0); + if (!addr) + return NULL; + } while (collide && collide_is_bit_set(collide, (unsigned long)addr)); + + return addr; +} + /** - * calc_order - Determine the order of allocation needed for pagedir_save. + * alloc_one_pagedir - + * @prev: + * @collide: * - * This looks tricky, but is just subtle. Please fix it some time. - * Since there are %nr_copy_pages worth of pages in the snapshot, we need - * to allocate enough contiguous space to hold - * (%nr_copy_pages * sizeof(struct pbe)), - * which has the saved/orig locations of the page.. - * - * SUSPEND_PD_PAGES() tells us how many pages we need to hold those - * structures, then we call get_bitmask_order(), which will tell us the - * last bit set in the number, starting with 1. (If we need 30 pages, that - * is 0x0000001e in hex. The last bit is the 5th, which is the order we - * would use to allocate 32 contiguous pages). - * - * Since we also need to save those pages, we add the number of pages that - * we need to nr_copy_pages, and in case of an overflow, do the - * calculation again to update the number of pages needed. - * - * With this model, we will tend to waste a lot of memory if we just cross - * an order boundary. Plus, the higher the order of allocation that we try - * to do, the more likely we are to fail in a low-memory situtation - * (though we're unlikely to get this far in such a case, since swsusp - * requires half of memory to be free anyway). */ +static suspend_pagedir_t * alloc_one_pagedir(suspend_pagedir_t *prev, + unsigned char *collide) +{ + suspend_pagedir_t *pgdir = NULL; + int i; + pgdir = (suspend_pagedir_t *)swsusp_get_safe_free_page(collide); -static void calc_order(void) + /*pr_debug("pgdir: %p, %p, %d\n", + pgdir, prev, sizeof(suspend_pagedir_t)); */ + for (i = 0; i < ONE_PAGE_PBE_NUM; i++) { + pgdir[i].dummy.val = 0; + pgdir[i].address = 0; + pgdir[i].orig_address = 0; + if (prev) + prev[i].dummy.val= (unsigned long)pgdir; + } + + return (pgdir); +} + +/* calc_nums - Determine the nums of allocation needed for pagedir_save. */ +static int calc_nums(int nr_copy) { - int diff = 0; - int order = 0; - + int diff = 0, ret = 0; do { - diff = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages)) - order; + diff = (nr_copy / ONE_PAGE_PBE_NUM) - ret + 1; if (diff) { - order += diff; - nr_copy_pages += 1 << diff; + ret += diff; + nr_copy += diff; } - } while(diff); - pagedir_order = order; + } while (diff); + return nr_copy; } - /** * alloc_pagedir - Allocate the page directory. + * @pbe: + * @pbe_nums: + * @collide: + * @page_nums: * * First, determine exactly how many contiguous pages we need and * allocate them. */ -static int alloc_pagedir(void) +static int alloc_pagedir(struct pbe **pbe, int pbe_nums, + unsigned char *collide, int page_nums) { - calc_order(); - pagedir_save = (suspend_pagedir_t *)__get_free_pages(GFP_ATOMIC | __GFP_COLD, - pagedir_order); - if (!pagedir_save) - return -ENOMEM; - memset(pagedir_save, 0, (1 << pagedir_order) * PAGE_SIZE); - pagedir_nosave = pagedir_save; - return 0; + unsigned int nums = 0; + unsigned int after_alloc = pbe_nums; + suspend_pagedir_t *prev = NULL, *cur = NULL; + + if (page_nums) + after_alloc = ONE_PAGE_PBE_NUM * page_nums; + else + after_alloc = calc_nums(after_alloc); + pr_debug("alloc_pagedir: %d, %d\n", pbe_nums, after_alloc); + for (nums = 0 ; nums < after_alloc ; nums += ONE_PAGE_PBE_NUM) { + cur = alloc_one_pagedir(prev, collide); + pr_debug("alloc_one_pagedir: %p\n", cur); + if (!cur) { /* get page failed */ + goto no_mem; + } + if (nums == 0) { /* setup the head */ + *pbe = cur; + } + prev = cur; + } + return after_alloc - pbe_nums; + +no_mem: + pagedir_free(*pbe); + *pbe = NULL; + + return (-ENOMEM); } /**
@@ -656,11 +859,10 @@ static void free_image_pages(void) { - struct pbe * p; + struct pbe * p, * n; int i; - p = pagedir_save; - for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) { + pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) { if (p->address) { ClearPageNosave(virt_to_page(p->address)); free_page(p->address);
@@ -676,10 +878,10 @@ static int alloc_image_pages(void) { - struct pbe * p; + struct pbe * p, * n; int i; - for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) { + pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) { p->address = get_zeroed_page(GFP_ATOMIC | __GFP_COLD); if (!p->address) return -ENOMEM;
@@ -693,7 +895,7 @@ BUG_ON(PageNosave(virt_to_page(pagedir_save))); BUG_ON(PageNosaveFree(virt_to_page(pagedir_save))); free_image_pages(); - free_pages((unsigned long) pagedir_save, pagedir_order); + pagedir_free(pagedir_save); }
@@ -751,17 +953,20 @@ if (!enough_swap()) return -ENOSPC; - if ((error = alloc_pagedir())) { + error = alloc_pagedir(&pagedir_save, nr_copy_pages, NULL, 0); + if (error < 0) { pr_debug("suspend: Allocating pagedir failed.\n"); return error; } + pr_debug("alloc_pagedir: addon %d\n", error); + nr_copy_pages += error; if ((error = alloc_image_pages())) { pr_debug("suspend: Allocating image pages failed.\n"); swsusp_free(); return error; } + pagedir_nosave = pagedir_save; - pagedir_order_check = pagedir_order; return 0; }
@@ -854,8 +1059,6 @@ asmlinkage int swsusp_restore(void) { - BUG_ON (pagedir_order_check != pagedir_order); - /* Even mappings of "global" things (vmalloc) need to be fixed */ __flush_tlb_global(); wbinvd(); /* Nigel says wbinvd here is good idea... */
@@ -882,98 +1085,6 @@ } - -/* More restore stuff */ - -#define does_collide(addr) does_collide_order(pagedir_nosave, addr, 0) - -/* - * Returns true if given address/order collides with any orig_address - */ -static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr, - int order) -{ - int i; - unsigned long addre = addr + (PAGE_SIZE<<order); - - for (i=0; i < nr_copy_pages; i++) - if ((pagedir+i)->orig_address >= addr && - (pagedir+i)->orig_address < addre) - return 1; - - return 0; -} - -/* - * We check here that pagedir & pages it points to won't collide with pages - * where we're going to restore from the loaded pages later - */ -static int __init check_pagedir(void) -{ - int i; - - for(i=0; i < nr_copy_pages; i++) { - unsigned long addr; - - do { - addr = get_zeroed_page(GFP_ATOMIC); - if(!addr) - return -ENOMEM; - } while (does_collide(addr)); - - (pagedir_nosave+i)->address = addr; - } - return 0; -} - -static int __init swsusp_pagedir_relocate(void) -{ - /* - * We have to avoid recursion (not to overflow kernel stack), - * and that's why code looks pretty cryptic - */ - suspend_pagedir_t *old_pagedir = pagedir_nosave; - void **eaten_memory = NULL; - void **c = eaten_memory, *m, *f; - int ret = 0; - - printk("Relocating pagedir "); - - if (!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) { - printk("not necessary\n"); - return check_pagedir(); - } - - while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) { - if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order)) - break; - eaten_memory = m; - printk( "." ); - *eaten_memory = c; - c = eaten_memory; - } - - if (!m) { - printk("out of memory\n"); - ret = -ENOMEM; - } else { - pagedir_nosave = - memcpy(m, old_pagedir, PAGE_SIZE << pagedir_order); - } - - c = eaten_memory; - while (c) { - printk(":"); - f = c; - c = *c; - free_pages((unsigned long)f, pagedir_order); - } - if (ret) - return ret; - printk("|\n"); - return check_pagedir(); -} - /** * Using bio to read from swap. * This code requires a bit more work than just using buffer heads
@@ -1038,12 +1149,12 @@ return error; } -int bio_read_page(pgoff_t page_off, void * page) +static int bio_read_page(pgoff_t page_off, void * page) { return submit(READ, page_off, page); } -int bio_write_page(pgoff_t page_off, void * page) +static int bio_write_page(pgoff_t page_off, void * page) { return submit(WRITE, page_off, page); }
@@ -1088,7 +1199,6 @@ return -EPERM; } nr_copy_pages = swsusp_info.image_pages; - pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages)); return error; }
@@ -1115,7 +1225,96 @@ return error; } +static void __init eat_progress(void) +{ + char *eaten_progess = "-\\|/"; + static int eaten_i = 0; + + printk("\b%c", eaten_progess[eaten_i]); + eaten_i ++; + if (eaten_i > 3) eaten_i = 0; +} + +static int __init check_one_pbe(struct pbe *p, void *collide, int cur) +{ + unsigned long addr = 0; + + pr_debug("check_one_pbe: %p %lu o{%p} ", + p, p->swap_address.val, (void*)p->orig_address); + addr = (unsigned long)swsusp_get_safe_free_page(collide); + if(!addr) + return -ENOMEM; + pr_debug("c{%p} done\n", (void*)addr); + p->address = addr; + + return 0; +} + +static void __init swsusp_copy_pagedir(suspend_pagedir_t *d_pgdir, + suspend_pagedir_t *s_pgdir) +{ + int i = 0; + + while (s_pgdir != NULL) { + suspend_pagedir_t *s_next = (suspend_pagedir_t *)s_pgdir->dummy.val; + suspend_pagedir_t *d_next = (suspend_pagedir_t *)d_pgdir->dummy.val; + for (i = 0; i < ONE_PAGE_PBE_NUM; i++) { + d_pgdir->address = s_pgdir->address; + d_pgdir->orig_address = s_pgdir->orig_address; + d_pgdir->swap_address = s_pgdir->swap_address; + s_pgdir ++; d_pgdir ++; + } + d_pgdir = d_next; + s_pgdir = s_next; + }; +} /** + * We check here that pagedir & pages it points to won't collide with pages + * where we're going to restore from the loaded pages later + */ +static int __init check_pagedir(void) +{ + void **c, *f; + struct pbe *next, *pos; + int error, index; + suspend_pagedir_t *addr = NULL; + unsigned char *bitmap = collide_bitmap_init(pagedir_nosave); + + BUG_ON(bitmap == NULL); + + printk("Relocating pagedir ... "); + error = alloc_pagedir(&addr, nr_copy_pages, bitmap, + swsusp_info.pagedir_pages); + if (error < 0) { + return error; + } + swsusp_copy_pagedir(addr, pagedir_nosave); + pagedir_free(pagedir_nosave); + + /* check copy address */ + pbe_for_each(pos, next, index, nr_copy_pages, addr) { + error = check_one_pbe(pos, bitmap, index); + BUG_ON(error); + } + + /* free eaten memory */ + c = eaten_memory; + while (c) { + eat_progress(); + f = c; + c = *c; + free_pages((unsigned long)f, 0); + } + /* free unused memory */ + collide_bitmap_free(bitmap); + printk(" done\n"); + + pagedir_nosave = addr; + + return 0; +} + +/** * swsusp_read_data - Read image pages from swap. * * You do not need to check for overlaps, check_pagedir()
@@ -1124,53 +1323,67 @@ static int __init data_read(void) { - struct pbe * p; + struct pbe * p, * n; int error; int i; - int mod = nr_copy_pages / 100; - if (!mod) - mod = 1; + if ((error = check_pagedir())) { + return -ENOMEM; + } - if ((error = swsusp_pagedir_relocate())) - return error; + mod_progress = nr_copy_pages / 100; printk( "Reading image data (%d pages): ", nr_copy_pages ); - for(i = 0, p = pagedir_nosave; i < nr_copy_pages && !error; i++, p++) { - if (!(i%mod)) - printk( "\b\b\b\b%3d%%", i / mod ); - error = bio_read_page(swp_offset(p->swap_address), - (void *)p->address); + pbe_for_each(p, n, i, nr_copy_pages, pagedir_nosave) { + error = read_one_pbe(p, (void*)p->address, i); + if (error) break; } printk(" %d done.\n",i); return error; - } extern dev_t __init name_to_dev_t(const char *line); +static int __init read_one_pagedir(suspend_pagedir_t *pgdir, int i) +{ + unsigned long offset = swp_offset(swsusp_info.pagedir[i]); + unsigned long next; + int error = 0; + + next = pgdir->dummy.val; + pr_debug("read_one_pagedir: %p, %d, %lu, %p\n", + pgdir, i, offset, (void*)next); + if ((error = bio_read_page(offset, (void *)pgdir))) { + return error; + } + pgdir->dummy.val = next; + + return error; +} + +/* + * reading pagedir from swap device + */ static int __init read_pagedir(void) { - unsigned long addr; - int i, n = swsusp_info.pagedir_pages; + int i = 0, n = swsusp_info.pagedir_pages; int error = 0; + suspend_pagedir_t *pgdir, *next; - addr = __get_free_pages(GFP_ATOMIC, pagedir_order); - if (!addr) + error = alloc_pagedir(&pagedir_nosave, nr_copy_pages, NULL, n); + if (error < 0) return -ENOMEM; - pagedir_nosave = (struct pbe *)addr; - pr_debug("pmdisk: Reading pagedir (%d Pages)\n",n); + printk("pmdisk: Reading pagedir (%d Pages)\n",n); - for (i = 0; i < n && !error; i++, addr += PAGE_SIZE) { - unsigned long offset = swp_offset(swsusp_info.pagedir[i]); - if (offset) - error = bio_read_page(offset, (void *)addr); - else - error = -EFAULT; + pgdir_for_each(pgdir, next, pagedir_nosave) { + error = read_one_pagedir(pgdir, i); + if (error) break; + i++; } + BUG_ON(i != n); if (error) - free_pages((unsigned long)pagedir_nosave, pagedir_order); + pagedir_free(pagedir_nosave); return error; }
@@ -1185,7 +1398,7 @@ if ((error = read_pagedir())) return error; if ((error = data_read())) - free_pages((unsigned long)pagedir_nosave, pagedir_order); + pagedir_free(pagedir_nosave); return error; }
@@ -1217,3 +1430,50 @@ pr_debug("pmdisk: Error %d resuming\n", error); return error; } + +/** + * for_each_pbe_copy_back - + * + * That usefuly for help us writing the code in assemble code + * + */ +/* #define CREATE_ASM_CODE */ +#ifdef CREATE_ASM_CODE +#if 0 /* if your copy back code is running in real mode, enable it */ +#define GET_ADDRESS(x) __pa(x) +#else +#define GET_ADDRESS(x) (x) +#endif +asmlinkage void for_each_pbe_copy_back(void) +{ + struct pbe *pgdir, *next; + + pgdir = pagedir_nosave; + while (pgdir != NULL) { + unsigned long nums, i; + pgdir = (struct pbe *)GET_ADDRESS(pgdir); + next = (struct pbe*)pgdir->dummy.val; + for (nums = 0; nums < ONE_PAGE_PBE_NUM; nums++) { + register unsigned long *orig, *copy; + orig = (unsigned long *)pgdir->orig_address; + if (orig == 0) goto end; + orig = (unsigned long *)GET_ADDRESS(orig); + copy = (unsigned long *)GET_ADDRESS(pgdir->address); +#if 0 + memcpy(orig, copy, PAGE_SIZE); +#else + for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i+=4) { + *(orig + i) = *(copy + i); + *(orig + i+1) = *(copy + i+1); + *(orig + i+2) = *(copy + i+2); + *(orig + i+3) = *(copy + i+3); + } +#endif + pgdir ++; + } + pgdir = next; + } +end: + panic("just asm code"); +} +#endif
=== arch/i386/power/swsusp.S
==================================================================
i386/power/swsusp.S (local) renamed from i386/power/swsusp.S (revision 24520) +24 -15
@@ -31,25 +31,34 @@ movl $swsusp_pg_dir-__PAGE_OFFSET,%ecx movl %ecx,%cr3 - movl pagedir_nosave, %ebx - xorl %eax, %eax - xorl %edx, %edx - .p2align 4,,7 + movl pagedir_nosave, %eax + test %eax, %eax + je copy_loop_end + movl $1024, %edx -copy_loop: - movl 4(%ebx,%edx),%edi - movl (%ebx,%edx),%esi +copy_loop_start: + movl 0xc(%eax), %ebp + xorl %ebx, %ebx + leal 0x0(%esi),%esi - movl $1024, %ecx - rep - movsl +copy_one_pgdir: + movl 0x4(%eax),%edi + test %edi, %edi + je copy_loop_end - incl %eax - addl $16, %edx - cmpl nr_copy_pages,%eax - jb copy_loop - .p2align 4,,7 + movl (%eax), %esi + movl %edx, %ecx + repz movsl %ds:(%esi),%es:(%edi) + incl %ebx + addl $0x10, %eax + cmpl $0xff, %ebx + jbe copy_one_pgdir + test %ebp, %ebp + movl %ebp, %eax + jne copy_loop_start +copy_loop_end: + movl saved_context_esp, %esp movl saved_context_ebp, %ebp movl saved_context_ebx, %ebx
--
Hu Gang / Steve
Linux Registered User 204016
GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
Re: software suspend patch [1/6]
Hi!
Quoted 6 lines
Quoted 6 lines
I can not merge anything before 2.6.10. As you have seen, I have quite a lot of patches in my tree, and I do not want mix them with these...
Quoted 2 lines
device-tree.diff
base from suspend2 with a little changed.
Quoted 8 lines
Quoted 6 lines
I do not want this one.
Quoted 2 lines
core.diff
1: redefine struct pbe for using _no_ continuous as pagedir.Can I get this one as a separate diff?
Here is it.
Do you have any updates? It would be nice to separate non-continuous pagedir from speeding up check_pagedir?
...plus check_pagedir should really use PageNosaveFree flag instead of allocating there own (big!) bitmaps. It should also make the code simpler...
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: software suspend patch [1/6]
Quoted 9 lines · Pavel Machek
Hi!
Do you have any updates? It would be nice to separate non-continuous pagedir from speeding up
check_pagedir?...plus
check_pagedirshould really use PageNosaveFree flag instead of allocating there own (big!) bitmaps. It should also make the code simpler...
Pavel
I'm very happy with current swsusp, that's stable for me.
2.6.10-mm1 + ppc patch from
http://honk.physik.uni-konstanz.de/~agx/linux-ppc/kernel/
+ your free some memory patch
I using it for a week, never failed, never oops. :)
The only problem is relocating a little slowly.
Now I don't think non-continuous pagedir is really need. Anyway I'll prepare a patch to make swsusp using non-continuous pagedir.
any comments.
Signature · 5 lines
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.ascRe: software suspend patch [1/6]
Hi!
Quoted 7 lines
Quoted 6 lines
Do you have any updates? It would be nice to separate non-continuous pagedir from speeding up
check_pagedir?...plus
check_pagedirshould really use PageNosaveFree flag instead of allocating there own (big!) bitmaps. It should also make the code simpler...
Quoted 8 lines
I'm very happy with current swsusp, that's stable for me.
2.6.10-mm1 + ppc patch from
http://honk.physik.uni-konstanz.de/~agx/linux-ppc/kernel/
+ your free some memory patchI using it for a week, never failed, never oops. :)
The only problem is relocating a little slowly.
I just got very nice patch from Lukas Hejtmanek to relocate faster... It would be great if you could test it.
Quoted 2 lines
Now I don't think non-continuous pagedir is really need. Anyway I'll prepare a patch to make swsusp using non-continuous pagedir.
Thanks.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!