diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 18:44:43 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 18:44:43 -0400 |
commit | f5f0e17a8475dee913f362510e6a8ab987d27b9f (patch) | |
tree | ebe44e7774400730f6c15cd5a84187113c274e3d /arch/arm | |
parent | 2f3ec501ba1e1a68ab9d413f143bdc8f46417fc1 (diff) | |
parent | fff94cd9f5527bbba13aa5ea5719d16531ca8e65 (diff) |
Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm')
27 files changed, 1034 insertions, 760 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h new file mode 100644 index 000000000000..ce1ec69806a1 --- /dev/null +++ b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | |||
@@ -0,0 +1,23 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | ||
2 | * | ||
3 | * Copyright (c) 2008 Simtec Electronics | ||
4 | * http://armlinux.simtec.co.uk/ | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * | ||
7 | * S3C2410 - GPIO bank numbering | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) | ||
15 | |||
16 | #define S3C2410_GPIO_BANKA (32*0) | ||
17 | #define S3C2410_GPIO_BANKB (32*1) | ||
18 | #define S3C2410_GPIO_BANKC (32*2) | ||
19 | #define S3C2410_GPIO_BANKD (32*3) | ||
20 | #define S3C2410_GPIO_BANKE (32*4) | ||
21 | #define S3C2410_GPIO_BANKF (32*5) | ||
22 | #define S3C2410_GPIO_BANKG (32*6) | ||
23 | #define S3C2410_GPIO_BANKH (32*7) | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 00476a573bbe..51a88cf9526b 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h | |||
@@ -23,3 +23,6 @@ | |||
23 | #define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA) | 23 | #define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA) |
24 | 24 | ||
25 | #include <asm-generic/gpio.h> | 25 | #include <asm-generic/gpio.h> |
26 | #include <mach/gpio-nrs.h> | ||
27 | |||
28 | #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h index 49efce8cd4a7..2a2384ffa7b1 100644 --- a/arch/arm/mach-s3c2410/include/mach/irqs.h +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h | |||
@@ -80,7 +80,7 @@ | |||
80 | #define IRQ_EINT22 S3C2410_IRQ(50) | 80 | #define IRQ_EINT22 S3C2410_IRQ(50) |
81 | #define IRQ_EINT23 S3C2410_IRQ(51) | 81 | #define IRQ_EINT23 S3C2410_IRQ(51) |
82 | 82 | ||
83 | 83 | #define IRQ_EINT_BIT(x) ((x) - IRQ_EINT4 + 4) | |
84 | #define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x))) | 84 | #define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x))) |
85 | 85 | ||
86 | #define IRQ_LCD_FIFO S3C2410_IRQ(52) | 86 | #define IRQ_LCD_FIFO S3C2410_IRQ(52) |
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h index 321077613067..35a03df473fc 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h | |||
@@ -14,16 +14,7 @@ | |||
14 | #ifndef __ASM_ARCH_REGS_GPIO_H | 14 | #ifndef __ASM_ARCH_REGS_GPIO_H |
15 | #define __ASM_ARCH_REGS_GPIO_H | 15 | #define __ASM_ARCH_REGS_GPIO_H |
16 | 16 | ||
17 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) | 17 | #include <mach/gpio-nrs.h> |
18 | |||
19 | #define S3C2410_GPIO_BANKA (32*0) | ||
20 | #define S3C2410_GPIO_BANKB (32*1) | ||
21 | #define S3C2410_GPIO_BANKC (32*2) | ||
22 | #define S3C2410_GPIO_BANKD (32*3) | ||
23 | #define S3C2410_GPIO_BANKE (32*4) | ||
24 | #define S3C2410_GPIO_BANKF (32*5) | ||
25 | #define S3C2410_GPIO_BANKG (32*6) | ||
26 | #define S3C2410_GPIO_BANKH (32*7) | ||
27 | 18 | ||
28 | #ifdef CONFIG_CPU_S3C2400 | 19 | #ifdef CONFIG_CPU_S3C2400 |
29 | #define S3C24XX_GPIO_BASE(x) S3C2400_GPIO_BASE(x) | 20 | #define S3C24XX_GPIO_BASE(x) S3C2400_GPIO_BASE(x) |
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 821a1668c3ac..7a7c4da4c256 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -203,7 +203,7 @@ static void __init h1940_map_io(void) | |||
203 | #ifdef CONFIG_PM_H1940 | 203 | #ifdef CONFIG_PM_H1940 |
204 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); | 204 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); |
205 | #endif | 205 | #endif |
206 | s3c2410_pm_init(); | 206 | s3c_pm_init(); |
207 | } | 207 | } |
208 | 208 | ||
209 | static void __init h1940_init_irq(void) | 209 | static void __init h1940_init_irq(void) |
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index 9678a53ceeb1..9f1ba9b63f70 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c | |||
@@ -355,7 +355,7 @@ static void __init qt2410_machine_init(void) | |||
355 | s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); | 355 | s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); |
356 | 356 | ||
357 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); | 357 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); |
358 | s3c2410_pm_init(); | 358 | s3c_pm_init(); |
359 | } | 359 | } |
360 | 360 | ||
361 | MACHINE_START(QT2410, "QT2410") | 361 | MACHINE_START(QT2410, "QT2410") |
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index a6970f613192..87fc481d92d4 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c | |||
@@ -37,21 +37,14 @@ | |||
37 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
38 | #include <plat/pm.h> | 38 | #include <plat/pm.h> |
39 | 39 | ||
40 | #ifdef CONFIG_S3C2410_PM_DEBUG | ||
41 | extern void pm_dbg(const char *fmt, ...); | ||
42 | #define DBG(fmt...) pm_dbg(fmt) | ||
43 | #else | ||
44 | #define DBG(fmt...) printk(KERN_DEBUG fmt) | ||
45 | #endif | ||
46 | |||
47 | static void s3c2410_pm_prepare(void) | 40 | static void s3c2410_pm_prepare(void) |
48 | { | 41 | { |
49 | /* ensure at least GSTATUS3 has the resume address */ | 42 | /* ensure at least GSTATUS3 has the resume address */ |
50 | 43 | ||
51 | __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2410_GSTATUS3); | 44 | __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2410_GSTATUS3); |
52 | 45 | ||
53 | DBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3)); | 46 | S3C_PMDBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3)); |
54 | DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4)); | 47 | S3C_PMDBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4)); |
55 | 48 | ||
56 | if (machine_is_h1940()) { | 49 | if (machine_is_h1940()) { |
57 | void *base = phys_to_virt(H1940_SUSPEND_CHECK); | 50 | void *base = phys_to_virt(H1940_SUSPEND_CHECK); |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index ecddbbb34832..72c266aee141 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
@@ -494,7 +494,7 @@ static int jive_pm_suspend(struct sys_device *sd, pm_message_t state) | |||
494 | * correct address to resume from. */ | 494 | * correct address to resume from. */ |
495 | 495 | ||
496 | __raw_writel(0x2BED, S3C2412_INFORM0); | 496 | __raw_writel(0x2BED, S3C2412_INFORM0); |
497 | __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2412_INFORM1); | 497 | __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1); |
498 | 498 | ||
499 | return 0; | 499 | return 0; |
500 | } | 500 | } |
@@ -630,7 +630,7 @@ static void __init jive_machine_init(void) | |||
630 | 630 | ||
631 | /* initialise the power management now we've setup everything. */ | 631 | /* initialise the power management now we've setup everything. */ |
632 | 632 | ||
633 | s3c2410_pm_init(); | 633 | s3c_pm_init(); |
634 | 634 | ||
635 | s3c_device_nand.dev.platform_data = &jive_nand_info; | 635 | s3c_device_nand.dev.platform_data = &jive_nand_info; |
636 | 636 | ||
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index 217e9e4ed45f..c9cfe40e21f6 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c | |||
@@ -85,7 +85,7 @@ static struct sleep_save s3c2412_sleep[] = { | |||
85 | 85 | ||
86 | static int s3c2412_pm_suspend(struct sys_device *dev, pm_message_t state) | 86 | static int s3c2412_pm_suspend(struct sys_device *dev, pm_message_t state) |
87 | { | 87 | { |
88 | s3c2410_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep)); | 88 | s3c_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep)); |
89 | return 0; | 89 | return 0; |
90 | } | 90 | } |
91 | 91 | ||
@@ -98,7 +98,7 @@ static int s3c2412_pm_resume(struct sys_device *dev) | |||
98 | tmp |= S3C2412_PWRCFG_STANDBYWFI_IDLE; | 98 | tmp |= S3C2412_PWRCFG_STANDBYWFI_IDLE; |
99 | __raw_writel(tmp, S3C2412_PWRCFG); | 99 | __raw_writel(tmp, S3C2412_PWRCFG); |
100 | 100 | ||
101 | s3c2410_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep)); | 101 | s3c_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep)); |
102 | return 0; | 102 | return 0; |
103 | } | 103 | } |
104 | 104 | ||
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 12d378f84ad2..bc8d8d1ebd1a 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -203,7 +203,7 @@ static void __init rx3715_init_machine(void) | |||
203 | #ifdef CONFIG_PM_H1940 | 203 | #ifdef CONFIG_PM_H1940 |
204 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); | 204 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); |
205 | #endif | 205 | #endif |
206 | s3c2410_pm_init(); | 206 | s3c_pm_init(); |
207 | 207 | ||
208 | s3c24xx_fb_set_platdata(&rx3715_fb_info); | 208 | s3c24xx_fb_set_platdata(&rx3715_fb_info); |
209 | platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices)); | 209 | platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices)); |
diff --git a/arch/arm/mach-s3c24a0/include/mach/irqs.h b/arch/arm/mach-s3c24a0/include/mach/irqs.h index ae8c0e359783..83ce2a7a9dae 100644 --- a/arch/arm/mach-s3c24a0/include/mach/irqs.h +++ b/arch/arm/mach-s3c24a0/include/mach/irqs.h | |||
@@ -70,6 +70,8 @@ | |||
70 | #define IRQ_EINT17 S3C2410_IRQ(49) | 70 | #define IRQ_EINT17 S3C2410_IRQ(49) |
71 | #define IRQ_EINT18 S3C2410_IRQ(50) | 71 | #define IRQ_EINT18 S3C2410_IRQ(50) |
72 | 72 | ||
73 | #define IRQ_EINT_BIT(x) ((x) - IRQ_EINT00) | ||
74 | |||
73 | /* SUB IRQS */ | 75 | /* SUB IRQS */ |
74 | #define IRQ_S3CUART_RX0 S3C2410_IRQ(51) /* 67 */ | 76 | #define IRQ_S3CUART_RX0 S3C2410_IRQ(51) /* 67 */ |
75 | #define IRQ_S3CUART_TX0 S3C2410_IRQ(52) | 77 | #define IRQ_S3CUART_TX0 S3C2410_IRQ(52) |
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 39195f972d5e..8d7815d25a51 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile | |||
@@ -18,6 +18,11 @@ obj-y += pwm-clock.o | |||
18 | obj-y += gpio.o | 18 | obj-y += gpio.o |
19 | obj-y += gpio-config.o | 19 | obj-y += gpio-config.o |
20 | 20 | ||
21 | # PM support | ||
22 | |||
23 | obj-$(CONFIG_PM) += pm.o | ||
24 | obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o | ||
25 | |||
21 | # devices | 26 | # devices |
22 | 27 | ||
23 | obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o | 28 | obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o |
diff --git a/arch/arm/plat-s3c/include/plat/pm.h b/arch/arm/plat-s3c/include/plat/pm.h new file mode 100644 index 000000000000..3779775133a9 --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/pm.h | |||
@@ -0,0 +1,174 @@ | |||
1 | /* linux/include/asm-arm/plat-s3c24xx/pm.h | ||
2 | * | ||
3 | * Copyright (c) 2004 Simtec Electronics | ||
4 | * http://armlinux.simtec.co.uk/ | ||
5 | * Written by Ben Dooks, <ben@simtec.co.uk> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | /* s3c_pm_init | ||
13 | * | ||
14 | * called from board at initialisation time to setup the power | ||
15 | * management | ||
16 | */ | ||
17 | |||
18 | #ifdef CONFIG_PM | ||
19 | |||
20 | extern __init int s3c_pm_init(void); | ||
21 | |||
22 | #else | ||
23 | |||
24 | static inline int s3c_pm_init(void) | ||
25 | { | ||
26 | return 0; | ||
27 | } | ||
28 | #endif | ||
29 | |||
30 | /* configuration for the IRQ mask over sleep */ | ||
31 | extern unsigned long s3c_irqwake_intmask; | ||
32 | extern unsigned long s3c_irqwake_eintmask; | ||
33 | |||
34 | /* IRQ masks for IRQs allowed to go to sleep (see irq.c) */ | ||
35 | extern unsigned long s3c_irqwake_intallow; | ||
36 | extern unsigned long s3c_irqwake_eintallow; | ||
37 | |||
38 | /* per-cpu sleep functions */ | ||
39 | |||
40 | extern void (*pm_cpu_prep)(void); | ||
41 | extern void (*pm_cpu_sleep)(void); | ||
42 | |||
43 | /* Flags for PM Control */ | ||
44 | |||
45 | extern unsigned long s3c_pm_flags; | ||
46 | |||
47 | /* from sleep.S */ | ||
48 | |||
49 | extern int s3c_cpu_save(unsigned long *saveblk); | ||
50 | extern void s3c_cpu_resume(void); | ||
51 | |||
52 | extern void s3c2410_cpu_suspend(void); | ||
53 | |||
54 | extern unsigned long s3c_sleep_save_phys; | ||
55 | |||
56 | /* sleep save info */ | ||
57 | |||
58 | /** | ||
59 | * struct sleep_save - save information for shared peripherals. | ||
60 | * @reg: Pointer to the register to save. | ||
61 | * @val: Holder for the value saved from reg. | ||
62 | * | ||
63 | * This describes a list of registers which is used by the pm core and | ||
64 | * other subsystem to save and restore register values over suspend. | ||
65 | */ | ||
66 | struct sleep_save { | ||
67 | void __iomem *reg; | ||
68 | unsigned long val; | ||
69 | }; | ||
70 | |||
71 | #define SAVE_ITEM(x) \ | ||
72 | { .reg = (x) } | ||
73 | |||
74 | /** | ||
75 | * struct pm_uart_save - save block for core UART | ||
76 | * @ulcon: Save value for S3C2410_ULCON | ||
77 | * @ucon: Save value for S3C2410_UCON | ||
78 | * @ufcon: Save value for S3C2410_UFCON | ||
79 | * @umcon: Save value for S3C2410_UMCON | ||
80 | * @ubrdiv: Save value for S3C2410_UBRDIV | ||
81 | * | ||
82 | * Save block for UART registers to be held over sleep and restored if they | ||
83 | * are needed (say by debug). | ||
84 | */ | ||
85 | struct pm_uart_save { | ||
86 | u32 ulcon; | ||
87 | u32 ucon; | ||
88 | u32 ufcon; | ||
89 | u32 umcon; | ||
90 | u32 ubrdiv; | ||
91 | }; | ||
92 | |||
93 | /* helper functions to save/restore lists of registers. */ | ||
94 | |||
95 | extern void s3c_pm_do_save(struct sleep_save *ptr, int count); | ||
96 | extern void s3c_pm_do_restore(struct sleep_save *ptr, int count); | ||
97 | extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count); | ||
98 | |||
99 | #ifdef CONFIG_PM | ||
100 | extern int s3c_irqext_wake(unsigned int irqno, unsigned int state); | ||
101 | extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state); | ||
102 | extern int s3c24xx_irq_resume(struct sys_device *dev); | ||
103 | #else | ||
104 | #define s3c_irqext_wake NULL | ||
105 | #define s3c24xx_irq_suspend NULL | ||
106 | #define s3c24xx_irq_resume NULL | ||
107 | #endif | ||
108 | |||
109 | /* PM debug functions */ | ||
110 | |||
111 | #ifdef CONFIG_S3C2410_PM_DEBUG | ||
112 | /** | ||
113 | * s3c_pm_dbg() - low level debug function for use in suspend/resume. | ||
114 | * @msg: The message to print. | ||
115 | * | ||
116 | * This function is used mainly to debug the resume process before the system | ||
117 | * can rely on printk/console output. It uses the low-level debugging output | ||
118 | * routine printascii() to do its work. | ||
119 | */ | ||
120 | extern void s3c_pm_dbg(const char *msg, ...); | ||
121 | |||
122 | #define S3C_PMDBG(fmt...) s3c_pm_dbg(fmt) | ||
123 | #else | ||
124 | #define S3C_PMDBG(fmt...) printk(KERN_DEBUG fmt) | ||
125 | #endif | ||
126 | |||
127 | /* suspend memory checking */ | ||
128 | |||
129 | #ifdef CONFIG_S3C2410_PM_CHECK | ||
130 | extern void s3c_pm_check_prepare(void); | ||
131 | extern void s3c_pm_check_restore(void); | ||
132 | extern void s3c_pm_check_cleanup(void); | ||
133 | extern void s3c_pm_check_store(void); | ||
134 | #else | ||
135 | #define s3c_pm_check_prepare() do { } while(0) | ||
136 | #define s3c_pm_check_restore() do { } while(0) | ||
137 | #define s3c_pm_check_cleanup() do { } while(0) | ||
138 | #define s3c_pm_check_store() do { } while(0) | ||
139 | #endif | ||
140 | |||
141 | /** | ||
142 | * s3c_pm_configure_extint() - ensure pins are correctly set for IRQ | ||
143 | * | ||
144 | * Setup all the necessary GPIO pins for waking the system on external | ||
145 | * interrupt. | ||
146 | */ | ||
147 | extern void s3c_pm_configure_extint(void); | ||
148 | |||
149 | /** | ||
150 | * s3c_pm_restore_gpios() - restore the state of the gpios after sleep. | ||
151 | * | ||
152 | * Restore the state of the GPIO pins after sleep, which may involve ensuring | ||
153 | * that we do not glitch the state of the pins from that the bootloader's | ||
154 | * resume code has done. | ||
155 | */ | ||
156 | extern void s3c_pm_restore_gpios(void); | ||
157 | |||
158 | /** | ||
159 | * s3c_pm_save_gpios() - save the state of the GPIOs for restoring after sleep. | ||
160 | * | ||
161 | * Save the GPIO states for resotration on resume. See s3c_pm_restore_gpios(). | ||
162 | */ | ||
163 | extern void s3c_pm_save_gpios(void); | ||
164 | |||
165 | /** | ||
166 | * s3c_pm_cb_flushcache - callback for assembly code | ||
167 | * | ||
168 | * Callback to issue flush_cache_all() as this call is | ||
169 | * not a directly callable object. | ||
170 | */ | ||
171 | extern void s3c_pm_cb_flushcache(void); | ||
172 | |||
173 | extern void s3c_pm_save_core(void); | ||
174 | extern void s3c_pm_restore_core(void); | ||
diff --git a/arch/arm/plat-s3c/pm-check.c b/arch/arm/plat-s3c/pm-check.c new file mode 100644 index 000000000000..39f2555564da --- /dev/null +++ b/arch/arm/plat-s3c/pm-check.c | |||
@@ -0,0 +1,242 @@ | |||
1 | /* linux/arch/arm/plat-s3c/pm-check.c | ||
2 | * originally in linux/arch/arm/plat-s3c24xx/pm.c | ||
3 | * | ||
4 | * Copyright (c) 2004,2006,2008 Simtec Electronics | ||
5 | * http://armlinux.simtec.co.uk | ||
6 | * Ben Dooks <ben@simtec.co.uk> | ||
7 | * | ||
8 | * S3C Power Mangament - suspend/resume memory corruptiuon check. | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/suspend.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/crc32.h> | ||
19 | #include <linux/ioport.h> | ||
20 | |||
21 | #include <plat/pm.h> | ||
22 | |||
23 | #if CONFIG_S3C2410_PM_CHECK_CHUNKSIZE < 1 | ||
24 | #error CONFIG_S3C2410_PM_CHECK_CHUNKSIZE must be a positive non-zero value | ||
25 | #endif | ||
26 | |||
27 | /* suspend checking code... | ||
28 | * | ||
29 | * this next area does a set of crc checks over all the installed | ||
30 | * memory, so the system can verify if the resume was ok. | ||
31 | * | ||
32 | * CONFIG_S3C2410_PM_CHECK_CHUNKSIZE defines the block-size for the CRC, | ||
33 | * increasing it will mean that the area corrupted will be less easy to spot, | ||
34 | * and reducing the size will cause the CRC save area to grow | ||
35 | */ | ||
36 | |||
37 | #define CHECK_CHUNKSIZE (CONFIG_S3C2410_PM_CHECK_CHUNKSIZE * 1024) | ||
38 | |||
39 | static u32 crc_size; /* size needed for the crc block */ | ||
40 | static u32 *crcs; /* allocated over suspend/resume */ | ||
41 | |||
42 | typedef u32 *(run_fn_t)(struct resource *ptr, u32 *arg); | ||
43 | |||
44 | /* s3c_pm_run_res | ||
45 | * | ||
46 | * go through the given resource list, and look for system ram | ||
47 | */ | ||
48 | |||
49 | static void s3c_pm_run_res(struct resource *ptr, run_fn_t fn, u32 *arg) | ||
50 | { | ||
51 | while (ptr != NULL) { | ||
52 | if (ptr->child != NULL) | ||
53 | s3c_pm_run_res(ptr->child, fn, arg); | ||
54 | |||
55 | if ((ptr->flags & IORESOURCE_MEM) && | ||
56 | strcmp(ptr->name, "System RAM") == 0) { | ||
57 | S3C_PMDBG("Found system RAM at %08lx..%08lx\n", | ||
58 | (unsigned long)ptr->start, | ||
59 | (unsigned long)ptr->end); | ||
60 | arg = (fn)(ptr, arg); | ||
61 | } | ||
62 | |||
63 | ptr = ptr->sibling; | ||
64 | } | ||
65 | } | ||
66 | |||
67 | static void s3c_pm_run_sysram(run_fn_t fn, u32 *arg) | ||
68 | { | ||
69 | s3c_pm_run_res(&iomem_resource, fn, arg); | ||
70 | } | ||
71 | |||
72 | static u32 *s3c_pm_countram(struct resource *res, u32 *val) | ||
73 | { | ||
74 | u32 size = (u32)(res->end - res->start)+1; | ||
75 | |||
76 | size += CHECK_CHUNKSIZE-1; | ||
77 | size /= CHECK_CHUNKSIZE; | ||
78 | |||
79 | S3C_PMDBG("Area %08lx..%08lx, %d blocks\n", | ||
80 | (unsigned long)res->start, (unsigned long)res->end, size); | ||
81 | |||
82 | *val += size * sizeof(u32); | ||
83 | return val; | ||
84 | } | ||
85 | |||
86 | /* s3c_pm_prepare_check | ||
87 | * | ||
88 | * prepare the necessary information for creating the CRCs. This | ||
89 | * must be done before the final save, as it will require memory | ||
90 | * allocating, and thus touching bits of the kernel we do not | ||
91 | * know about. | ||
92 | */ | ||
93 | |||
94 | void s3c_pm_check_prepare(void) | ||
95 | { | ||
96 | crc_size = 0; | ||
97 | |||
98 | s3c_pm_run_sysram(s3c_pm_countram, &crc_size); | ||
99 | |||
100 | S3C_PMDBG("s3c_pm_prepare_check: %u checks needed\n", crc_size); | ||
101 | |||
102 | crcs = kmalloc(crc_size+4, GFP_KERNEL); | ||
103 | if (crcs == NULL) | ||
104 | printk(KERN_ERR "Cannot allocated CRC save area\n"); | ||
105 | } | ||
106 | |||
107 | static u32 *s3c_pm_makecheck(struct resource *res, u32 *val) | ||
108 | { | ||
109 | unsigned long addr, left; | ||
110 | |||
111 | for (addr = res->start; addr < res->end; | ||
112 | addr += CHECK_CHUNKSIZE) { | ||
113 | left = res->end - addr; | ||
114 | |||
115 | if (left > CHECK_CHUNKSIZE) | ||
116 | left = CHECK_CHUNKSIZE; | ||
117 | |||
118 | *val = crc32_le(~0, phys_to_virt(addr), left); | ||
119 | val++; | ||
120 | } | ||
121 | |||
122 | return val; | ||
123 | } | ||
124 | |||
125 | /* s3c_pm_check_store | ||
126 | * | ||
127 | * compute the CRC values for the memory blocks before the final | ||
128 | * sleep. | ||
129 | */ | ||
130 | |||
131 | void s3c_pm_check_store(void) | ||
132 | { | ||
133 | if (crcs != NULL) | ||
134 | s3c_pm_run_sysram(s3c_pm_makecheck, crcs); | ||
135 | } | ||
136 | |||
137 | /* in_region | ||
138 | * | ||
139 | * return TRUE if the area defined by ptr..ptr+size contains the | ||
140 | * what..what+whatsz | ||
141 | */ | ||
142 | |||
143 | static inline int in_region(void *ptr, int size, void *what, size_t whatsz) | ||
144 | { | ||
145 | if ((what+whatsz) < ptr) | ||
146 | return 0; | ||
147 | |||
148 | if (what > (ptr+size)) | ||
149 | return 0; | ||
150 | |||
151 | return 1; | ||
152 | } | ||
153 | |||
154 | /** | ||
155 | * s3c_pm_runcheck() - helper to check a resource on restore. | ||
156 | * @res: The resource to check | ||
157 | * @vak: Pointer to list of CRC32 values to check. | ||
158 | * | ||
159 | * Called from the s3c_pm_check_restore() via s3c_pm_run_sysram(), this | ||
160 | * function runs the given memory resource checking it against the stored | ||
161 | * CRC to ensure that memory is restored. The function tries to skip as | ||
162 | * many of the areas used during the suspend process. | ||
163 | */ | ||
164 | static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) | ||
165 | { | ||
166 | void *save_at = phys_to_virt(s3c_sleep_save_phys); | ||
167 | unsigned long addr; | ||
168 | unsigned long left; | ||
169 | void *stkpage; | ||
170 | void *ptr; | ||
171 | u32 calc; | ||
172 | |||
173 | stkpage = (void *)((u32)&calc & ~PAGE_MASK); | ||
174 | |||
175 | for (addr = res->start; addr < res->end; | ||
176 | addr += CHECK_CHUNKSIZE) { | ||
177 | left = res->end - addr; | ||
178 | |||
179 | if (left > CHECK_CHUNKSIZE) | ||
180 | left = CHECK_CHUNKSIZE; | ||
181 | |||
182 | ptr = phys_to_virt(addr); | ||
183 | |||
184 | if (in_region(ptr, left, stkpage, 4096)) { | ||
185 | S3C_PMDBG("skipping %08lx, has stack in\n", addr); | ||
186 | goto skip_check; | ||
187 | } | ||
188 | |||
189 | if (in_region(ptr, left, crcs, crc_size)) { | ||
190 | S3C_PMDBG("skipping %08lx, has crc block in\n", addr); | ||
191 | goto skip_check; | ||
192 | } | ||
193 | |||
194 | if (in_region(ptr, left, save_at, 32*4 )) { | ||
195 | S3C_PMDBG("skipping %08lx, has save block in\n", addr); | ||
196 | goto skip_check; | ||
197 | } | ||
198 | |||
199 | /* calculate and check the checksum */ | ||
200 | |||
201 | calc = crc32_le(~0, ptr, left); | ||
202 | if (calc != *val) { | ||
203 | printk(KERN_ERR "Restore CRC error at " | ||
204 | "%08lx (%08x vs %08x)\n", addr, calc, *val); | ||
205 | |||
206 | S3C_PMDBG("Restore CRC error at %08lx (%08x vs %08x)\n", | ||
207 | addr, calc, *val); | ||
208 | } | ||
209 | |||
210 | skip_check: | ||
211 | val++; | ||
212 | } | ||
213 | |||
214 | return val; | ||
215 | } | ||
216 | |||
217 | /** | ||
218 | * s3c_pm_check_restore() - memory check called on resume | ||
219 | * | ||
220 | * check the CRCs after the restore event and free the memory used | ||
221 | * to hold them | ||
222 | */ | ||
223 | void s3c_pm_check_restore(void) | ||
224 | { | ||
225 | if (crcs != NULL) | ||
226 | s3c_pm_run_sysram(s3c_pm_runcheck, crcs); | ||
227 | } | ||
228 | |||
229 | /** | ||
230 | * s3c_pm_check_cleanup() - free memory resources | ||
231 | * | ||
232 | * Free the resources that where allocated by the suspend | ||
233 | * memory check code. We do this separately from the | ||
234 | * s3c_pm_check_restore() function as we cannot call any | ||
235 | * functions that might sleep during that resume. | ||
236 | */ | ||
237 | void s3c_pm_check_cleanup(void) | ||
238 | { | ||
239 | kfree(crcs); | ||
240 | crcs = NULL; | ||
241 | } | ||
242 | |||
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c new file mode 100644 index 000000000000..061182ca66e3 --- /dev/null +++ b/arch/arm/plat-s3c/pm.c | |||
@@ -0,0 +1,363 @@ | |||
1 | /* linux/arch/arm/plat-s3c/pm.c | ||
2 | * | ||
3 | * Copyright 2008 Openmoko, Inc. | ||
4 | * Copyright 2004,2006,2008 Simtec Electronics | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * http://armlinux.simtec.co.uk/ | ||
7 | * | ||
8 | * S3C common power management (suspend to ram) support. | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #include <linux/init.h> | ||
16 | #include <linux/suspend.h> | ||
17 | #include <linux/errno.h> | ||
18 | #include <linux/delay.h> | ||
19 | #include <linux/serial_core.h> | ||
20 | #include <linux/io.h> | ||
21 | |||
22 | #include <asm/cacheflush.h> | ||
23 | #include <mach/hardware.h> | ||
24 | |||
25 | #include <plat/regs-serial.h> | ||
26 | #include <mach/regs-clock.h> | ||
27 | #include <mach/regs-gpio.h> | ||
28 | #include <mach/regs-mem.h> | ||
29 | #include <mach/regs-irq.h> | ||
30 | #include <asm/irq.h> | ||
31 | |||
32 | #include <plat/pm.h> | ||
33 | #include <plat/pm-core.h> | ||
34 | |||
35 | /* for external use */ | ||
36 | |||
37 | unsigned long s3c_pm_flags; | ||
38 | |||
39 | /* Debug code: | ||
40 | * | ||
41 | * This code supports debug output to the low level UARTs for use on | ||
42 | * resume before the console layer is available. | ||
43 | */ | ||
44 | |||
45 | #ifdef CONFIG_S3C2410_PM_DEBUG | ||
46 | extern void printascii(const char *); | ||
47 | |||
48 | void s3c_pm_dbg(const char *fmt, ...) | ||
49 | { | ||
50 | va_list va; | ||
51 | char buff[256]; | ||
52 | |||
53 | va_start(va, fmt); | ||
54 | vsprintf(buff, fmt, va); | ||
55 | va_end(va); | ||
56 | |||
57 | printascii(buff); | ||
58 | } | ||
59 | |||
60 | static inline void s3c_pm_debug_init(void) | ||
61 | { | ||
62 | /* restart uart clocks so we can use them to output */ | ||
63 | s3c_pm_debug_init_uart(); | ||
64 | } | ||
65 | |||
66 | #else | ||
67 | #define s3c_pm_debug_init() do { } while(0) | ||
68 | |||
69 | #endif /* CONFIG_S3C2410_PM_DEBUG */ | ||
70 | |||
71 | /* Save the UART configurations if we are configured for debug. */ | ||
72 | |||
73 | #ifdef CONFIG_S3C2410_PM_DEBUG | ||
74 | |||
75 | struct pm_uart_save uart_save[CONFIG_SERIAL_SAMSUNG_UARTS]; | ||
76 | |||
77 | static void s3c_pm_save_uart(unsigned int uart, struct pm_uart_save *save) | ||
78 | { | ||
79 | void __iomem *regs = S3C_VA_UARTx(uart); | ||
80 | |||
81 | save->ulcon = __raw_readl(regs + S3C2410_ULCON); | ||
82 | save->ucon = __raw_readl(regs + S3C2410_UCON); | ||
83 | save->ufcon = __raw_readl(regs + S3C2410_UFCON); | ||
84 | save->umcon = __raw_readl(regs + S3C2410_UMCON); | ||
85 | save->ubrdiv = __raw_readl(regs + S3C2410_UBRDIV); | ||
86 | } | ||
87 | |||
88 | static void s3c_pm_save_uarts(void) | ||
89 | { | ||
90 | struct pm_uart_save *save = uart_save; | ||
91 | unsigned int uart; | ||
92 | |||
93 | for (uart = 0; uart < CONFIG_SERIAL_SAMSUNG_UARTS; uart++, save++) | ||
94 | s3c_pm_save_uart(uart, save); | ||
95 | } | ||
96 | |||
97 | static void s3c_pm_restore_uart(unsigned int uart, struct pm_uart_save *save) | ||
98 | { | ||
99 | void __iomem *regs = S3C_VA_UARTx(uart); | ||
100 | |||
101 | __raw_writel(save->ulcon, regs + S3C2410_ULCON); | ||
102 | __raw_writel(save->ucon, regs + S3C2410_UCON); | ||
103 | __raw_writel(save->ufcon, regs + S3C2410_UFCON); | ||
104 | __raw_writel(save->umcon, regs + S3C2410_UMCON); | ||
105 | __raw_writel(save->ubrdiv, regs + S3C2410_UBRDIV); | ||
106 | } | ||
107 | |||
108 | static void s3c_pm_restore_uarts(void) | ||
109 | { | ||
110 | struct pm_uart_save *save = uart_save; | ||
111 | unsigned int uart; | ||
112 | |||
113 | for (uart = 0; uart < CONFIG_SERIAL_SAMSUNG_UARTS; uart++, save++) | ||
114 | s3c_pm_restore_uart(uart, save); | ||
115 | } | ||
116 | #else | ||
117 | static void s3c_pm_save_uarts(void) { } | ||
118 | static void s3c_pm_restore_uarts(void) { } | ||
119 | #endif | ||
120 | |||
121 | /* The IRQ ext-int code goes here, it is too small to currently bother | ||
122 | * with its own file. */ | ||
123 | |||
124 | unsigned long s3c_irqwake_intmask = 0xffffffffL; | ||
125 | unsigned long s3c_irqwake_eintmask = 0xffffffffL; | ||
126 | |||
127 | int s3c_irqext_wake(unsigned int irqno, unsigned int state) | ||
128 | { | ||
129 | unsigned long bit = 1L << IRQ_EINT_BIT(irqno); | ||
130 | |||
131 | if (!(s3c_irqwake_eintallow & bit)) | ||
132 | return -ENOENT; | ||
133 | |||
134 | printk(KERN_INFO "wake %s for irq %d\n", | ||
135 | state ? "enabled" : "disabled", irqno); | ||
136 | |||
137 | if (!state) | ||
138 | s3c_irqwake_eintmask |= bit; | ||
139 | else | ||
140 | s3c_irqwake_eintmask &= ~bit; | ||
141 | |||
142 | return 0; | ||
143 | } | ||
144 | |||
145 | /* helper functions to save and restore register state */ | ||
146 | |||
147 | /** | ||
148 | * s3c_pm_do_save() - save a set of registers for restoration on resume. | ||
149 | * @ptr: Pointer to an array of registers. | ||
150 | * @count: Size of the ptr array. | ||
151 | * | ||
152 | * Run through the list of registers given, saving their contents in the | ||
153 | * array for later restoration when we wakeup. | ||
154 | */ | ||
155 | void s3c_pm_do_save(struct sleep_save *ptr, int count) | ||
156 | { | ||
157 | for (; count > 0; count--, ptr++) { | ||
158 | ptr->val = __raw_readl(ptr->reg); | ||
159 | S3C_PMDBG("saved %p value %08lx\n", ptr->reg, ptr->val); | ||
160 | } | ||
161 | } | ||
162 | |||
163 | /** | ||
164 | * s3c_pm_do_restore() - restore register values from the save list. | ||
165 | * @ptr: Pointer to an array of registers. | ||
166 | * @count: Size of the ptr array. | ||
167 | * | ||
168 | * Restore the register values saved from s3c_pm_do_save(). | ||
169 | * | ||
170 | * Note, we do not use S3C_PMDBG() in here, as the system may not have | ||
171 | * restore the UARTs state yet | ||
172 | */ | ||
173 | |||
174 | void s3c_pm_do_restore(struct sleep_save *ptr, int count) | ||
175 | { | ||
176 | for (; count > 0; count--, ptr++) { | ||
177 | printk(KERN_DEBUG "restore %p (restore %08lx, was %08x)\n", | ||
178 | ptr->reg, ptr->val, __raw_readl(ptr->reg)); | ||
179 | |||
180 | __raw_writel(ptr->val, ptr->reg); | ||
181 | } | ||
182 | } | ||
183 | |||
184 | /** | ||
185 | * s3c_pm_do_restore_core() - early restore register values from save list. | ||
186 | * | ||
187 | * This is similar to s3c_pm_do_restore() except we try and minimise the | ||
188 | * side effects of the function in case registers that hardware might need | ||
189 | * to work has been restored. | ||
190 | * | ||
191 | * WARNING: Do not put any debug in here that may effect memory or use | ||
192 | * peripherals, as things may be changing! | ||
193 | */ | ||
194 | |||
195 | void s3c_pm_do_restore_core(struct sleep_save *ptr, int count) | ||
196 | { | ||
197 | for (; count > 0; count--, ptr++) | ||
198 | __raw_writel(ptr->val, ptr->reg); | ||
199 | } | ||
200 | |||
201 | /* s3c2410_pm_show_resume_irqs | ||
202 | * | ||
203 | * print any IRQs asserted at resume time (ie, we woke from) | ||
204 | */ | ||
205 | static void s3c_pm_show_resume_irqs(int start, unsigned long which, | ||
206 | unsigned long mask) | ||
207 | { | ||
208 | int i; | ||
209 | |||
210 | which &= ~mask; | ||
211 | |||
212 | for (i = 0; i <= 31; i++) { | ||
213 | if (which & (1L<<i)) { | ||
214 | S3C_PMDBG("IRQ %d asserted at resume\n", start+i); | ||
215 | } | ||
216 | } | ||
217 | } | ||
218 | |||
219 | |||
220 | void (*pm_cpu_prep)(void); | ||
221 | void (*pm_cpu_sleep)(void); | ||
222 | |||
223 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) | ||
224 | |||
225 | /* s3c_pm_enter | ||
226 | * | ||
227 | * central control for sleep/resume process | ||
228 | */ | ||
229 | |||
230 | static int s3c_pm_enter(suspend_state_t state) | ||
231 | { | ||
232 | static unsigned long regs_save[16]; | ||
233 | |||
234 | /* ensure the debug is initialised (if enabled) */ | ||
235 | |||
236 | s3c_pm_debug_init(); | ||
237 | |||
238 | S3C_PMDBG("%s(%d)\n", __func__, state); | ||
239 | |||
240 | if (pm_cpu_prep == NULL || pm_cpu_sleep == NULL) { | ||
241 | printk(KERN_ERR "%s: error: no cpu sleep function\n", __func__); | ||
242 | return -EINVAL; | ||
243 | } | ||
244 | |||
245 | /* check if we have anything to wake-up with... bad things seem | ||
246 | * to happen if you suspend with no wakeup (system will often | ||
247 | * require a full power-cycle) | ||
248 | */ | ||
249 | |||
250 | if (!any_allowed(s3c_irqwake_intmask, s3c_irqwake_intallow) && | ||
251 | !any_allowed(s3c_irqwake_eintmask, s3c_irqwake_eintallow)) { | ||
252 | printk(KERN_ERR "%s: No wake-up sources!\n", __func__); | ||
253 | printk(KERN_ERR "%s: Aborting sleep\n", __func__); | ||
254 | return -EINVAL; | ||
255 | } | ||
256 | |||
257 | /* store the physical address of the register recovery block */ | ||
258 | |||
259 | s3c_sleep_save_phys = virt_to_phys(regs_save); | ||
260 | |||
261 | S3C_PMDBG("s3c_sleep_save_phys=0x%08lx\n", s3c_sleep_save_phys); | ||
262 | |||
263 | /* save all necessary core registers not covered by the drivers */ | ||
264 | |||
265 | s3c_pm_save_gpios(); | ||
266 | s3c_pm_save_uarts(); | ||
267 | s3c_pm_save_core(); | ||
268 | |||
269 | /* set the irq configuration for wake */ | ||
270 | |||
271 | s3c_pm_configure_extint(); | ||
272 | |||
273 | S3C_PMDBG("sleep: irq wakeup masks: %08lx,%08lx\n", | ||
274 | s3c_irqwake_intmask, s3c_irqwake_eintmask); | ||
275 | |||
276 | s3c_pm_arch_prepare_irqs(); | ||
277 | |||
278 | /* call cpu specific preparation */ | ||
279 | |||
280 | pm_cpu_prep(); | ||
281 | |||
282 | /* flush cache back to ram */ | ||
283 | |||
284 | flush_cache_all(); | ||
285 | |||
286 | s3c_pm_check_store(); | ||
287 | |||
288 | /* send the cpu to sleep... */ | ||
289 | |||
290 | s3c_pm_arch_stop_clocks(); | ||
291 | |||
292 | /* s3c_cpu_save will also act as our return point from when | ||
293 | * we resume as it saves its own register state and restores it | ||
294 | * during the resume. */ | ||
295 | |||
296 | s3c_cpu_save(regs_save); | ||
297 | |||
298 | /* restore the cpu state using the kernel's cpu init code. */ | ||
299 | |||
300 | cpu_init(); | ||
301 | |||
302 | /* restore the system state */ | ||
303 | |||
304 | s3c_pm_restore_core(); | ||
305 | s3c_pm_restore_uarts(); | ||
306 | s3c_pm_restore_gpios(); | ||
307 | |||
308 | s3c_pm_debug_init(); | ||
309 | |||
310 | /* check what irq (if any) restored the system */ | ||
311 | |||
312 | s3c_pm_arch_show_resume_irqs(); | ||
313 | |||
314 | S3C_PMDBG("%s: post sleep, preparing to return\n", __func__); | ||
315 | |||
316 | s3c_pm_check_restore(); | ||
317 | |||
318 | /* ok, let's return from sleep */ | ||
319 | |||
320 | S3C_PMDBG("S3C PM Resume (post-restore)\n"); | ||
321 | return 0; | ||
322 | } | ||
323 | |||
324 | /* callback from assembly code */ | ||
325 | void s3c_pm_cb_flushcache(void) | ||
326 | { | ||
327 | flush_cache_all(); | ||
328 | } | ||
329 | |||
330 | static int s3c_pm_prepare(void) | ||
331 | { | ||
332 | /* prepare check area if configured */ | ||
333 | |||
334 | s3c_pm_check_prepare(); | ||
335 | return 0; | ||
336 | } | ||
337 | |||
338 | static void s3c_pm_finish(void) | ||
339 | { | ||
340 | s3c_pm_check_cleanup(); | ||
341 | } | ||
342 | |||
343 | static struct platform_suspend_ops s3c_pm_ops = { | ||
344 | .enter = s3c_pm_enter, | ||
345 | .prepare = s3c_pm_prepare, | ||
346 | .finish = s3c_pm_finish, | ||
347 | .valid = suspend_valid_only_mem, | ||
348 | }; | ||
349 | |||
350 | /* s3c_pm_init | ||
351 | * | ||
352 | * Attach the power management functions. This should be called | ||
353 | * from the board specific initialisation if the board supports | ||
354 | * it. | ||
355 | */ | ||
356 | |||
357 | int __init s3c_pm_init(void) | ||
358 | { | ||
359 | printk("S3C Power Management, Copyright 2004 Simtec Electronics\n"); | ||
360 | |||
361 | suspend_set_ops(&s3c_pm_ops); | ||
362 | return 0; | ||
363 | } | ||
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index 1e0767b266b8..636cb12711df 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile | |||
@@ -27,6 +27,7 @@ obj-$(CONFIG_CPU_S3C244X) += s3c244x-irq.o | |||
27 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o | 27 | obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o |
28 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o | 28 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o |
29 | obj-$(CONFIG_PM) += pm.o | 29 | obj-$(CONFIG_PM) += pm.o |
30 | obj-$(CONFIG_PM) += irq-pm.o | ||
30 | obj-$(CONFIG_PM) += sleep.o | 31 | obj-$(CONFIG_PM) += sleep.o |
31 | obj-$(CONFIG_HAVE_PWM) += pwm.o | 32 | obj-$(CONFIG_HAVE_PWM) += pwm.o |
32 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o | 33 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o |
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 3d4837021ac7..1a8347cec20a 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
@@ -201,5 +201,5 @@ void __init smdk_machine_init(void) | |||
201 | 201 | ||
202 | platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs)); | 202 | platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs)); |
203 | 203 | ||
204 | s3c2410_pm_init(); | 204 | s3c_pm_init(); |
205 | } | 205 | } |
diff --git a/arch/arm/plat-s3c24xx/include/plat/irq.h b/arch/arm/plat-s3c24xx/include/plat/irq.h index 45746a995343..69e1be8bec35 100644 --- a/arch/arm/plat-s3c24xx/include/plat/irq.h +++ b/arch/arm/plat-s3c24xx/include/plat/irq.h | |||
@@ -10,6 +10,12 @@ | |||
10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/io.h> | ||
14 | |||
15 | #include <mach/hardware.h> | ||
16 | #include <mach/regs-irq.h> | ||
17 | #include <mach/regs-gpio.h> | ||
18 | |||
13 | #define irqdbf(x...) | 19 | #define irqdbf(x...) |
14 | #define irqdbf2(x...) | 20 | #define irqdbf2(x...) |
15 | 21 | ||
diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h index fef8ea8b8e1e..eed8f78e7593 100644 --- a/arch/arm/plat-s3c24xx/include/plat/map.h +++ b/arch/arm/plat-s3c24xx/include/plat/map.h | |||
@@ -31,6 +31,8 @@ | |||
31 | #define S3C24XX_SZ_UART SZ_1M | 31 | #define S3C24XX_SZ_UART SZ_1M |
32 | #define S3C_UART_OFFSET (0x4000) | 32 | #define S3C_UART_OFFSET (0x4000) |
33 | 33 | ||
34 | #define S3C_VA_UARTx(uart) (S3C_VA_UART + ((uart * S3C_UART_OFFSET))) | ||
35 | |||
34 | /* Timers */ | 36 | /* Timers */ |
35 | #define S3C24XX_VA_TIMER S3C_VA_TIMER | 37 | #define S3C24XX_VA_TIMER S3C_VA_TIMER |
36 | #define S3C2410_PA_TIMER (0x51000000) | 38 | #define S3C2410_PA_TIMER (0x51000000) |
diff --git a/arch/arm/plat-s3c24xx/include/plat/pm-core.h b/arch/arm/plat-s3c24xx/include/plat/pm-core.h new file mode 100644 index 000000000000..c75882113e04 --- /dev/null +++ b/arch/arm/plat-s3c24xx/include/plat/pm-core.h | |||
@@ -0,0 +1,59 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/include/plat/pll.h | ||
2 | * | ||
3 | * Copyright 2008 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * http://armlinux.simtec.co.uk/ | ||
6 | * | ||
7 | * S3C24xx - PM core support for arch/arm/plat-s3c/pm.c | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | static inline void s3c_pm_debug_init_uart(void) | ||
15 | { | ||
16 | unsigned long tmp = __raw_readl(S3C2410_CLKCON); | ||
17 | |||
18 | /* re-start uart clocks */ | ||
19 | tmp |= S3C2410_CLKCON_UART0; | ||
20 | tmp |= S3C2410_CLKCON_UART1; | ||
21 | tmp |= S3C2410_CLKCON_UART2; | ||
22 | |||
23 | __raw_writel(tmp, S3C2410_CLKCON); | ||
24 | udelay(10); | ||
25 | } | ||
26 | |||
27 | static inline void s3c_pm_arch_prepare_irqs(void) | ||
28 | { | ||
29 | __raw_writel(s3c_irqwake_intmask, S3C2410_INTMSK); | ||
30 | __raw_writel(s3c_irqwake_eintmask, S3C2410_EINTMASK); | ||
31 | |||
32 | /* ack any outstanding external interrupts before we go to sleep */ | ||
33 | |||
34 | __raw_writel(__raw_readl(S3C2410_EINTPEND), S3C2410_EINTPEND); | ||
35 | __raw_writel(__raw_readl(S3C2410_INTPND), S3C2410_INTPND); | ||
36 | __raw_writel(__raw_readl(S3C2410_SRCPND), S3C2410_SRCPND); | ||
37 | |||
38 | } | ||
39 | |||
40 | static inline void s3c_pm_arch_stop_clocks(void) | ||
41 | { | ||
42 | __raw_writel(0x00, S3C2410_CLKCON); /* turn off clocks over sleep */ | ||
43 | } | ||
44 | |||
45 | static void s3c_pm_show_resume_irqs(int start, unsigned long which, | ||
46 | unsigned long mask); | ||
47 | |||
48 | static inline void s3c_pm_arch_show_resume_irqs(void) | ||
49 | { | ||
50 | S3C_PMDBG("post sleep: IRQs 0x%08x, 0x%08x\n", | ||
51 | __raw_readl(S3C2410_SRCPND), | ||
52 | __raw_readl(S3C2410_EINTPEND)); | ||
53 | |||
54 | s3c_pm_show_resume_irqs(IRQ_EINT0, __raw_readl(S3C2410_SRCPND), | ||
55 | s3c_irqwake_intmask); | ||
56 | |||
57 | s3c_pm_show_resume_irqs(IRQ_EINT4-4, __raw_readl(S3C2410_EINTPEND), | ||
58 | s3c_irqwake_eintmask); | ||
59 | } | ||
diff --git a/arch/arm/plat-s3c24xx/include/plat/pm.h b/arch/arm/plat-s3c24xx/include/plat/pm.h deleted file mode 100644 index cc623667e48a..000000000000 --- a/arch/arm/plat-s3c24xx/include/plat/pm.h +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | /* linux/include/asm-arm/plat-s3c24xx/pm.h | ||
2 | * | ||
3 | * Copyright (c) 2004 Simtec Electronics | ||
4 | * Written by Ben Dooks, <ben@simtec.co.uk> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | /* s3c2410_pm_init | ||
12 | * | ||
13 | * called from board at initialisation time to setup the power | ||
14 | * management | ||
15 | */ | ||
16 | |||
17 | #ifdef CONFIG_PM | ||
18 | |||
19 | extern __init int s3c2410_pm_init(void); | ||
20 | |||
21 | #else | ||
22 | |||
23 | static inline int s3c2410_pm_init(void) | ||
24 | { | ||
25 | return 0; | ||
26 | } | ||
27 | #endif | ||
28 | |||
29 | /* configuration for the IRQ mask over sleep */ | ||
30 | extern unsigned long s3c_irqwake_intmask; | ||
31 | extern unsigned long s3c_irqwake_eintmask; | ||
32 | |||
33 | /* IRQ masks for IRQs allowed to go to sleep (see irq.c) */ | ||
34 | extern unsigned long s3c_irqwake_intallow; | ||
35 | extern unsigned long s3c_irqwake_eintallow; | ||
36 | |||
37 | /* per-cpu sleep functions */ | ||
38 | |||
39 | extern void (*pm_cpu_prep)(void); | ||
40 | extern void (*pm_cpu_sleep)(void); | ||
41 | |||
42 | /* Flags for PM Control */ | ||
43 | |||
44 | extern unsigned long s3c_pm_flags; | ||
45 | |||
46 | /* from sleep.S */ | ||
47 | |||
48 | extern int s3c2410_cpu_save(unsigned long *saveblk); | ||
49 | extern void s3c2410_cpu_suspend(void); | ||
50 | extern void s3c2410_cpu_resume(void); | ||
51 | |||
52 | extern unsigned long s3c2410_sleep_save_phys; | ||
53 | |||
54 | /* sleep save info */ | ||
55 | |||
56 | struct sleep_save { | ||
57 | void __iomem *reg; | ||
58 | unsigned long val; | ||
59 | }; | ||
60 | |||
61 | #define SAVE_ITEM(x) \ | ||
62 | { .reg = (x) } | ||
63 | |||
64 | extern void s3c2410_pm_do_save(struct sleep_save *ptr, int count); | ||
65 | extern void s3c2410_pm_do_restore(struct sleep_save *ptr, int count); | ||
66 | |||
67 | #ifdef CONFIG_PM | ||
68 | extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state); | ||
69 | extern int s3c24xx_irq_resume(struct sys_device *dev); | ||
70 | #else | ||
71 | #define s3c24xx_irq_suspend NULL | ||
72 | #define s3c24xx_irq_resume NULL | ||
73 | #endif | ||
diff --git a/arch/arm/plat-s3c24xx/irq-pm.c b/arch/arm/plat-s3c24xx/irq-pm.c new file mode 100644 index 000000000000..b7acf1a8ecd2 --- /dev/null +++ b/arch/arm/plat-s3c24xx/irq-pm.c | |||
@@ -0,0 +1,95 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/irq-om.c | ||
2 | * | ||
3 | * Copyright (c) 2003,2004 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * http://armlinux.simtec.co.uk/ | ||
6 | * | ||
7 | * S3C24XX - IRQ PM code | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/init.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/interrupt.h> | ||
17 | #include <linux/sysdev.h> | ||
18 | |||
19 | #include <plat/cpu.h> | ||
20 | #include <plat/pm.h> | ||
21 | #include <plat/irq.h> | ||
22 | |||
23 | /* state for IRQs over sleep */ | ||
24 | |||
25 | /* default is to allow for EINT0..EINT15, and IRQ_RTC as wakeup sources | ||
26 | * | ||
27 | * set bit to 1 in allow bitfield to enable the wakeup settings on it | ||
28 | */ | ||
29 | |||
30 | unsigned long s3c_irqwake_intallow = 1L << (IRQ_RTC - IRQ_EINT0) | 0xfL; | ||
31 | unsigned long s3c_irqwake_eintallow = 0x0000fff0L; | ||
32 | |||
33 | int s3c_irq_wake(unsigned int irqno, unsigned int state) | ||
34 | { | ||
35 | unsigned long irqbit = 1 << (irqno - IRQ_EINT0); | ||
36 | |||
37 | if (!(s3c_irqwake_intallow & irqbit)) | ||
38 | return -ENOENT; | ||
39 | |||
40 | printk(KERN_INFO "wake %s for irq %d\n", | ||
41 | state ? "enabled" : "disabled", irqno); | ||
42 | |||
43 | if (!state) | ||
44 | s3c_irqwake_intmask |= irqbit; | ||
45 | else | ||
46 | s3c_irqwake_intmask &= ~irqbit; | ||
47 | |||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | static struct sleep_save irq_save[] = { | ||
52 | SAVE_ITEM(S3C2410_INTMSK), | ||
53 | SAVE_ITEM(S3C2410_INTSUBMSK), | ||
54 | }; | ||
55 | |||
56 | /* the extint values move between the s3c2410/s3c2440 and the s3c2412 | ||
57 | * so we use an array to hold them, and to calculate the address of | ||
58 | * the register at run-time | ||
59 | */ | ||
60 | |||
61 | static unsigned long save_extint[3]; | ||
62 | static unsigned long save_eintflt[4]; | ||
63 | static unsigned long save_eintmask; | ||
64 | |||
65 | int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state) | ||
66 | { | ||
67 | unsigned int i; | ||
68 | |||
69 | for (i = 0; i < ARRAY_SIZE(save_extint); i++) | ||
70 | save_extint[i] = __raw_readl(S3C24XX_EXTINT0 + (i*4)); | ||
71 | |||
72 | for (i = 0; i < ARRAY_SIZE(save_eintflt); i++) | ||
73 | save_eintflt[i] = __raw_readl(S3C24XX_EINFLT0 + (i*4)); | ||
74 | |||
75 | s3c_pm_do_save(irq_save, ARRAY_SIZE(irq_save)); | ||
76 | save_eintmask = __raw_readl(S3C24XX_EINTMASK); | ||
77 | |||
78 | return 0; | ||
79 | } | ||
80 | |||
81 | int s3c24xx_irq_resume(struct sys_device *dev) | ||
82 | { | ||
83 | unsigned int i; | ||
84 | |||
85 | for (i = 0; i < ARRAY_SIZE(save_extint); i++) | ||
86 | __raw_writel(save_extint[i], S3C24XX_EXTINT0 + (i*4)); | ||
87 | |||
88 | for (i = 0; i < ARRAY_SIZE(save_eintflt); i++) | ||
89 | __raw_writel(save_eintflt[i], S3C24XX_EINFLT0 + (i*4)); | ||
90 | |||
91 | s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save)); | ||
92 | __raw_writel(save_eintmask, S3C24XX_EINTMASK); | ||
93 | |||
94 | return 0; | ||
95 | } | ||
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index 0192ecdc1442..958737775ad2 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/irq.c | 1 | /* linux/arch/arm/plat-s3c24xx/irq.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003,2004 Simtec Electronics | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
@@ -16,38 +16,6 @@ | |||
16 | * You should have received a copy of the GNU General Public License | 16 | * You should have received a copy of the GNU General Public License |
17 | * along with this program; if not, write to the Free Software | 17 | * along with this program; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | * | ||
20 | * Changelog: | ||
21 | * | ||
22 | * 22-Jul-2004 Ben Dooks <ben@simtec.co.uk> | ||
23 | * Fixed compile warnings | ||
24 | * | ||
25 | * 22-Jul-2004 Roc Wu <cooloney@yahoo.com.cn> | ||
26 | * Fixed s3c_extirq_type | ||
27 | * | ||
28 | * 21-Jul-2004 Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | ||
29 | * Addition of ADC/TC demux | ||
30 | * | ||
31 | * 04-Oct-2004 Klaus Fetscher <k.fetscher@fetron.de> | ||
32 | * Fix for set_irq_type() on low EINT numbers | ||
33 | * | ||
34 | * 05-Oct-2004 Ben Dooks <ben@simtec.co.uk> | ||
35 | * Tidy up KF's patch and sort out new release | ||
36 | * | ||
37 | * 05-Oct-2004 Ben Dooks <ben@simtec.co.uk> | ||
38 | * Add support for power management controls | ||
39 | * | ||
40 | * 04-Nov-2004 Ben Dooks | ||
41 | * Fix standard IRQ wake for EINT0..4 and RTC | ||
42 | * | ||
43 | * 22-Feb-2005 Ben Dooks | ||
44 | * Fixed edge-triggering on ADC IRQ | ||
45 | * | ||
46 | * 28-Jun-2005 Ben Dooks | ||
47 | * Mark IRQ_LCD valid | ||
48 | * | ||
49 | * 25-Jul-2005 Ben Dooks | ||
50 | * Split the S3C2440 IRQ code to separate file | ||
51 | */ | 19 | */ |
52 | 20 | ||
53 | #include <linux/init.h> | 21 | #include <linux/init.h> |
@@ -55,81 +23,16 @@ | |||
55 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
56 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
57 | #include <linux/sysdev.h> | 25 | #include <linux/sysdev.h> |
58 | #include <linux/io.h> | ||
59 | 26 | ||
60 | #include <mach/hardware.h> | ||
61 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
62 | |||
63 | #include <asm/mach/irq.h> | 28 | #include <asm/mach/irq.h> |
64 | 29 | ||
65 | #include <plat/regs-irqtype.h> | 30 | #include <plat/regs-irqtype.h> |
66 | #include <mach/regs-irq.h> | ||
67 | #include <mach/regs-gpio.h> | ||
68 | 31 | ||
69 | #include <plat/cpu.h> | 32 | #include <plat/cpu.h> |
70 | #include <plat/pm.h> | 33 | #include <plat/pm.h> |
71 | #include <plat/irq.h> | 34 | #include <plat/irq.h> |
72 | 35 | ||
73 | /* wakeup irq control */ | ||
74 | |||
75 | #ifdef CONFIG_PM | ||
76 | |||
77 | /* state for IRQs over sleep */ | ||
78 | |||
79 | /* default is to allow for EINT0..EINT15, and IRQ_RTC as wakeup sources | ||
80 | * | ||
81 | * set bit to 1 in allow bitfield to enable the wakeup settings on it | ||
82 | */ | ||
83 | |||
84 | unsigned long s3c_irqwake_intallow = 1L << (IRQ_RTC - IRQ_EINT0) | 0xfL; | ||
85 | unsigned long s3c_irqwake_intmask = 0xffffffffL; | ||
86 | unsigned long s3c_irqwake_eintallow = 0x0000fff0L; | ||
87 | unsigned long s3c_irqwake_eintmask = 0xffffffffL; | ||
88 | |||
89 | int | ||
90 | s3c_irq_wake(unsigned int irqno, unsigned int state) | ||
91 | { | ||
92 | unsigned long irqbit = 1 << (irqno - IRQ_EINT0); | ||
93 | |||
94 | if (!(s3c_irqwake_intallow & irqbit)) | ||
95 | return -ENOENT; | ||
96 | |||
97 | printk(KERN_INFO "wake %s for irq %d\n", | ||
98 | state ? "enabled" : "disabled", irqno); | ||
99 | |||
100 | if (!state) | ||
101 | s3c_irqwake_intmask |= irqbit; | ||
102 | else | ||
103 | s3c_irqwake_intmask &= ~irqbit; | ||
104 | |||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | static int | ||
109 | s3c_irqext_wake(unsigned int irqno, unsigned int state) | ||
110 | { | ||
111 | unsigned long bit = 1L << (irqno - EXTINT_OFF); | ||
112 | |||
113 | if (!(s3c_irqwake_eintallow & bit)) | ||
114 | return -ENOENT; | ||
115 | |||
116 | printk(KERN_INFO "wake %s for irq %d\n", | ||
117 | state ? "enabled" : "disabled", irqno); | ||
118 | |||
119 | if (!state) | ||
120 | s3c_irqwake_eintmask |= bit; | ||
121 | else | ||
122 | s3c_irqwake_eintmask &= ~bit; | ||
123 | |||
124 | return 0; | ||
125 | } | ||
126 | |||
127 | #else | ||
128 | #define s3c_irqext_wake NULL | ||
129 | #define s3c_irq_wake NULL | ||
130 | #endif | ||
131 | |||
132 | |||
133 | static void | 36 | static void |
134 | s3c_irq_mask(unsigned int irqno) | 37 | s3c_irq_mask(unsigned int irqno) |
135 | { | 38 | { |
@@ -590,59 +493,6 @@ s3c_irq_demux_extint4t7(unsigned int irq, | |||
590 | } | 493 | } |
591 | } | 494 | } |
592 | 495 | ||
593 | #ifdef CONFIG_PM | ||
594 | |||
595 | static struct sleep_save irq_save[] = { | ||
596 | SAVE_ITEM(S3C2410_INTMSK), | ||
597 | SAVE_ITEM(S3C2410_INTSUBMSK), | ||
598 | }; | ||
599 | |||
600 | /* the extint values move between the s3c2410/s3c2440 and the s3c2412 | ||
601 | * so we use an array to hold them, and to calculate the address of | ||
602 | * the register at run-time | ||
603 | */ | ||
604 | |||
605 | static unsigned long save_extint[3]; | ||
606 | static unsigned long save_eintflt[4]; | ||
607 | static unsigned long save_eintmask; | ||
608 | |||
609 | int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state) | ||
610 | { | ||
611 | unsigned int i; | ||
612 | |||
613 | for (i = 0; i < ARRAY_SIZE(save_extint); i++) | ||
614 | save_extint[i] = __raw_readl(S3C24XX_EXTINT0 + (i*4)); | ||
615 | |||
616 | for (i = 0; i < ARRAY_SIZE(save_eintflt); i++) | ||
617 | save_eintflt[i] = __raw_readl(S3C24XX_EINFLT0 + (i*4)); | ||
618 | |||
619 | s3c2410_pm_do_save(irq_save, ARRAY_SIZE(irq_save)); | ||
620 | save_eintmask = __raw_readl(S3C24XX_EINTMASK); | ||
621 | |||
622 | return 0; | ||
623 | } | ||
624 | |||
625 | int s3c24xx_irq_resume(struct sys_device *dev) | ||
626 | { | ||
627 | unsigned int i; | ||
628 | |||
629 | for (i = 0; i < ARRAY_SIZE(save_extint); i++) | ||
630 | __raw_writel(save_extint[i], S3C24XX_EXTINT0 + (i*4)); | ||
631 | |||
632 | for (i = 0; i < ARRAY_SIZE(save_eintflt); i++) | ||
633 | __raw_writel(save_eintflt[i], S3C24XX_EINFLT0 + (i*4)); | ||
634 | |||
635 | s3c2410_pm_do_restore(irq_save, ARRAY_SIZE(irq_save)); | ||
636 | __raw_writel(save_eintmask, S3C24XX_EINTMASK); | ||
637 | |||
638 | return 0; | ||
639 | } | ||
640 | |||
641 | #else | ||
642 | #define s3c24xx_irq_suspend NULL | ||
643 | #define s3c24xx_irq_resume NULL | ||
644 | #endif | ||
645 | |||
646 | /* s3c24xx_init_irq | 496 | /* s3c24xx_init_irq |
647 | * | 497 | * |
648 | * Initialise S3C2410 IRQ system | 498 | * Initialise S3C2410 IRQ system |
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index 21dfa74773d1..da0d3217d3e3 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c | |||
@@ -61,7 +61,7 @@ static __init int pm_simtec_init(void) | |||
61 | 61 | ||
62 | __raw_writel(gstatus4, S3C2410_GSTATUS4); | 62 | __raw_writel(gstatus4, S3C2410_GSTATUS4); |
63 | 63 | ||
64 | return s3c2410_pm_init(); | 64 | return s3c_pm_init(); |
65 | } | 65 | } |
66 | 66 | ||
67 | arch_initcall(pm_simtec_init); | 67 | arch_initcall(pm_simtec_init); |
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index 34ef18e5b2a1..062a29339a91 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c | |||
@@ -31,14 +31,9 @@ | |||
31 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
32 | #include <linux/time.h> | 32 | #include <linux/time.h> |
33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
34 | #include <linux/crc32.h> | ||
35 | #include <linux/ioport.h> | ||
36 | #include <linux/serial_core.h> | 34 | #include <linux/serial_core.h> |
37 | #include <linux/io.h> | 35 | #include <linux/io.h> |
38 | 36 | ||
39 | #include <asm/cacheflush.h> | ||
40 | #include <mach/hardware.h> | ||
41 | |||
42 | #include <plat/regs-serial.h> | 37 | #include <plat/regs-serial.h> |
43 | #include <mach/regs-clock.h> | 38 | #include <mach/regs-clock.h> |
44 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
@@ -49,10 +44,6 @@ | |||
49 | 44 | ||
50 | #include <plat/pm.h> | 45 | #include <plat/pm.h> |
51 | 46 | ||
52 | /* for external use */ | ||
53 | |||
54 | unsigned long s3c_pm_flags; | ||
55 | |||
56 | #define PFX "s3c24xx-pm: " | 47 | #define PFX "s3c24xx-pm: " |
57 | 48 | ||
58 | static struct sleep_save core_save[] = { | 49 | static struct sleep_save core_save[] = { |
@@ -120,328 +111,14 @@ static struct sleep_save misc_save[] = { | |||
120 | SAVE_ITEM(S3C2410_DCLKCON), | 111 | SAVE_ITEM(S3C2410_DCLKCON), |
121 | }; | 112 | }; |
122 | 113 | ||
123 | #ifdef CONFIG_S3C2410_PM_DEBUG | ||
124 | |||
125 | #define SAVE_UART(va) \ | ||
126 | SAVE_ITEM((va) + S3C2410_ULCON), \ | ||
127 | SAVE_ITEM((va) + S3C2410_UCON), \ | ||
128 | SAVE_ITEM((va) + S3C2410_UFCON), \ | ||
129 | SAVE_ITEM((va) + S3C2410_UMCON), \ | ||
130 | SAVE_ITEM((va) + S3C2410_UBRDIV) | ||
131 | |||
132 | static struct sleep_save uart_save[] = { | ||
133 | SAVE_UART(S3C24XX_VA_UART0), | ||
134 | SAVE_UART(S3C24XX_VA_UART1), | ||
135 | #ifndef CONFIG_CPU_S3C2400 | ||
136 | SAVE_UART(S3C24XX_VA_UART2), | ||
137 | #endif | ||
138 | }; | ||
139 | |||
140 | /* debug | ||
141 | * | ||
142 | * we send the debug to printascii() to allow it to be seen if the | ||
143 | * system never wakes up from the sleep | ||
144 | */ | ||
145 | |||
146 | extern void printascii(const char *); | ||
147 | |||
148 | void pm_dbg(const char *fmt, ...) | ||
149 | { | ||
150 | va_list va; | ||
151 | char buff[256]; | ||
152 | |||
153 | va_start(va, fmt); | ||
154 | vsprintf(buff, fmt, va); | ||
155 | va_end(va); | ||
156 | |||
157 | printascii(buff); | ||
158 | } | ||
159 | |||
160 | static void s3c2410_pm_debug_init(void) | ||
161 | { | ||
162 | unsigned long tmp = __raw_readl(S3C2410_CLKCON); | ||
163 | |||
164 | /* re-start uart clocks */ | ||
165 | tmp |= S3C2410_CLKCON_UART0; | ||
166 | tmp |= S3C2410_CLKCON_UART1; | ||
167 | tmp |= S3C2410_CLKCON_UART2; | ||
168 | |||
169 | __raw_writel(tmp, S3C2410_CLKCON); | ||
170 | udelay(10); | ||
171 | } | ||
172 | |||
173 | #define DBG(fmt...) pm_dbg(fmt) | ||
174 | #else | ||
175 | #define DBG(fmt...) printk(KERN_DEBUG fmt) | ||
176 | |||
177 | #define s3c2410_pm_debug_init() do { } while(0) | ||
178 | |||
179 | static struct sleep_save uart_save[] = {}; | ||
180 | #endif | ||
181 | |||
182 | #if defined(CONFIG_S3C2410_PM_CHECK) && CONFIG_S3C2410_PM_CHECK_CHUNKSIZE != 0 | ||
183 | |||
184 | /* suspend checking code... | ||
185 | * | ||
186 | * this next area does a set of crc checks over all the installed | ||
187 | * memory, so the system can verify if the resume was ok. | ||
188 | * | ||
189 | * CONFIG_S3C2410_PM_CHECK_CHUNKSIZE defines the block-size for the CRC, | ||
190 | * increasing it will mean that the area corrupted will be less easy to spot, | ||
191 | * and reducing the size will cause the CRC save area to grow | ||
192 | */ | ||
193 | |||
194 | #define CHECK_CHUNKSIZE (CONFIG_S3C2410_PM_CHECK_CHUNKSIZE * 1024) | ||
195 | |||
196 | static u32 crc_size; /* size needed for the crc block */ | ||
197 | static u32 *crcs; /* allocated over suspend/resume */ | ||
198 | |||
199 | typedef u32 *(run_fn_t)(struct resource *ptr, u32 *arg); | ||
200 | |||
201 | /* s3c2410_pm_run_res | ||
202 | * | ||
203 | * go thorugh the given resource list, and look for system ram | ||
204 | */ | ||
205 | |||
206 | static void s3c2410_pm_run_res(struct resource *ptr, run_fn_t fn, u32 *arg) | ||
207 | { | ||
208 | while (ptr != NULL) { | ||
209 | if (ptr->child != NULL) | ||
210 | s3c2410_pm_run_res(ptr->child, fn, arg); | ||
211 | |||
212 | if ((ptr->flags & IORESOURCE_MEM) && | ||
213 | strcmp(ptr->name, "System RAM") == 0) { | ||
214 | DBG("Found system RAM at %08lx..%08lx\n", | ||
215 | ptr->start, ptr->end); | ||
216 | arg = (fn)(ptr, arg); | ||
217 | } | ||
218 | |||
219 | ptr = ptr->sibling; | ||
220 | } | ||
221 | } | ||
222 | |||
223 | static void s3c2410_pm_run_sysram(run_fn_t fn, u32 *arg) | ||
224 | { | ||
225 | s3c2410_pm_run_res(&iomem_resource, fn, arg); | ||
226 | } | ||
227 | |||
228 | static u32 *s3c2410_pm_countram(struct resource *res, u32 *val) | ||
229 | { | ||
230 | u32 size = (u32)(res->end - res->start)+1; | ||
231 | |||
232 | size += CHECK_CHUNKSIZE-1; | ||
233 | size /= CHECK_CHUNKSIZE; | ||
234 | |||
235 | DBG("Area %08lx..%08lx, %d blocks\n", res->start, res->end, size); | ||
236 | |||
237 | *val += size * sizeof(u32); | ||
238 | return val; | ||
239 | } | ||
240 | |||
241 | /* s3c2410_pm_prepare_check | ||
242 | * | ||
243 | * prepare the necessary information for creating the CRCs. This | ||
244 | * must be done before the final save, as it will require memory | ||
245 | * allocating, and thus touching bits of the kernel we do not | ||
246 | * know about. | ||
247 | */ | ||
248 | |||
249 | static void s3c2410_pm_check_prepare(void) | ||
250 | { | ||
251 | crc_size = 0; | ||
252 | |||
253 | s3c2410_pm_run_sysram(s3c2410_pm_countram, &crc_size); | ||
254 | |||
255 | DBG("s3c2410_pm_prepare_check: %u checks needed\n", crc_size); | ||
256 | |||
257 | crcs = kmalloc(crc_size+4, GFP_KERNEL); | ||
258 | if (crcs == NULL) | ||
259 | printk(KERN_ERR "Cannot allocated CRC save area\n"); | ||
260 | } | ||
261 | |||
262 | static u32 *s3c2410_pm_makecheck(struct resource *res, u32 *val) | ||
263 | { | ||
264 | unsigned long addr, left; | ||
265 | |||
266 | for (addr = res->start; addr < res->end; | ||
267 | addr += CHECK_CHUNKSIZE) { | ||
268 | left = res->end - addr; | ||
269 | |||
270 | if (left > CHECK_CHUNKSIZE) | ||
271 | left = CHECK_CHUNKSIZE; | ||
272 | |||
273 | *val = crc32_le(~0, phys_to_virt(addr), left); | ||
274 | val++; | ||
275 | } | ||
276 | |||
277 | return val; | ||
278 | } | ||
279 | |||
280 | /* s3c2410_pm_check_store | ||
281 | * | ||
282 | * compute the CRC values for the memory blocks before the final | ||
283 | * sleep. | ||
284 | */ | ||
285 | |||
286 | static void s3c2410_pm_check_store(void) | ||
287 | { | ||
288 | if (crcs != NULL) | ||
289 | s3c2410_pm_run_sysram(s3c2410_pm_makecheck, crcs); | ||
290 | } | ||
291 | |||
292 | /* in_region | ||
293 | * | ||
294 | * return TRUE if the area defined by ptr..ptr+size contatins the | ||
295 | * what..what+whatsz | ||
296 | */ | ||
297 | |||
298 | static inline int in_region(void *ptr, int size, void *what, size_t whatsz) | ||
299 | { | ||
300 | if ((what+whatsz) < ptr) | ||
301 | return 0; | ||
302 | |||
303 | if (what > (ptr+size)) | ||
304 | return 0; | ||
305 | |||
306 | return 1; | ||
307 | } | ||
308 | |||
309 | static u32 *s3c2410_pm_runcheck(struct resource *res, u32 *val) | ||
310 | { | ||
311 | void *save_at = phys_to_virt(s3c2410_sleep_save_phys); | ||
312 | unsigned long addr; | ||
313 | unsigned long left; | ||
314 | void *ptr; | ||
315 | u32 calc; | ||
316 | |||
317 | for (addr = res->start; addr < res->end; | ||
318 | addr += CHECK_CHUNKSIZE) { | ||
319 | left = res->end - addr; | ||
320 | |||
321 | if (left > CHECK_CHUNKSIZE) | ||
322 | left = CHECK_CHUNKSIZE; | ||
323 | |||
324 | ptr = phys_to_virt(addr); | ||
325 | |||
326 | if (in_region(ptr, left, crcs, crc_size)) { | ||
327 | DBG("skipping %08lx, has crc block in\n", addr); | ||
328 | goto skip_check; | ||
329 | } | ||
330 | |||
331 | if (in_region(ptr, left, save_at, 32*4 )) { | ||
332 | DBG("skipping %08lx, has save block in\n", addr); | ||
333 | goto skip_check; | ||
334 | } | ||
335 | |||
336 | /* calculate and check the checksum */ | ||
337 | |||
338 | calc = crc32_le(~0, ptr, left); | ||
339 | if (calc != *val) { | ||
340 | printk(KERN_ERR PFX "Restore CRC error at " | ||
341 | "%08lx (%08x vs %08x)\n", addr, calc, *val); | ||
342 | |||
343 | DBG("Restore CRC error at %08lx (%08x vs %08x)\n", | ||
344 | addr, calc, *val); | ||
345 | } | ||
346 | |||
347 | skip_check: | ||
348 | val++; | ||
349 | } | ||
350 | |||
351 | return val; | ||
352 | } | ||
353 | |||
354 | /* s3c2410_pm_check_restore | ||
355 | * | ||
356 | * check the CRCs after the restore event and free the memory used | ||
357 | * to hold them | ||
358 | */ | ||
359 | |||
360 | static void s3c2410_pm_check_restore(void) | ||
361 | { | ||
362 | if (crcs != NULL) { | ||
363 | s3c2410_pm_run_sysram(s3c2410_pm_runcheck, crcs); | ||
364 | kfree(crcs); | ||
365 | crcs = NULL; | ||
366 | } | ||
367 | } | ||
368 | |||
369 | #else | ||
370 | |||
371 | #define s3c2410_pm_check_prepare() do { } while(0) | ||
372 | #define s3c2410_pm_check_restore() do { } while(0) | ||
373 | #define s3c2410_pm_check_store() do { } while(0) | ||
374 | #endif | ||
375 | |||
376 | /* helper functions to save and restore register state */ | ||
377 | |||
378 | void s3c2410_pm_do_save(struct sleep_save *ptr, int count) | ||
379 | { | ||
380 | for (; count > 0; count--, ptr++) { | ||
381 | ptr->val = __raw_readl(ptr->reg); | ||
382 | DBG("saved %p value %08lx\n", ptr->reg, ptr->val); | ||
383 | } | ||
384 | } | ||
385 | |||
386 | /* s3c2410_pm_do_restore | ||
387 | * | ||
388 | * restore the system from the given list of saved registers | ||
389 | * | ||
390 | * Note, we do not use DBG() in here, as the system may not have | ||
391 | * restore the UARTs state yet | ||
392 | */ | ||
393 | |||
394 | void s3c2410_pm_do_restore(struct sleep_save *ptr, int count) | ||
395 | { | ||
396 | for (; count > 0; count--, ptr++) { | ||
397 | printk(KERN_DEBUG "restore %p (restore %08lx, was %08x)\n", | ||
398 | ptr->reg, ptr->val, __raw_readl(ptr->reg)); | ||
399 | |||
400 | __raw_writel(ptr->val, ptr->reg); | ||
401 | } | ||
402 | } | ||
403 | |||
404 | /* s3c2410_pm_do_restore_core | ||
405 | * | ||
406 | * similar to s3c2410_pm_do_restore_core | ||
407 | * | ||
408 | * WARNING: Do not put any debug in here that may effect memory or use | ||
409 | * peripherals, as things may be changing! | ||
410 | */ | ||
411 | |||
412 | static void s3c2410_pm_do_restore_core(struct sleep_save *ptr, int count) | ||
413 | { | ||
414 | for (; count > 0; count--, ptr++) { | ||
415 | __raw_writel(ptr->val, ptr->reg); | ||
416 | } | ||
417 | } | ||
418 | 114 | ||
419 | /* s3c2410_pm_show_resume_irqs | 115 | /* s3c_pm_check_resume_pin |
420 | * | ||
421 | * print any IRQs asserted at resume time (ie, we woke from) | ||
422 | */ | ||
423 | |||
424 | static void s3c2410_pm_show_resume_irqs(int start, unsigned long which, | ||
425 | unsigned long mask) | ||
426 | { | ||
427 | int i; | ||
428 | |||
429 | which &= ~mask; | ||
430 | |||
431 | for (i = 0; i <= 31; i++) { | ||
432 | if ((which) & (1L<<i)) { | ||
433 | DBG("IRQ %d asserted at resume\n", start+i); | ||
434 | } | ||
435 | } | ||
436 | } | ||
437 | |||
438 | /* s3c2410_pm_check_resume_pin | ||
439 | * | 116 | * |
440 | * check to see if the pin is configured correctly for sleep mode, and | 117 | * check to see if the pin is configured correctly for sleep mode, and |
441 | * make any necessary adjustments if it is not | 118 | * make any necessary adjustments if it is not |
442 | */ | 119 | */ |
443 | 120 | ||
444 | static void s3c2410_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs) | 121 | static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs) |
445 | { | 122 | { |
446 | unsigned long irqstate; | 123 | unsigned long irqstate; |
447 | unsigned long pinstate; | 124 | unsigned long pinstate; |
@@ -456,21 +133,21 @@ static void s3c2410_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs) | |||
456 | 133 | ||
457 | if (!irqstate) { | 134 | if (!irqstate) { |
458 | if (pinstate == S3C2410_GPIO_IRQ) | 135 | if (pinstate == S3C2410_GPIO_IRQ) |
459 | DBG("Leaving IRQ %d (pin %d) enabled\n", irq, pin); | 136 | S3C_PMDBG("Leaving IRQ %d (pin %d) enabled\n", irq, pin); |
460 | } else { | 137 | } else { |
461 | if (pinstate == S3C2410_GPIO_IRQ) { | 138 | if (pinstate == S3C2410_GPIO_IRQ) { |
462 | DBG("Disabling IRQ %d (pin %d)\n", irq, pin); | 139 | S3C_PMDBG("Disabling IRQ %d (pin %d)\n", irq, pin); |
463 | s3c2410_gpio_cfgpin(pin, S3C2410_GPIO_INPUT); | 140 | s3c2410_gpio_cfgpin(pin, S3C2410_GPIO_INPUT); |
464 | } | 141 | } |
465 | } | 142 | } |
466 | } | 143 | } |
467 | 144 | ||
468 | /* s3c2410_pm_configure_extint | 145 | /* s3c_pm_configure_extint |
469 | * | 146 | * |
470 | * configure all external interrupt pins | 147 | * configure all external interrupt pins |
471 | */ | 148 | */ |
472 | 149 | ||
473 | static void s3c2410_pm_configure_extint(void) | 150 | void s3c_pm_configure_extint(void) |
474 | { | 151 | { |
475 | int pin; | 152 | int pin; |
476 | 153 | ||
@@ -480,11 +157,11 @@ static void s3c2410_pm_configure_extint(void) | |||
480 | */ | 157 | */ |
481 | 158 | ||
482 | for (pin = S3C2410_GPF0; pin <= S3C2410_GPF7; pin++) { | 159 | for (pin = S3C2410_GPF0; pin <= S3C2410_GPF7; pin++) { |
483 | s3c2410_pm_check_resume_pin(pin, pin - S3C2410_GPF0); | 160 | s3c_pm_check_resume_pin(pin, pin - S3C2410_GPF0); |
484 | } | 161 | } |
485 | 162 | ||
486 | for (pin = S3C2410_GPG0; pin <= S3C2410_GPG7; pin++) { | 163 | for (pin = S3C2410_GPG0; pin <= S3C2410_GPG7; pin++) { |
487 | s3c2410_pm_check_resume_pin(pin, (pin - S3C2410_GPG0)+8); | 164 | s3c_pm_check_resume_pin(pin, (pin - S3C2410_GPG0)+8); |
488 | } | 165 | } |
489 | } | 166 | } |
490 | 167 | ||
@@ -494,12 +171,12 @@ static void s3c2410_pm_configure_extint(void) | |||
494 | #define OFFS_DAT (S3C2410_GPADAT - S3C2410_GPACON) | 171 | #define OFFS_DAT (S3C2410_GPADAT - S3C2410_GPACON) |
495 | #define OFFS_UP (S3C2410_GPBUP - S3C2410_GPBCON) | 172 | #define OFFS_UP (S3C2410_GPBUP - S3C2410_GPBCON) |
496 | 173 | ||
497 | /* s3c2410_pm_save_gpios() | 174 | /* s3c_pm_save_gpios() |
498 | * | 175 | * |
499 | * Save the state of the GPIOs | 176 | * Save the state of the GPIOs |
500 | */ | 177 | */ |
501 | 178 | ||
502 | static void s3c2410_pm_save_gpios(void) | 179 | void s3c_pm_save_gpios(void) |
503 | { | 180 | { |
504 | struct gpio_sleep *gps = gpio_save; | 181 | struct gpio_sleep *gps = gpio_save; |
505 | unsigned int gpio; | 182 | unsigned int gpio; |
@@ -538,7 +215,10 @@ static inline int is_out(unsigned long con) | |||
538 | return con == 1; | 215 | return con == 1; |
539 | } | 216 | } |
540 | 217 | ||
541 | /* s3c2410_pm_restore_gpio() | 218 | /** |
219 | * s3c2410_pm_restore_gpio() - restore the given GPIO bank | ||
220 | * @index: The number of the GPIO bank being resumed. | ||
221 | * @gps: The sleep confgiuration for the bank. | ||
542 | * | 222 | * |
543 | * Restore one of the GPIO banks that was saved during suspend. This is | 223 | * Restore one of the GPIO banks that was saved during suspend. This is |
544 | * not as simple as once thought, due to the possibility of glitches | 224 | * not as simple as once thought, due to the possibility of glitches |
@@ -646,8 +326,8 @@ static void s3c2410_pm_restore_gpio(int index, struct gpio_sleep *gps) | |||
646 | __raw_writel(gps->gpup, base + OFFS_UP); | 326 | __raw_writel(gps->gpup, base + OFFS_UP); |
647 | } | 327 | } |
648 | 328 | ||
649 | DBG("GPIO[%d] CON %08lx => %08lx, DAT %08lx => %08lx\n", | 329 | S3C_PMDBG("GPIO[%d] CON %08lx => %08lx, DAT %08lx => %08lx\n", |
650 | index, old_gpcon, gps_gpcon, old_gpdat, gps_gpdat); | 330 | index, old_gpcon, gps_gpcon, old_gpdat, gps_gpdat); |
651 | } | 331 | } |
652 | 332 | ||
653 | 333 | ||
@@ -656,7 +336,7 @@ static void s3c2410_pm_restore_gpio(int index, struct gpio_sleep *gps) | |||
656 | * Restore the state of the GPIOs | 336 | * Restore the state of the GPIOs |
657 | */ | 337 | */ |
658 | 338 | ||
659 | static void s3c2410_pm_restore_gpios(void) | 339 | void s3c_pm_restore_gpios(void) |
660 | { | 340 | { |
661 | struct gpio_sleep *gps = gpio_save; | 341 | struct gpio_sleep *gps = gpio_save; |
662 | int gpio; | 342 | int gpio; |
@@ -666,150 +346,15 @@ static void s3c2410_pm_restore_gpios(void) | |||
666 | } | 346 | } |
667 | } | 347 | } |
668 | 348 | ||
669 | void (*pm_cpu_prep)(void); | 349 | void s3c_pm_restore_core(void) |
670 | void (*pm_cpu_sleep)(void); | ||
671 | |||
672 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) | ||
673 | |||
674 | /* s3c2410_pm_enter | ||
675 | * | ||
676 | * central control for sleep/resume process | ||
677 | */ | ||
678 | |||
679 | static int s3c2410_pm_enter(suspend_state_t state) | ||
680 | { | 350 | { |
681 | unsigned long regs_save[16]; | 351 | s3c_pm_do_restore_core(core_save, ARRAY_SIZE(core_save)); |
682 | 352 | s3c_pm_do_restore(misc_save, ARRAY_SIZE(misc_save)); | |
683 | /* ensure the debug is initialised (if enabled) */ | ||
684 | |||
685 | s3c2410_pm_debug_init(); | ||
686 | |||
687 | DBG("s3c2410_pm_enter(%d)\n", state); | ||
688 | |||
689 | if (pm_cpu_prep == NULL || pm_cpu_sleep == NULL) { | ||
690 | printk(KERN_ERR PFX "error: no cpu sleep functions set\n"); | ||
691 | return -EINVAL; | ||
692 | } | ||
693 | |||
694 | /* check if we have anything to wake-up with... bad things seem | ||
695 | * to happen if you suspend with no wakeup (system will often | ||
696 | * require a full power-cycle) | ||
697 | */ | ||
698 | |||
699 | if (!any_allowed(s3c_irqwake_intmask, s3c_irqwake_intallow) && | ||
700 | !any_allowed(s3c_irqwake_eintmask, s3c_irqwake_eintallow)) { | ||
701 | printk(KERN_ERR PFX "No sources enabled for wake-up!\n"); | ||
702 | printk(KERN_ERR PFX "Aborting sleep\n"); | ||
703 | return -EINVAL; | ||
704 | } | ||
705 | |||
706 | /* prepare check area if configured */ | ||
707 | |||
708 | s3c2410_pm_check_prepare(); | ||
709 | |||
710 | /* store the physical address of the register recovery block */ | ||
711 | |||
712 | s3c2410_sleep_save_phys = virt_to_phys(regs_save); | ||
713 | |||
714 | DBG("s3c2410_sleep_save_phys=0x%08lx\n", s3c2410_sleep_save_phys); | ||
715 | |||
716 | /* save all necessary core registers not covered by the drivers */ | ||
717 | |||
718 | s3c2410_pm_save_gpios(); | ||
719 | s3c2410_pm_do_save(misc_save, ARRAY_SIZE(misc_save)); | ||
720 | s3c2410_pm_do_save(core_save, ARRAY_SIZE(core_save)); | ||
721 | s3c2410_pm_do_save(uart_save, ARRAY_SIZE(uart_save)); | ||
722 | |||
723 | /* set the irq configuration for wake */ | ||
724 | |||
725 | s3c2410_pm_configure_extint(); | ||
726 | |||
727 | DBG("sleep: irq wakeup masks: %08lx,%08lx\n", | ||
728 | s3c_irqwake_intmask, s3c_irqwake_eintmask); | ||
729 | |||
730 | __raw_writel(s3c_irqwake_intmask, S3C2410_INTMSK); | ||
731 | __raw_writel(s3c_irqwake_eintmask, S3C2410_EINTMASK); | ||
732 | |||
733 | /* ack any outstanding external interrupts before we go to sleep */ | ||
734 | |||
735 | __raw_writel(__raw_readl(S3C2410_EINTPEND), S3C2410_EINTPEND); | ||
736 | __raw_writel(__raw_readl(S3C2410_INTPND), S3C2410_INTPND); | ||
737 | __raw_writel(__raw_readl(S3C2410_SRCPND), S3C2410_SRCPND); | ||
738 | |||
739 | /* call cpu specific preparation */ | ||
740 | |||
741 | pm_cpu_prep(); | ||
742 | |||
743 | /* flush cache back to ram */ | ||
744 | |||
745 | flush_cache_all(); | ||
746 | |||
747 | s3c2410_pm_check_store(); | ||
748 | |||
749 | /* send the cpu to sleep... */ | ||
750 | |||
751 | __raw_writel(0x00, S3C2410_CLKCON); /* turn off clocks over sleep */ | ||
752 | |||
753 | /* s3c2410_cpu_save will also act as our return point from when | ||
754 | * we resume as it saves its own register state, so use the return | ||
755 | * code to differentiate return from save and return from sleep */ | ||
756 | |||
757 | if (s3c2410_cpu_save(regs_save) == 0) { | ||
758 | flush_cache_all(); | ||
759 | pm_cpu_sleep(); | ||
760 | } | ||
761 | |||
762 | /* restore the cpu state */ | ||
763 | |||
764 | cpu_init(); | ||
765 | |||
766 | /* restore the system state */ | ||
767 | |||
768 | s3c2410_pm_do_restore_core(core_save, ARRAY_SIZE(core_save)); | ||
769 | s3c2410_pm_do_restore(misc_save, ARRAY_SIZE(misc_save)); | ||
770 | s3c2410_pm_do_restore(uart_save, ARRAY_SIZE(uart_save)); | ||
771 | s3c2410_pm_restore_gpios(); | ||
772 | |||
773 | s3c2410_pm_debug_init(); | ||
774 | |||
775 | /* check what irq (if any) restored the system */ | ||
776 | |||
777 | DBG("post sleep: IRQs 0x%08x, 0x%08x\n", | ||
778 | __raw_readl(S3C2410_SRCPND), | ||
779 | __raw_readl(S3C2410_EINTPEND)); | ||
780 | |||
781 | s3c2410_pm_show_resume_irqs(IRQ_EINT0, __raw_readl(S3C2410_SRCPND), | ||
782 | s3c_irqwake_intmask); | ||
783 | |||
784 | s3c2410_pm_show_resume_irqs(IRQ_EINT4-4, __raw_readl(S3C2410_EINTPEND), | ||
785 | s3c_irqwake_eintmask); | ||
786 | |||
787 | DBG("post sleep, preparing to return\n"); | ||
788 | |||
789 | s3c2410_pm_check_restore(); | ||
790 | |||
791 | /* ok, let's return from sleep */ | ||
792 | |||
793 | DBG("S3C2410 PM Resume (post-restore)\n"); | ||
794 | return 0; | ||
795 | } | 353 | } |
796 | 354 | ||
797 | static struct platform_suspend_ops s3c2410_pm_ops = { | 355 | void s3c_pm_save_core(void) |
798 | .enter = s3c2410_pm_enter, | ||
799 | .valid = suspend_valid_only_mem, | ||
800 | }; | ||
801 | |||
802 | /* s3c2410_pm_init | ||
803 | * | ||
804 | * Attach the power management functions. This should be called | ||
805 | * from the board specific initialisation if the board supports | ||
806 | * it. | ||
807 | */ | ||
808 | |||
809 | int __init s3c2410_pm_init(void) | ||
810 | { | 356 | { |
811 | printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n"); | 357 | s3c_pm_do_save(misc_save, ARRAY_SIZE(misc_save)); |
812 | 358 | s3c_pm_do_save(core_save, ARRAY_SIZE(core_save)); | |
813 | suspend_set_ops(&s3c2410_pm_ops); | ||
814 | return 0; | ||
815 | } | 359 | } |
360 | |||
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index c1de6bb0101b..1364317d421e 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
@@ -145,13 +145,13 @@ static struct sleep_save s3c244x_sleep[] = { | |||
145 | 145 | ||
146 | static int s3c244x_suspend(struct sys_device *dev, pm_message_t state) | 146 | static int s3c244x_suspend(struct sys_device *dev, pm_message_t state) |
147 | { | 147 | { |
148 | s3c2410_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); | 148 | s3c_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); |
149 | return 0; | 149 | return 0; |
150 | } | 150 | } |
151 | 151 | ||
152 | static int s3c244x_resume(struct sys_device *dev) | 152 | static int s3c244x_resume(struct sys_device *dev) |
153 | { | 153 | { |
154 | s3c2410_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); | 154 | s3c_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); |
155 | return 0; | 155 | return 0; |
156 | } | 156 | } |
157 | 157 | ||
diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S index 76594b212802..e73e3b6e88d2 100644 --- a/arch/arm/plat-s3c24xx/sleep.S +++ b/arch/arm/plat-s3c24xx/sleep.S | |||
@@ -41,25 +41,13 @@ | |||
41 | 41 | ||
42 | .text | 42 | .text |
43 | 43 | ||
44 | /* s3c2410_cpu_save | 44 | /* s3c_cpu_save |
45 | * | ||
46 | * save enough of the CPU state to allow us to re-start | ||
47 | * pm.c code. as we store items like the sp/lr, we will | ||
48 | * end up returning from this function when the cpu resumes | ||
49 | * so the return value is set to mark this. | ||
50 | * | ||
51 | * This arangement means we avoid having to flush the cache | ||
52 | * from this code. | ||
53 | * | 45 | * |
54 | * entry: | 46 | * entry: |
55 | * r0 = pointer to save block | 47 | * r0 = save address (virtual addr of s3c_sleep_save_phys) |
56 | * | ||
57 | * exit: | ||
58 | * r0 = 0 => we stored everything | ||
59 | * 1 => resumed from sleep | ||
60 | */ | 48 | */ |
61 | 49 | ||
62 | ENTRY(s3c2410_cpu_save) | 50 | ENTRY(s3c_cpu_save) |
63 | stmfd sp!, { r4 - r12, lr } | 51 | stmfd sp!, { r4 - r12, lr } |
64 | 52 | ||
65 | @@ store co-processor registers | 53 | @@ store co-processor registers |
@@ -71,20 +59,25 @@ ENTRY(s3c2410_cpu_save) | |||
71 | 59 | ||
72 | stmia r0, { r4 - r13 } | 60 | stmia r0, { r4 - r13 } |
73 | 61 | ||
74 | mov r0, #0 | 62 | @@ write our state back to RAM |
75 | ldmfd sp, { r4 - r12, pc } | 63 | bl s3c_pm_cb_flushcache |
76 | 64 | ||
65 | @@ jump to final code to send system to sleep | ||
66 | ldr r0, =pm_cpu_sleep | ||
67 | @@ldr pc, [ r0 ] | ||
68 | ldr r0, [ r0 ] | ||
69 | mov pc, r0 | ||
70 | |||
77 | @@ return to the caller, after having the MMU | 71 | @@ return to the caller, after having the MMU |
78 | @@ turned on, this restores the last bits from the | 72 | @@ turned on, this restores the last bits from the |
79 | @@ stack | 73 | @@ stack |
80 | resume_with_mmu: | 74 | resume_with_mmu: |
81 | mov r0, #1 | ||
82 | ldmfd sp!, { r4 - r12, pc } | 75 | ldmfd sp!, { r4 - r12, pc } |
83 | 76 | ||
84 | .ltorg | 77 | .ltorg |
85 | 78 | ||
86 | @@ the next bits sit in the .data segment, even though they | 79 | @@ the next bits sit in the .data segment, even though they |
87 | @@ happen to be code... the s3c2410_sleep_save_phys needs to be | 80 | @@ happen to be code... the s3c_sleep_save_phys needs to be |
88 | @@ accessed by the resume code before it can restore the MMU. | 81 | @@ accessed by the resume code before it can restore the MMU. |
89 | @@ This means that the variable has to be close enough for the | 82 | @@ This means that the variable has to be close enough for the |
90 | @@ code to read it... since the .text segment needs to be RO, | 83 | @@ code to read it... since the .text segment needs to be RO, |
@@ -92,19 +85,19 @@ resume_with_mmu: | |||
92 | 85 | ||
93 | .data | 86 | .data |
94 | 87 | ||
95 | .global s3c2410_sleep_save_phys | 88 | .global s3c_sleep_save_phys |
96 | s3c2410_sleep_save_phys: | 89 | s3c_sleep_save_phys: |
97 | .word 0 | 90 | .word 0 |
98 | 91 | ||
99 | 92 | ||
100 | /* sleep magic, to allow the bootloader to check for an valid | 93 | /* sleep magic, to allow the bootloader to check for an valid |
101 | * image to resume to. Must be the first word before the | 94 | * image to resume to. Must be the first word before the |
102 | * s3c2410_cpu_resume entry. | 95 | * s3c_cpu_resume entry. |
103 | */ | 96 | */ |
104 | 97 | ||
105 | .word 0x2bedf00d | 98 | .word 0x2bedf00d |
106 | 99 | ||
107 | /* s3c2410_cpu_resume | 100 | /* s3c_cpu_resume |
108 | * | 101 | * |
109 | * resume code entry for bootloader to call | 102 | * resume code entry for bootloader to call |
110 | * | 103 | * |
@@ -113,7 +106,7 @@ s3c2410_sleep_save_phys: | |||
113 | * must not write to the code segment (code is read-only) | 106 | * must not write to the code segment (code is read-only) |
114 | */ | 107 | */ |
115 | 108 | ||
116 | ENTRY(s3c2410_cpu_resume) | 109 | ENTRY(s3c_cpu_resume) |
117 | mov r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE | 110 | mov r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE |
118 | msr cpsr_c, r0 | 111 | msr cpsr_c, r0 |
119 | 112 | ||
@@ -145,7 +138,7 @@ ENTRY(s3c2410_cpu_resume) | |||
145 | mcr p15, 0, r1, c8, c7, 0 @@ invalidate I & D TLBs | 138 | mcr p15, 0, r1, c8, c7, 0 @@ invalidate I & D TLBs |
146 | mcr p15, 0, r1, c7, c7, 0 @@ invalidate I & D caches | 139 | mcr p15, 0, r1, c7, c7, 0 @@ invalidate I & D caches |
147 | 140 | ||
148 | ldr r0, s3c2410_sleep_save_phys @ address of restore block | 141 | ldr r0, s3c_sleep_save_phys @ address of restore block |
149 | ldmia r0, { r4 - r13 } | 142 | ldmia r0, { r4 - r13 } |
150 | 143 | ||
151 | mcr p15, 0, r4, c13, c0, 0 @ PID | 144 | mcr p15, 0, r4, c13, c0, 0 @ PID |