On Thu, Apr 29, 2004 at 01:45:15PM +0200, Guido Guenther wrote: > On Thu, Apr 29, 2004 at 09:21:06AM +0200, Arne Caspari wrote: > > I am using kernel 2.6.5 on an iBook G4. Is there any way to get this machine into any suspend mode? > Could you try the attached patch, it should allow for suspend to disk. Attached is newer version based on benh's pmdisk patch that applies against 2.6.6 and has some minor fixes. Now we can have both, laptop mode and suspend ;) Unfortunatelyh USB is still dead on my powerbook after wakeup, I'm getting the following OOPS when I try to use USB after resume: usb 2-1: control timeout on ep0out usb 2-1: USB disconnect, address 2 Badness in ohci_endpoint_disable at drivers/usb/host/ohci-hcd.c:355 Call trace: [c0009844] dump_stack+0x18/0x28 [c0006c2c] check_bug_trap+0x84/0xac [c0006d84] ProgramCheckException+0x130/0x170 [c0006354] ret_from_except_full+0x0/0x4c [d13c92b4] ohci_endpoint_disable+0xa0/0x178 [ohci_hcd] [d14c824c] hcd_endpoint_disable+0x118/0x190 [usbcore] [d14c985c] usb_disable_endpoint+0xa8/0xac [usbcore] [d14c9988] usb_disable_device+0xbc/0xd8 [usbcore] [d14c3e58] usb_disconnect+0x9c/0x134 [usbcore] [d14c6224] hub_port_connect_change+0x294/0x298 [usbcore] [d14c64fc] hub_events+0x2d4/0x354 [usbcore] [d14c65b8] hub_thread+0x3c/0xf0 [usbcore] [c0008f30] kernel_thread+0x44/0x60 Cheers, -- Guido
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/Kconfig ./arch/ppc/Kconfig
--- ../linux-2.6.6.orig/arch/ppc/Kconfig 2004-05-09 23:33:21.000000000 -0300
+++ ./arch/ppc/Kconfig 2004-05-26 16:22:53.000000000 -0300
@@ -932,6 +932,8 @@
source "drivers/zorro/Kconfig"
+source kernel/power/Kconfig
+
endmenu
menu "Bus options"
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/kernel/Makefile ./arch/ppc/kernel/Makefile
--- ../linux-2.6.6.orig/arch/ppc/kernel/Makefile 2004-05-09 23:33:19.000000000 -0300
+++ ./arch/ppc/kernel/Makefile 2004-05-26 16:22:53.000000000 -0300
@@ -15,6 +15,7 @@
extra-$(CONFIG_8xx) := head_8xx.o
extra-$(CONFIG_6xx) += idle_6xx.o
extra-$(CONFIG_POWER4) += idle_power4.o
+
extra-y += vmlinux.lds.s
obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
@@ -22,6 +23,7 @@
semaphore.o syscalls.o setup.o \
cputable.o ppc_htab.o
obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
+obj-$(CONFIG_PM_DISK) += pmdisk.o
obj-$(CONFIG_POWER4) += cpu_setup_power4.o
obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
obj-$(CONFIG_PCI) += pci.o
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/kernel/pmdisk.S ./arch/ppc/kernel/pmdisk.S
--- ../linux-2.6.6.orig/arch/ppc/kernel/pmdisk.S 1969-12-31 21:00:00.000000000 -0300
+++ ./arch/ppc/kernel/pmdisk.S 2004-05-26 16:22:53.000000000 -0300
@@ -0,0 +1,358 @@
+#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(pmdisk_save_area)
+ .space SL_SIZE
+
+
+ .section .text
+ .align 5
+
+_GLOBAL(pmdisk_arch_suspend)
+ cmpi 0,r3,0
+ bne do_resume
+
+ lis r11,pmdisk_save_area@h
+ ori r11,r11,pmdisk_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 pmdisk_suspend
+
+ /* Restore LR from the save area */
+ lis r11,pmdisk_save_area@h
+ ori r11,r11,pmdisk_save_area@l
+ lwz r0,SL_LR(r11)
+ mtlr r0
+
+ blr
+
+
+/* Resume code */
+do_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 r3 */
+ lis r11,(pm_pagedir_nosave - KERNELBASE)@h
+ ori r11,r11,pm_pagedir_nosave@l
+ lwz r10,0(r11)
+ tophys(r3,r10)
+
+ /* Load the count of pages to copy in r4 */
+ lis r11,(pmdisk_pages - KERNELBASE)@h
+ ori r11,r11,pmdisk_pages@l
+ lwz r4,0(r11)
+
+
+ /* Copy the pages. This is a very basic implementation, to
+ * be replaced by something more cache efficient */
+1:
+ li r0,256
+ mtctr r0
+ lwz r11,0(r3) /* source */
+ tophys(r5,r11)
+ lwz r10,4(r3) /* destination */
+ tophys(r6,r10)
+2:
+ lwz r8,0(r5)
+ lwz r9,4(r5)
+ lwz r10,8(r5)
+ lwz r11,12(r5)
+ addi r5,r5,16
+ stw r8,0(r6)
+ stw r9,4(r6)
+ stw r10,8(r6)
+ stw r11,12(r6)
+ addi r6,r6,16
+ bdnz 2b
+ addi r3,r3,16
+ subi r4,r4,1
+ cmpwi 0,r4,0
+ bne 1b
+
+ /* 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,pmdisk_save_area@h
+ ori r11,r11,pmdisk_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 pmdisk_resume
+
+ li r3,0
+ blr
+
+/* FIXME:This construct is actually not useful since we don't shut
+ * down the instruction MMU, we could just flip back MSR-DR on.
+ */
+turn_on_mmu:
+ mflr r4
+ mtsrr0 r4
+ mtsrr1 r3
+ sync
+ isync
+ rfi
+
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/kernel/signal.c ./arch/ppc/kernel/signal.c
--- ../linux-2.6.6.orig/arch/ppc/kernel/signal.c 2004-05-09 23:33:21.000000000 -0300
+++ ./arch/ppc/kernel/signal.c 2004-05-26 16:22:53.000000000 -0300
@@ -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>
@@ -569,6 +570,11 @@
unsigned long frame, newsp;
int signr, ret;
+ if (current->flags & PF_FREEZE) {
+ refrigerator(0);
+ return 0;
+ }
+
if (!oldset)
oldset = ¤t->blocked;
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/kernel/vmlinux.lds.S ./arch/ppc/kernel/vmlinux.lds.S
--- ../linux-2.6.6.orig/arch/ppc/kernel/vmlinux.lds.S 2004-05-09 23:33:22.000000000 -0300
+++ ./arch/ppc/kernel/vmlinux.lds.S 2004-05-26 16:22:53.000000000 -0300
@@ -73,6 +73,12 @@
CONSTRUCTORS
}
+ . = ALIGN(4096);
+ __nosave_begin = .;
+ .data_nosave : { *(.data.nosave) }
+ . = ALIGN(4096);
+ __nosave_end = .;
+
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/platforms/pmac_feature.c ./arch/ppc/platforms/pmac_feature.c
--- ../linux-2.6.6.orig/arch/ppc/platforms/pmac_feature.c 2004-05-09 23:33:19.000000000 -0300
+++ ./arch/ppc/platforms/pmac_feature.c 2004-05-26 16:23:47.000000000 -0300
@@ -1156,7 +1156,7 @@
(void)MACIO_IN32(KEYLARGO_FCR1);
mdelay(1);
LOCK(flags);
- MACIO_BIS(KEYLARGO_FCR0, KL1_USB2_CELL_ENABLE);
+ MACIO_BIS(KEYLARGO_FCR1, KL1_USB2_CELL_ENABLE);
}
if (number < 4) {
reg = MACIO_IN32(KEYLARGO_FCR4);
diff -ub -Naur ../linux-2.6.6.orig/arch/ppc/platforms/pmac_setup.c ./arch/ppc/platforms/pmac_setup.c
--- ../linux-2.6.6.orig/arch/ppc/platforms/pmac_setup.c 2004-05-09 23:32:53.000000000 -0300
+++ ./arch/ppc/platforms/pmac_setup.c 2004-05-26 18:07:02.000000000 -0300
@@ -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"
@@ -425,11 +428,67 @@
#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_DISK
+
+extern void enable_kernel_altivec(void);
+
+static int pmac_pm_prepare(u32 state)
+{
+ printk(KERN_DEBUG "pmac_pm_prepare(%d)\n", state);
+
+ return 0;
+}
+
+static int pmac_pm_enter(u32 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(u32 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_DISK */
+
static int initializing = 1;
static int pmac_late_init(void)
{
initializing = 0;
+
+#ifdef CONFIG_PM_DISK
+ pm_set_ops(&pmac_pm_ops);
+#endif /* CONFIG_PM_DISK */
return 0;
}
diff -ub -Naur ../linux-2.6.6.orig/drivers/ide/ppc/pmac.c ./drivers/ide/ppc/pmac.c
--- ../linux-2.6.6.orig/drivers/ide/ppc/pmac.c 2004-05-09 23:32:00.000000000 -0300
+++ ./drivers/ide/ppc/pmac.c 2004-05-26 16:22:53.000000000 -0300
@@ -1372,7 +1372,7 @@
ide_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 >= 2 && state != 4) {
rc = pmac_ide_do_suspend(hwif);
if (rc == 0)
mdev->ofdev.dev.power_state = state;
@@ -1480,7 +1480,7 @@
ide_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 >= 2 && state != 4) {
rc = pmac_ide_do_suspend(hwif);
if (rc == 0)
pdev->dev.power_state = state;
diff -ub -Naur ../linux-2.6.6.orig/drivers/macintosh/Kconfig ./drivers/macintosh/Kconfig
--- ../linux-2.6.6.orig/drivers/macintosh/Kconfig 2004-05-09 23:32:28.000000000 -0300
+++ ./drivers/macintosh/Kconfig 2004-05-26 16:22:53.000000000 -0300
@@ -80,7 +80,7 @@
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,10 +97,10 @@
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 PM
+# bool
+# depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK
+# default y
config PMAC_APM_EMU
tristate "APM emulation"
diff -ub -Naur ../linux-2.6.6.orig/drivers/macintosh/mediabay.c ./drivers/macintosh/mediabay.c
--- ../linux-2.6.6.orig/drivers/macintosh/mediabay.c 2004-05-09 23:32:26.000000000 -0300
+++ ./drivers/macintosh/mediabay.c 2004-05-26 16:22:53.000000000 -0300
@@ -714,7 +714,7 @@
{
struct media_bay_info *bay = macio_get_drvdata(mdev);
- if (state != mdev->ofdev.dev.power_state && state >= 2) {
+ if (state != mdev->ofdev.dev.power_state && state >= 2 && state != 4) {
down(&bay->lock);
bay->sleeping = 1;
set_mb_power(bay, 0);
diff -ub -Naur ../linux-2.6.6.orig/drivers/macintosh/via-pmu.c ./drivers/macintosh/via-pmu.c
--- ../linux-2.6.6.orig/drivers/macintosh/via-pmu.c 2004-05-09 23:33:19.000000000 -0300
+++ ./drivers/macintosh/via-pmu.c 2004-05-26 16:22:53.000000000 -0300
@@ -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>
@@ -2324,7 +2325,7 @@
/* 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();
@@ -2377,7 +2378,6 @@
/* Wait for completion of async backlight requests */
while (!bright_req_1.complete || !bright_req_2.complete ||
-
!batt_req.complete)
pmu_poll();
@@ -3045,6 +3045,88 @@
}
#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, u32 state)
+{
+ if (state != PM_SUSPEND_DISK || 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) {
+ 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;
+}
+
+subsys_initcall(init_pmu_sysfs);
+
EXPORT_SYMBOL(pmu_request);
EXPORT_SYMBOL(pmu_poll);
EXPORT_SYMBOL(pmu_poll_adb);
diff -ub -Naur ../linux-2.6.6.orig/drivers/video/aty/radeon_pm.c ./drivers/video/aty/radeon_pm.c
--- ../linux-2.6.6.orig/drivers/video/aty/radeon_pm.c 2004-05-09 23:32:53.000000000 -0300
+++ ./drivers/video/aty/radeon_pm.c 2004-05-26 16:22:53.000000000 -0300
@@ -846,6 +846,8 @@
*/
printk(KERN_DEBUG "radeonfb: suspending to state: %d...\n", state);
+ if (state != 2 && state != 3)
+ return 0;
acquire_console_sem();
diff -ub -Naur ../linux-2.6.6.orig/include/asm-ppc/suspend.h ./include/asm-ppc/suspend.h
--- ../linux-2.6.6.orig/include/asm-ppc/suspend.h 1969-12-31 21:00:00.000000000 -0300
+++ ./include/asm-ppc/suspend.h 2004-05-26 16:22:53.000000000 -0300
@@ -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)
+{
+}
diff -ub -Naur ../linux-2.6.6.orig/include/linux/pm.h ./include/linux/pm.h
--- ../linux-2.6.6.orig/include/linux/pm.h 2004-05-09 23:32:39.000000000 -0300
+++ ./include/linux/pm.h 2004-05-26 16:22:53.000000000 -0300
@@ -194,10 +194,10 @@
extern void (*pm_power_off)(void);
enum {
- PM_SUSPEND_ON,
- PM_SUSPEND_STANDBY,
- PM_SUSPEND_MEM,
- PM_SUSPEND_DISK,
+ PM_SUSPEND_ON = 0,
+ PM_SUSPEND_STANDBY = 1,
+ PM_SUSPEND_MEM = 3,
+ PM_SUSPEND_DISK = 4,
PM_SUSPEND_MAX,
};
diff -ub -Naur ../linux-2.6.6.orig/include/linux/reboot.h ./include/linux/reboot.h
--- ../linux-2.6.6.orig/include/linux/reboot.h 2004-05-09 23:33:22.000000000 -0300
+++ ./include/linux/reboot.h 2004-05-26 16:22:53.000000000 -0300
@@ -40,6 +40,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.
diff -ub -Naur ../linux-2.6.6.orig/include/linux/suspend.h ./include/linux/suspend.h
--- ../linux-2.6.6.orig/include/linux/suspend.h 2004-05-09 23:32:26.000000000 -0300
+++ ./include/linux/suspend.h 2004-05-26 16:22:53.000000000 -0300
@@ -1,9 +1,9 @@
#ifndef _LINUX_SWSUSP_H
#define _LINUX_SWSUSP_H
-#ifdef CONFIG_X86
+//#ifdef CONFIG_X86
#include <asm/suspend.h>
-#endif
+//#endif
#include <linux/swap.h>
#include <linux/notifier.h>
#include <linux/config.h>
diff -ub -Naur ../linux-2.6.6.orig/kernel/power/disk.c ./kernel/power/disk.c
--- ../linux-2.6.6.orig/kernel/power/disk.c 2004-05-09 23:31:59.000000000 -0300
+++ ./kernel/power/disk.c 2004-05-26 16:22:53.000000000 -0300
@@ -17,6 +17,7 @@
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/fs.h>
+#include <linux/reboot.h>
#include "power.h"
@@ -45,23 +46,26 @@
unsigned long flags;
int error = 0;
- local_irq_save(flags);
- device_power_down(PM_SUSPEND_DISK);
switch(mode) {
case PM_DISK_PLATFORM:
+ local_irq_save(flags);
error = pm_ops->enter(PM_SUSPEND_DISK);
+ local_irq_restore(flags);
break;
case PM_DISK_SHUTDOWN:
printk("Powering off system\n");
+ notifier_call_chain(&reboot_notifier_list, SYS_POWER_OFF, NULL);
+ device_shutdown();
machine_power_off();
break;
case PM_DISK_REBOOT:
+ printk("Rebooting system\n");
+ notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL);
+ device_shutdown();
machine_restart(NULL);
break;
}
machine_halt();
- device_power_up();
- local_irq_restore(flags);
return 0;
}
@@ -161,8 +165,10 @@
pr_debug("PM: snapshotting memory.\n");
in_suspend = 1;
- if ((error = pmdisk_save()))
+ if ((error = pmdisk_save())) {
+ pr_debug("PM: snapshot memory failed !\n");
goto Done;
+ }
if (in_suspend) {
pr_debug("PM: writing image.\n");
@@ -223,9 +229,6 @@
* Do it with disabled interrupts for best effect. That way, if some
* driver scheduled DMA, we have good chance for DMA to finish ;-).
*/
- pr_debug("PM: Waiting for DMAs to settle down.\n");
- mdelay(1000);
-
pr_debug("PM: Restoring saved image.\n");
pmdisk_restore();
pr_debug("PM: Restore failed, recovering.n");
diff -ub -Naur ../linux-2.6.6.orig/kernel/power/Kconfig ./kernel/power/Kconfig
--- ../linux-2.6.6.orig/kernel/power/Kconfig 2004-05-09 23:33:13.000000000 -0300
+++ ./kernel/power/Kconfig 2004-05-26 17:55:09.000000000 -0300
@@ -44,7 +44,7 @@
config PM_DISK
bool "Suspend-to-Disk Support"
- depends on PM && SWAP && X86 && !X86_64
+ depends on PM && SWAP && ((X86 && !X86_64) || PPC)
---help---
Suspend-to-disk is a power management state in which the contents
of memory are stored on disk and the entire system is shut down or
diff -ub -Naur ../linux-2.6.6.orig/kernel/power/main.c ./kernel/power/main.c
--- ../linux-2.6.6.orig/kernel/power/main.c 2004-05-09 23:32:26.000000000 -0300
+++ ./kernel/power/main.c 2004-05-26 16:22:53.000000000 -0300
@@ -120,6 +120,7 @@
char * pm_states[] = {
[PM_SUSPEND_STANDBY] = "standby",
+ [2] = "",
[PM_SUSPEND_MEM] = "mem",
[PM_SUSPEND_DISK] = "disk",
NULL,
diff -ub -Naur ../linux-2.6.6.orig/kernel/power/pmdisk.c ./kernel/power/pmdisk.c
--- ../linux-2.6.6.orig/kernel/power/pmdisk.c 2004-05-09 23:32:38.000000000 -0300
+++ ./kernel/power/pmdisk.c 2004-05-26 16:22:53.000000000 -0300
@@ -18,7 +18,7 @@
*
*/
-#undef DEBUG
+#define DEBUG
#include <linux/mm.h>
#include <linux/bio.h>
@@ -569,7 +569,7 @@
/**
- * enough_free_mem - Make sure we enough free memory to snapshot.
+ * enough_free_mem - Make sure we have enough free memory to snapshot.
*
* Returns TRUE or FALSE after checking the number of available
* free pages.
@@ -625,8 +625,10 @@
{
int error = 0;
- if ((error = read_swapfiles()))
+ if ((error = read_swapfiles())) {
+ printk("Can't read swapfiles\n");
return error;
+ }
drain_local_pages();
@@ -703,6 +705,7 @@
* Magic happens here
*/
+#if 0
int pmdisk_resume(void)
{
BUG_ON (nr_copy_pages_check != pmdisk_pages);
@@ -712,6 +715,7 @@
__flush_tlb_global();
return 0;
}
+#endif
/* pmdisk_arch_suspend() is implemented in arch/?/power/pmdisk.S,
and basically does:
@@ -1082,9 +1086,11 @@
if ((error = arch_prepare_suspend()))
return error;
local_irq_disable();
+ device_power_down(PM_SUSPEND_DISK);
save_processor_state();
error = pmdisk_arch_suspend(0);
restore_processor_state();
+ device_power_up();
local_irq_enable();
return error;
}
@@ -1143,10 +1149,13 @@
int __init pmdisk_restore(void)
{
int error;
+
local_irq_disable();
+ device_power_down(PM_SUSPEND_DISK);
save_processor_state();
error = pmdisk_arch_suspend(1);
restore_processor_state();
+ device_power_up();
local_irq_enable();
return error;
}
diff -ub -Naur ../linux-2.6.6.orig/kernel/sys.c ./kernel/sys.c
--- ../linux-2.6.6.orig/kernel/sys.c 2004-05-09 23:32:00.000000000 -0300
+++ ./kernel/sys.c 2004-05-26 16:22:53.000000000 -0300
@@ -84,7 +84,7 @@
* and the like.
*/
-static struct notifier_block *reboot_notifier_list;
+struct notifier_block *reboot_notifier_list;
rwlock_t notifier_lock = RW_LOCK_UNLOCKED;
/**
Attachment:
signature.asc
Description: Digital signature