diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
---|---|---|
committer | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
commit | dc3a9efb5ee89493a42c3365d219e339e4720c2b (patch) | |
tree | a0d261c2933f3083f351c858b01de7677356d4b7 /arch/powerpc | |
parent | 30415f6a63f3383a18e9adf7c144acabe6893f63 (diff) | |
parent | d3ab57ebdc6457543b346255fa47b0ecd7671136 (diff) |
Merge with Paulus
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 12 | ||||
-rw-r--r-- | arch/powerpc/kernel/Makefile | 5 | ||||
-rw-r--r-- | arch/powerpc/kernel/ppc32.h | 138 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas-proc.c | 808 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 19 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 834 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas_fw.c | 136 | ||||
-rw-r--r-- | arch/powerpc/kernel/signal_32.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/signal_64.c | 581 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/rtasd.c | 527 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 6 |
15 files changed, 2923 insertions, 160 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1c44a1dac421..3cf03ab46113 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -278,7 +278,6 @@ config PPC_PSERIES | |||
278 | select PPC_I8259 | 278 | select PPC_I8259 |
279 | select PPC_RTAS | 279 | select PPC_RTAS |
280 | select RTAS_ERROR_LOGGING | 280 | select RTAS_ERROR_LOGGING |
281 | select RTAS_FW | ||
282 | default y | 281 | default y |
283 | 282 | ||
284 | config PPC_CHRP | 283 | config PPC_CHRP |
@@ -324,7 +323,6 @@ config PPC_CELL | |||
324 | bool " Cell Broadband Processor Architecture" | 323 | bool " Cell Broadband Processor Architecture" |
325 | depends on PPC_MULTIPLATFORM && PPC64 | 324 | depends on PPC_MULTIPLATFORM && PPC64 |
326 | select PPC_RTAS | 325 | select PPC_RTAS |
327 | select RTAS_FW | ||
328 | select MMIO_NVRAM | 326 | select MMIO_NVRAM |
329 | 327 | ||
330 | config PPC_OF | 328 | config PPC_OF |
@@ -356,10 +354,14 @@ config RTAS_ERROR_LOGGING | |||
356 | depends on PPC_RTAS | 354 | depends on PPC_RTAS |
357 | default n | 355 | default n |
358 | 356 | ||
359 | config RTAS_FW | 357 | config RTAS_PROC |
360 | bool | 358 | bool "Proc interface to RTAS" |
361 | depends on PPC_RTAS | 359 | depends on PPC_RTAS |
362 | default n | 360 | default y |
361 | |||
362 | config RTAS_FLASH | ||
363 | tristate "Firmware flash interface" | ||
364 | depends on PPC64 && RTAS_PROC | ||
363 | 365 | ||
364 | config MMIO_NVRAM | 366 | config MMIO_NVRAM |
365 | bool | 367 | bool |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index abad3059a21a..7a3e1155ac9a 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -13,12 +13,13 @@ endif | |||
13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ | 13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ |
14 | signal_32.o pmc.o | 14 | signal_32.o pmc.o |
15 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ | 15 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ |
16 | ptrace32.o systbl.o | 16 | signal_64.o ptrace32.o systbl.o |
17 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o | 17 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o |
18 | obj-$(CONFIG_POWER4) += idle_power4.o | 18 | obj-$(CONFIG_POWER4) += idle_power4.o |
19 | obj-$(CONFIG_PPC_OF) += of_device.o | 19 | obj-$(CONFIG_PPC_OF) += of_device.o |
20 | obj-$(CONFIG_PPC_RTAS) += rtas.o | 20 | obj-$(CONFIG_PPC_RTAS) += rtas.o |
21 | obj-$(CONFIG_RTAS_FW) += rtas_fw.o | 21 | obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o |
22 | obj-$(CONFIG_RTAS_PROC) += rtas-proc.o | ||
22 | obj-$(CONFIG_IBMVIO) += vio.o | 23 | obj-$(CONFIG_IBMVIO) += vio.o |
23 | 24 | ||
24 | ifeq ($(CONFIG_PPC_MERGE),y) | 25 | ifeq ($(CONFIG_PPC_MERGE),y) |
diff --git a/arch/powerpc/kernel/ppc32.h b/arch/powerpc/kernel/ppc32.h new file mode 100644 index 000000000000..90e562771791 --- /dev/null +++ b/arch/powerpc/kernel/ppc32.h | |||
@@ -0,0 +1,138 @@ | |||
1 | #ifndef _PPC64_PPC32_H | ||
2 | #define _PPC64_PPC32_H | ||
3 | |||
4 | #include <linux/compat.h> | ||
5 | #include <asm/siginfo.h> | ||
6 | #include <asm/signal.h> | ||
7 | |||
8 | /* | ||
9 | * Data types and macros for providing 32b PowerPC support. | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or | ||
12 | * modify it under the terms of the GNU General Public License | ||
13 | * as published by the Free Software Foundation; either version | ||
14 | * 2 of the License, or (at your option) any later version. | ||
15 | */ | ||
16 | |||
17 | /* These are here to support 32-bit syscalls on a 64-bit kernel. */ | ||
18 | |||
19 | typedef struct compat_siginfo { | ||
20 | int si_signo; | ||
21 | int si_errno; | ||
22 | int si_code; | ||
23 | |||
24 | union { | ||
25 | int _pad[SI_PAD_SIZE32]; | ||
26 | |||
27 | /* kill() */ | ||
28 | struct { | ||
29 | compat_pid_t _pid; /* sender's pid */ | ||
30 | compat_uid_t _uid; /* sender's uid */ | ||
31 | } _kill; | ||
32 | |||
33 | /* POSIX.1b timers */ | ||
34 | struct { | ||
35 | compat_timer_t _tid; /* timer id */ | ||
36 | int _overrun; /* overrun count */ | ||
37 | compat_sigval_t _sigval; /* same as below */ | ||
38 | int _sys_private; /* not to be passed to user */ | ||
39 | } _timer; | ||
40 | |||
41 | /* POSIX.1b signals */ | ||
42 | struct { | ||
43 | compat_pid_t _pid; /* sender's pid */ | ||
44 | compat_uid_t _uid; /* sender's uid */ | ||
45 | compat_sigval_t _sigval; | ||
46 | } _rt; | ||
47 | |||
48 | /* SIGCHLD */ | ||
49 | struct { | ||
50 | compat_pid_t _pid; /* which child */ | ||
51 | compat_uid_t _uid; /* sender's uid */ | ||
52 | int _status; /* exit code */ | ||
53 | compat_clock_t _utime; | ||
54 | compat_clock_t _stime; | ||
55 | } _sigchld; | ||
56 | |||
57 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */ | ||
58 | struct { | ||
59 | unsigned int _addr; /* faulting insn/memory ref. */ | ||
60 | } _sigfault; | ||
61 | |||
62 | /* SIGPOLL */ | ||
63 | struct { | ||
64 | int _band; /* POLL_IN, POLL_OUT, POLL_MSG */ | ||
65 | int _fd; | ||
66 | } _sigpoll; | ||
67 | } _sifields; | ||
68 | } compat_siginfo_t; | ||
69 | |||
70 | #define __old_sigaction32 old_sigaction32 | ||
71 | |||
72 | struct __old_sigaction32 { | ||
73 | compat_uptr_t sa_handler; | ||
74 | compat_old_sigset_t sa_mask; | ||
75 | unsigned int sa_flags; | ||
76 | compat_uptr_t sa_restorer; /* not used by Linux/SPARC yet */ | ||
77 | }; | ||
78 | |||
79 | |||
80 | |||
81 | struct sigaction32 { | ||
82 | compat_uptr_t sa_handler; /* Really a pointer, but need to deal with 32 bits */ | ||
83 | unsigned int sa_flags; | ||
84 | compat_uptr_t sa_restorer; /* Another 32 bit pointer */ | ||
85 | compat_sigset_t sa_mask; /* A 32 bit mask */ | ||
86 | }; | ||
87 | |||
88 | typedef struct sigaltstack_32 { | ||
89 | unsigned int ss_sp; | ||
90 | int ss_flags; | ||
91 | compat_size_t ss_size; | ||
92 | } stack_32_t; | ||
93 | |||
94 | struct pt_regs32 { | ||
95 | unsigned int gpr[32]; | ||
96 | unsigned int nip; | ||
97 | unsigned int msr; | ||
98 | unsigned int orig_gpr3; /* Used for restarting system calls */ | ||
99 | unsigned int ctr; | ||
100 | unsigned int link; | ||
101 | unsigned int xer; | ||
102 | unsigned int ccr; | ||
103 | unsigned int mq; /* 601 only (not used at present) */ | ||
104 | unsigned int trap; /* Reason for being here */ | ||
105 | unsigned int dar; /* Fault registers */ | ||
106 | unsigned int dsisr; | ||
107 | unsigned int result; /* Result of a system call */ | ||
108 | }; | ||
109 | |||
110 | struct sigcontext32 { | ||
111 | unsigned int _unused[4]; | ||
112 | int signal; | ||
113 | compat_uptr_t handler; | ||
114 | unsigned int oldmask; | ||
115 | compat_uptr_t regs; /* 4 byte pointer to the pt_regs32 structure. */ | ||
116 | }; | ||
117 | |||
118 | struct mcontext32 { | ||
119 | elf_gregset_t32 mc_gregs; | ||
120 | elf_fpregset_t mc_fregs; | ||
121 | unsigned int mc_pad[2]; | ||
122 | elf_vrregset_t32 mc_vregs __attribute__((__aligned__(16))); | ||
123 | }; | ||
124 | |||
125 | struct ucontext32 { | ||
126 | unsigned int uc_flags; | ||
127 | unsigned int uc_link; | ||
128 | stack_32_t uc_stack; | ||
129 | int uc_pad[7]; | ||
130 | compat_uptr_t uc_regs; /* points to uc_mcontext field */ | ||
131 | compat_sigset_t uc_sigmask; /* mask last for extensibility */ | ||
132 | /* glibc has 1024-bit signal masks, ours are 64-bit */ | ||
133 | int uc_maskext[30]; | ||
134 | int uc_pad2[3]; | ||
135 | struct mcontext32 uc_mcontext; | ||
136 | }; | ||
137 | |||
138 | #endif /* _PPC64_PPC32_H */ | ||
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c new file mode 100644 index 000000000000..5bdd5b079d96 --- /dev/null +++ b/arch/powerpc/kernel/rtas-proc.c | |||
@@ -0,0 +1,808 @@ | |||
1 | /* | ||
2 | * arch/ppc64/kernel/rtas-proc.c | ||
3 | * Copyright (C) 2000 Tilmann Bitterberg | ||
4 | * (tilmann@bitterberg.de) | ||
5 | * | ||
6 | * RTAS (Runtime Abstraction Services) stuff | ||
7 | * Intention is to provide a clean user interface | ||
8 | * to use the RTAS. | ||
9 | * | ||
10 | * TODO: | ||
11 | * Split off a header file and maybe move it to a different | ||
12 | * location. Write Documentation on what the /proc/rtas/ entries | ||
13 | * actually do. | ||
14 | */ | ||
15 | |||
16 | #include <linux/errno.h> | ||
17 | #include <linux/sched.h> | ||
18 | #include <linux/proc_fs.h> | ||
19 | #include <linux/stat.h> | ||
20 | #include <linux/ctype.h> | ||
21 | #include <linux/time.h> | ||
22 | #include <linux/string.h> | ||
23 | #include <linux/init.h> | ||
24 | #include <linux/seq_file.h> | ||
25 | #include <linux/bitops.h> | ||
26 | #include <linux/rtc.h> | ||
27 | |||
28 | #include <asm/uaccess.h> | ||
29 | #include <asm/processor.h> | ||
30 | #include <asm/io.h> | ||
31 | #include <asm/prom.h> | ||
32 | #include <asm/rtas.h> | ||
33 | #include <asm/machdep.h> /* for ppc_md */ | ||
34 | #include <asm/time.h> | ||
35 | #include <asm/systemcfg.h> | ||
36 | |||
37 | /* Token for Sensors */ | ||
38 | #define KEY_SWITCH 0x0001 | ||
39 | #define ENCLOSURE_SWITCH 0x0002 | ||
40 | #define THERMAL_SENSOR 0x0003 | ||
41 | #define LID_STATUS 0x0004 | ||
42 | #define POWER_SOURCE 0x0005 | ||
43 | #define BATTERY_VOLTAGE 0x0006 | ||
44 | #define BATTERY_REMAINING 0x0007 | ||
45 | #define BATTERY_PERCENTAGE 0x0008 | ||
46 | #define EPOW_SENSOR 0x0009 | ||
47 | #define BATTERY_CYCLESTATE 0x000a | ||
48 | #define BATTERY_CHARGING 0x000b | ||
49 | |||
50 | /* IBM specific sensors */ | ||
51 | #define IBM_SURVEILLANCE 0x2328 /* 9000 */ | ||
52 | #define IBM_FANRPM 0x2329 /* 9001 */ | ||
53 | #define IBM_VOLTAGE 0x232a /* 9002 */ | ||
54 | #define IBM_DRCONNECTOR 0x232b /* 9003 */ | ||
55 | #define IBM_POWERSUPPLY 0x232c /* 9004 */ | ||
56 | |||
57 | /* Status return values */ | ||
58 | #define SENSOR_CRITICAL_HIGH 13 | ||
59 | #define SENSOR_WARNING_HIGH 12 | ||
60 | #define SENSOR_NORMAL 11 | ||
61 | #define SENSOR_WARNING_LOW 10 | ||
62 | #define SENSOR_CRITICAL_LOW 9 | ||
63 | #define SENSOR_SUCCESS 0 | ||
64 | #define SENSOR_HW_ERROR -1 | ||
65 | #define SENSOR_BUSY -2 | ||
66 | #define SENSOR_NOT_EXIST -3 | ||
67 | #define SENSOR_DR_ENTITY -9000 | ||
68 | |||
69 | /* Location Codes */ | ||
70 | #define LOC_SCSI_DEV_ADDR 'A' | ||
71 | #define LOC_SCSI_DEV_LOC 'B' | ||
72 | #define LOC_CPU 'C' | ||
73 | #define LOC_DISKETTE 'D' | ||
74 | #define LOC_ETHERNET 'E' | ||
75 | #define LOC_FAN 'F' | ||
76 | #define LOC_GRAPHICS 'G' | ||
77 | /* reserved / not used 'H' */ | ||
78 | #define LOC_IO_ADAPTER 'I' | ||
79 | /* reserved / not used 'J' */ | ||
80 | #define LOC_KEYBOARD 'K' | ||
81 | #define LOC_LCD 'L' | ||
82 | #define LOC_MEMORY 'M' | ||
83 | #define LOC_NV_MEMORY 'N' | ||
84 | #define LOC_MOUSE 'O' | ||
85 | #define LOC_PLANAR 'P' | ||
86 | #define LOC_OTHER_IO 'Q' | ||
87 | #define LOC_PARALLEL 'R' | ||
88 | #define LOC_SERIAL 'S' | ||
89 | #define LOC_DEAD_RING 'T' | ||
90 | #define LOC_RACKMOUNTED 'U' /* for _u_nit is rack mounted */ | ||
91 | #define LOC_VOLTAGE 'V' | ||
92 | #define LOC_SWITCH_ADAPTER 'W' | ||
93 | #define LOC_OTHER 'X' | ||
94 | #define LOC_FIRMWARE 'Y' | ||
95 | #define LOC_SCSI 'Z' | ||
96 | |||
97 | /* Tokens for indicators */ | ||
98 | #define TONE_FREQUENCY 0x0001 /* 0 - 1000 (HZ)*/ | ||
99 | #define TONE_VOLUME 0x0002 /* 0 - 100 (%) */ | ||
100 | #define SYSTEM_POWER_STATE 0x0003 | ||
101 | #define WARNING_LIGHT 0x0004 | ||
102 | #define DISK_ACTIVITY_LIGHT 0x0005 | ||
103 | #define HEX_DISPLAY_UNIT 0x0006 | ||
104 | #define BATTERY_WARNING_TIME 0x0007 | ||
105 | #define CONDITION_CYCLE_REQUEST 0x0008 | ||
106 | #define SURVEILLANCE_INDICATOR 0x2328 /* 9000 */ | ||
107 | #define DR_ACTION 0x2329 /* 9001 */ | ||
108 | #define DR_INDICATOR 0x232a /* 9002 */ | ||
109 | /* 9003 - 9004: Vendor specific */ | ||
110 | /* 9006 - 9999: Vendor specific */ | ||
111 | |||
112 | /* other */ | ||
113 | #define MAX_SENSORS 17 /* I only know of 17 sensors */ | ||
114 | #define MAX_LINELENGTH 256 | ||
115 | #define SENSOR_PREFIX "ibm,sensor-" | ||
116 | #define cel_to_fahr(x) ((x*9/5)+32) | ||
117 | |||
118 | |||
119 | /* Globals */ | ||
120 | static struct rtas_sensors sensors; | ||
121 | static struct device_node *rtas_node = NULL; | ||
122 | static unsigned long power_on_time = 0; /* Save the time the user set */ | ||
123 | static char progress_led[MAX_LINELENGTH]; | ||
124 | |||
125 | static unsigned long rtas_tone_frequency = 1000; | ||
126 | static unsigned long rtas_tone_volume = 0; | ||
127 | |||
128 | /* ****************STRUCTS******************************************* */ | ||
129 | struct individual_sensor { | ||
130 | unsigned int token; | ||
131 | unsigned int quant; | ||
132 | }; | ||
133 | |||
134 | struct rtas_sensors { | ||
135 | struct individual_sensor sensor[MAX_SENSORS]; | ||
136 | unsigned int quant; | ||
137 | }; | ||
138 | |||
139 | /* ****************************************************************** */ | ||
140 | /* Declarations */ | ||
141 | static int ppc_rtas_sensors_show(struct seq_file *m, void *v); | ||
142 | static int ppc_rtas_clock_show(struct seq_file *m, void *v); | ||
143 | static ssize_t ppc_rtas_clock_write(struct file *file, | ||
144 | const char __user *buf, size_t count, loff_t *ppos); | ||
145 | static int ppc_rtas_progress_show(struct seq_file *m, void *v); | ||
146 | static ssize_t ppc_rtas_progress_write(struct file *file, | ||
147 | const char __user *buf, size_t count, loff_t *ppos); | ||
148 | static int ppc_rtas_poweron_show(struct seq_file *m, void *v); | ||
149 | static ssize_t ppc_rtas_poweron_write(struct file *file, | ||
150 | const char __user *buf, size_t count, loff_t *ppos); | ||
151 | |||
152 | static ssize_t ppc_rtas_tone_freq_write(struct file *file, | ||
153 | const char __user *buf, size_t count, loff_t *ppos); | ||
154 | static int ppc_rtas_tone_freq_show(struct seq_file *m, void *v); | ||
155 | static ssize_t ppc_rtas_tone_volume_write(struct file *file, | ||
156 | const char __user *buf, size_t count, loff_t *ppos); | ||
157 | static int ppc_rtas_tone_volume_show(struct seq_file *m, void *v); | ||
158 | static int ppc_rtas_rmo_buf_show(struct seq_file *m, void *v); | ||
159 | |||
160 | static int sensors_open(struct inode *inode, struct file *file) | ||
161 | { | ||
162 | return single_open(file, ppc_rtas_sensors_show, NULL); | ||
163 | } | ||
164 | |||
165 | struct file_operations ppc_rtas_sensors_operations = { | ||
166 | .open = sensors_open, | ||
167 | .read = seq_read, | ||
168 | .llseek = seq_lseek, | ||
169 | .release = single_release, | ||
170 | }; | ||
171 | |||
172 | static int poweron_open(struct inode *inode, struct file *file) | ||
173 | { | ||
174 | return single_open(file, ppc_rtas_poweron_show, NULL); | ||
175 | } | ||
176 | |||
177 | struct file_operations ppc_rtas_poweron_operations = { | ||
178 | .open = poweron_open, | ||
179 | .read = seq_read, | ||
180 | .llseek = seq_lseek, | ||
181 | .write = ppc_rtas_poweron_write, | ||
182 | .release = single_release, | ||
183 | }; | ||
184 | |||
185 | static int progress_open(struct inode *inode, struct file *file) | ||
186 | { | ||
187 | return single_open(file, ppc_rtas_progress_show, NULL); | ||
188 | } | ||
189 | |||
190 | struct file_operations ppc_rtas_progress_operations = { | ||
191 | .open = progress_open, | ||
192 | .read = seq_read, | ||
193 | .llseek = seq_lseek, | ||
194 | .write = ppc_rtas_progress_write, | ||
195 | .release = single_release, | ||
196 | }; | ||
197 | |||
198 | static int clock_open(struct inode *inode, struct file *file) | ||
199 | { | ||
200 | return single_open(file, ppc_rtas_clock_show, NULL); | ||
201 | } | ||
202 | |||
203 | struct file_operations ppc_rtas_clock_operations = { | ||
204 | .open = clock_open, | ||
205 | .read = seq_read, | ||
206 | .llseek = seq_lseek, | ||
207 | .write = ppc_rtas_clock_write, | ||
208 | .release = single_release, | ||
209 | }; | ||
210 | |||
211 | static int tone_freq_open(struct inode *inode, struct file *file) | ||
212 | { | ||
213 | return single_open(file, ppc_rtas_tone_freq_show, NULL); | ||
214 | } | ||
215 | |||
216 | struct file_operations ppc_rtas_tone_freq_operations = { | ||
217 | .open = tone_freq_open, | ||
218 | .read = seq_read, | ||
219 | .llseek = seq_lseek, | ||
220 | .write = ppc_rtas_tone_freq_write, | ||
221 | .release = single_release, | ||
222 | }; | ||
223 | |||
224 | static int tone_volume_open(struct inode *inode, struct file *file) | ||
225 | { | ||
226 | return single_open(file, ppc_rtas_tone_volume_show, NULL); | ||
227 | } | ||
228 | |||
229 | struct file_operations ppc_rtas_tone_volume_operations = { | ||
230 | .open = tone_volume_open, | ||
231 | .read = seq_read, | ||
232 | .llseek = seq_lseek, | ||
233 | .write = ppc_rtas_tone_volume_write, | ||
234 | .release = single_release, | ||
235 | }; | ||
236 | |||
237 | static int rmo_buf_open(struct inode *inode, struct file *file) | ||
238 | { | ||
239 | return single_open(file, ppc_rtas_rmo_buf_show, NULL); | ||
240 | } | ||
241 | |||
242 | struct file_operations ppc_rtas_rmo_buf_ops = { | ||
243 | .open = rmo_buf_open, | ||
244 | .read = seq_read, | ||
245 | .llseek = seq_lseek, | ||
246 | .release = single_release, | ||
247 | }; | ||
248 | |||
249 | static int ppc_rtas_find_all_sensors(void); | ||
250 | static void ppc_rtas_process_sensor(struct seq_file *m, | ||
251 | struct individual_sensor *s, int state, int error, char *loc); | ||
252 | static char *ppc_rtas_process_error(int error); | ||
253 | static void get_location_code(struct seq_file *m, | ||
254 | struct individual_sensor *s, char *loc); | ||
255 | static void check_location_string(struct seq_file *m, char *c); | ||
256 | static void check_location(struct seq_file *m, char *c); | ||
257 | |||
258 | static int __init proc_rtas_init(void) | ||
259 | { | ||
260 | struct proc_dir_entry *entry; | ||
261 | |||
262 | if (!(systemcfg->platform & PLATFORM_PSERIES)) | ||
263 | return 1; | ||
264 | |||
265 | rtas_node = of_find_node_by_name(NULL, "rtas"); | ||
266 | if (rtas_node == NULL) | ||
267 | return 1; | ||
268 | |||
269 | entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL); | ||
270 | if (entry) | ||
271 | entry->proc_fops = &ppc_rtas_progress_operations; | ||
272 | |||
273 | entry = create_proc_entry("ppc64/rtas/clock", S_IRUGO|S_IWUSR, NULL); | ||
274 | if (entry) | ||
275 | entry->proc_fops = &ppc_rtas_clock_operations; | ||
276 | |||
277 | entry = create_proc_entry("ppc64/rtas/poweron", S_IWUSR|S_IRUGO, NULL); | ||
278 | if (entry) | ||
279 | entry->proc_fops = &ppc_rtas_poweron_operations; | ||
280 | |||
281 | entry = create_proc_entry("ppc64/rtas/sensors", S_IRUGO, NULL); | ||
282 | if (entry) | ||
283 | entry->proc_fops = &ppc_rtas_sensors_operations; | ||
284 | |||
285 | entry = create_proc_entry("ppc64/rtas/frequency", S_IWUSR|S_IRUGO, | ||
286 | NULL); | ||
287 | if (entry) | ||
288 | entry->proc_fops = &ppc_rtas_tone_freq_operations; | ||
289 | |||
290 | entry = create_proc_entry("ppc64/rtas/volume", S_IWUSR|S_IRUGO, NULL); | ||
291 | if (entry) | ||
292 | entry->proc_fops = &ppc_rtas_tone_volume_operations; | ||
293 | |||
294 | entry = create_proc_entry("ppc64/rtas/rmo_buffer", S_IRUSR, NULL); | ||
295 | if (entry) | ||
296 | entry->proc_fops = &ppc_rtas_rmo_buf_ops; | ||
297 | |||
298 | return 0; | ||
299 | } | ||
300 | |||
301 | __initcall(proc_rtas_init); | ||
302 | |||
303 | static int parse_number(const char __user *p, size_t count, unsigned long *val) | ||
304 | { | ||
305 | char buf[40]; | ||
306 | char *end; | ||
307 | |||
308 | if (count > 39) | ||
309 | return -EINVAL; | ||
310 | |||
311 | if (copy_from_user(buf, p, count)) | ||
312 | return -EFAULT; | ||
313 | |||
314 | buf[count] = 0; | ||
315 | |||
316 | *val = simple_strtoul(buf, &end, 10); | ||
317 | if (*end && *end != '\n') | ||
318 | return -EINVAL; | ||
319 | |||
320 | return 0; | ||
321 | } | ||
322 | |||
323 | /* ****************************************************************** */ | ||
324 | /* POWER-ON-TIME */ | ||
325 | /* ****************************************************************** */ | ||
326 | static ssize_t ppc_rtas_poweron_write(struct file *file, | ||
327 | const char __user *buf, size_t count, loff_t *ppos) | ||
328 | { | ||
329 | struct rtc_time tm; | ||
330 | unsigned long nowtime; | ||
331 | int error = parse_number(buf, count, &nowtime); | ||
332 | if (error) | ||
333 | return error; | ||
334 | |||
335 | power_on_time = nowtime; /* save the time */ | ||
336 | |||
337 | to_tm(nowtime, &tm); | ||
338 | |||
339 | error = rtas_call(rtas_token("set-time-for-power-on"), 7, 1, NULL, | ||
340 | tm.tm_year, tm.tm_mon, tm.tm_mday, | ||
341 | tm.tm_hour, tm.tm_min, tm.tm_sec, 0 /* nano */); | ||
342 | if (error) | ||
343 | printk(KERN_WARNING "error: setting poweron time returned: %s\n", | ||
344 | ppc_rtas_process_error(error)); | ||
345 | return count; | ||
346 | } | ||
347 | /* ****************************************************************** */ | ||
348 | static int ppc_rtas_poweron_show(struct seq_file *m, void *v) | ||
349 | { | ||
350 | if (power_on_time == 0) | ||
351 | seq_printf(m, "Power on time not set\n"); | ||
352 | else | ||
353 | seq_printf(m, "%lu\n",power_on_time); | ||
354 | return 0; | ||
355 | } | ||
356 | |||
357 | /* ****************************************************************** */ | ||
358 | /* PROGRESS */ | ||
359 | /* ****************************************************************** */ | ||
360 | static ssize_t ppc_rtas_progress_write(struct file *file, | ||
361 | const char __user *buf, size_t count, loff_t *ppos) | ||
362 | { | ||
363 | unsigned long hex; | ||
364 | |||
365 | if (count >= MAX_LINELENGTH) | ||
366 | count = MAX_LINELENGTH -1; | ||
367 | if (copy_from_user(progress_led, buf, count)) { /* save the string */ | ||
368 | return -EFAULT; | ||
369 | } | ||
370 | progress_led[count] = 0; | ||
371 | |||
372 | /* Lets see if the user passed hexdigits */ | ||
373 | hex = simple_strtoul(progress_led, NULL, 10); | ||
374 | |||
375 | rtas_progress ((char *)progress_led, hex); | ||
376 | return count; | ||
377 | |||
378 | /* clear the line */ | ||
379 | /* rtas_progress(" ", 0xffff);*/ | ||
380 | } | ||
381 | /* ****************************************************************** */ | ||
382 | static int ppc_rtas_progress_show(struct seq_file *m, void *v) | ||
383 | { | ||
384 | if (progress_led) | ||
385 | seq_printf(m, "%s\n", progress_led); | ||
386 | return 0; | ||
387 | } | ||
388 | |||
389 | /* ****************************************************************** */ | ||
390 | /* CLOCK */ | ||
391 | /* ****************************************************************** */ | ||
392 | static ssize_t ppc_rtas_clock_write(struct file *file, | ||
393 | const char __user *buf, size_t count, loff_t *ppos) | ||
394 | { | ||
395 | struct rtc_time tm; | ||
396 | unsigned long nowtime; | ||
397 | int error = parse_number(buf, count, &nowtime); | ||
398 | if (error) | ||
399 | return error; | ||
400 | |||
401 | to_tm(nowtime, &tm); | ||
402 | error = rtas_call(rtas_token("set-time-of-day"), 7, 1, NULL, | ||
403 | tm.tm_year, tm.tm_mon, tm.tm_mday, | ||
404 | tm.tm_hour, tm.tm_min, tm.tm_sec, 0); | ||
405 | if (error) | ||
406 | printk(KERN_WARNING "error: setting the clock returned: %s\n", | ||
407 | ppc_rtas_process_error(error)); | ||
408 | return count; | ||
409 | } | ||
410 | /* ****************************************************************** */ | ||
411 | static int ppc_rtas_clock_show(struct seq_file *m, void *v) | ||
412 | { | ||
413 | int ret[8]; | ||
414 | int error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret); | ||
415 | |||
416 | if (error) { | ||
417 | printk(KERN_WARNING "error: reading the clock returned: %s\n", | ||
418 | ppc_rtas_process_error(error)); | ||
419 | seq_printf(m, "0"); | ||
420 | } else { | ||
421 | unsigned int year, mon, day, hour, min, sec; | ||
422 | year = ret[0]; mon = ret[1]; day = ret[2]; | ||
423 | hour = ret[3]; min = ret[4]; sec = ret[5]; | ||
424 | seq_printf(m, "%lu\n", | ||
425 | mktime(year, mon, day, hour, min, sec)); | ||
426 | } | ||
427 | return 0; | ||
428 | } | ||
429 | |||
430 | /* ****************************************************************** */ | ||
431 | /* SENSOR STUFF */ | ||
432 | /* ****************************************************************** */ | ||
433 | static int ppc_rtas_sensors_show(struct seq_file *m, void *v) | ||
434 | { | ||
435 | int i,j; | ||
436 | int state, error; | ||
437 | int get_sensor_state = rtas_token("get-sensor-state"); | ||
438 | |||
439 | seq_printf(m, "RTAS (RunTime Abstraction Services) Sensor Information\n"); | ||
440 | seq_printf(m, "Sensor\t\tValue\t\tCondition\tLocation\n"); | ||
441 | seq_printf(m, "********************************************************\n"); | ||
442 | |||
443 | if (ppc_rtas_find_all_sensors() != 0) { | ||
444 | seq_printf(m, "\nNo sensors are available\n"); | ||
445 | return 0; | ||
446 | } | ||
447 | |||
448 | for (i=0; i<sensors.quant; i++) { | ||
449 | struct individual_sensor *p = &sensors.sensor[i]; | ||
450 | char rstr[64]; | ||
451 | char *loc; | ||
452 | int llen, offs; | ||
453 | |||
454 | sprintf (rstr, SENSOR_PREFIX"%04d", p->token); | ||
455 | loc = (char *) get_property(rtas_node, rstr, &llen); | ||
456 | |||
457 | /* A sensor may have multiple instances */ | ||
458 | for (j = 0, offs = 0; j <= p->quant; j++) { | ||
459 | error = rtas_call(get_sensor_state, 2, 2, &state, | ||
460 | p->token, j); | ||
461 | |||
462 | ppc_rtas_process_sensor(m, p, state, error, loc); | ||
463 | seq_putc(m, '\n'); | ||
464 | if (loc) { | ||
465 | offs += strlen(loc) + 1; | ||
466 | loc += strlen(loc) + 1; | ||
467 | if (offs >= llen) | ||
468 | loc = NULL; | ||
469 | } | ||
470 | } | ||
471 | } | ||
472 | return 0; | ||
473 | } | ||
474 | |||
475 | /* ****************************************************************** */ | ||
476 | |||
477 | static int ppc_rtas_find_all_sensors(void) | ||
478 | { | ||
479 | unsigned int *utmp; | ||
480 | int len, i; | ||
481 | |||
482 | utmp = (unsigned int *) get_property(rtas_node, "rtas-sensors", &len); | ||
483 | if (utmp == NULL) { | ||
484 | printk (KERN_ERR "error: could not get rtas-sensors\n"); | ||
485 | return 1; | ||
486 | } | ||
487 | |||
488 | sensors.quant = len / 8; /* int + int */ | ||
489 | |||
490 | for (i=0; i<sensors.quant; i++) { | ||
491 | sensors.sensor[i].token = *utmp++; | ||
492 | sensors.sensor[i].quant = *utmp++; | ||
493 | } | ||
494 | return 0; | ||
495 | } | ||
496 | |||
497 | /* ****************************************************************** */ | ||
498 | /* | ||
499 | * Builds a string of what rtas returned | ||
500 | */ | ||
501 | static char *ppc_rtas_process_error(int error) | ||
502 | { | ||
503 | switch (error) { | ||
504 | case SENSOR_CRITICAL_HIGH: | ||
505 | return "(critical high)"; | ||
506 | case SENSOR_WARNING_HIGH: | ||
507 | return "(warning high)"; | ||
508 | case SENSOR_NORMAL: | ||
509 | return "(normal)"; | ||
510 | case SENSOR_WARNING_LOW: | ||
511 | return "(warning low)"; | ||
512 | case SENSOR_CRITICAL_LOW: | ||
513 | return "(critical low)"; | ||
514 | case SENSOR_SUCCESS: | ||
515 | return "(read ok)"; | ||
516 | case SENSOR_HW_ERROR: | ||
517 | return "(hardware error)"; | ||
518 | case SENSOR_BUSY: | ||
519 | return "(busy)"; | ||
520 | case SENSOR_NOT_EXIST: | ||
521 | return "(non existent)"; | ||
522 | case SENSOR_DR_ENTITY: | ||
523 | return "(dr entity removed)"; | ||
524 | default: | ||
525 | return "(UNKNOWN)"; | ||
526 | } | ||
527 | } | ||
528 | |||
529 | /* ****************************************************************** */ | ||
530 | /* | ||
531 | * Builds a string out of what the sensor said | ||
532 | */ | ||
533 | |||
534 | static void ppc_rtas_process_sensor(struct seq_file *m, | ||
535 | struct individual_sensor *s, int state, int error, char *loc) | ||
536 | { | ||
537 | /* Defined return vales */ | ||
538 | const char * key_switch[] = { "Off\t", "Normal\t", "Secure\t", | ||
539 | "Maintenance" }; | ||
540 | const char * enclosure_switch[] = { "Closed", "Open" }; | ||
541 | const char * lid_status[] = { " ", "Open", "Closed" }; | ||
542 | const char * power_source[] = { "AC\t", "Battery", | ||
543 | "AC & Battery" }; | ||
544 | const char * battery_remaining[] = { "Very Low", "Low", "Mid", "High" }; | ||
545 | const char * epow_sensor[] = { | ||
546 | "EPOW Reset", "Cooling warning", "Power warning", | ||
547 | "System shutdown", "System halt", "EPOW main enclosure", | ||
548 | "EPOW power off" }; | ||
549 | const char * battery_cyclestate[] = { "None", "In progress", | ||
550 | "Requested" }; | ||
551 | const char * battery_charging[] = { "Charging", "Discharching", | ||
552 | "No current flow" }; | ||
553 | const char * ibm_drconnector[] = { "Empty", "Present", "Unusable", | ||
554 | "Exchange" }; | ||
555 | |||
556 | int have_strings = 0; | ||
557 | int num_states = 0; | ||
558 | int temperature = 0; | ||
559 | int unknown = 0; | ||
560 | |||
561 | /* What kind of sensor do we have here? */ | ||
562 | |||
563 | switch (s->token) { | ||
564 | case KEY_SWITCH: | ||
565 | seq_printf(m, "Key switch:\t"); | ||
566 | num_states = sizeof(key_switch) / sizeof(char *); | ||
567 | if (state < num_states) { | ||
568 | seq_printf(m, "%s\t", key_switch[state]); | ||
569 | have_strings = 1; | ||
570 | } | ||
571 | break; | ||
572 | case ENCLOSURE_SWITCH: | ||
573 | seq_printf(m, "Enclosure switch:\t"); | ||
574 | num_states = sizeof(enclosure_switch) / sizeof(char *); | ||
575 | if (state < num_states) { | ||
576 | seq_printf(m, "%s\t", | ||
577 | enclosure_switch[state]); | ||
578 | have_strings = 1; | ||
579 | } | ||
580 | break; | ||
581 | case THERMAL_SENSOR: | ||
582 | seq_printf(m, "Temp. (C/F):\t"); | ||
583 | temperature = 1; | ||
584 | break; | ||
585 | case LID_STATUS: | ||
586 | seq_printf(m, "Lid status:\t"); | ||
587 | num_states = sizeof(lid_status) / sizeof(char *); | ||
588 | if (state < num_states) { | ||
589 | seq_printf(m, "%s\t", lid_status[state]); | ||
590 | have_strings = 1; | ||
591 | } | ||
592 | break; | ||
593 | case POWER_SOURCE: | ||
594 | seq_printf(m, "Power source:\t"); | ||
595 | num_states = sizeof(power_source) / sizeof(char *); | ||
596 | if (state < num_states) { | ||
597 | seq_printf(m, "%s\t", | ||
598 | power_source[state]); | ||
599 | have_strings = 1; | ||
600 | } | ||
601 | break; | ||
602 | case BATTERY_VOLTAGE: | ||
603 | seq_printf(m, "Battery voltage:\t"); | ||
604 | break; | ||
605 | case BATTERY_REMAINING: | ||
606 | seq_printf(m, "Battery remaining:\t"); | ||
607 | num_states = sizeof(battery_remaining) / sizeof(char *); | ||
608 | if (state < num_states) | ||
609 | { | ||
610 | seq_printf(m, "%s\t", | ||
611 | battery_remaining[state]); | ||
612 | have_strings = 1; | ||
613 | } | ||
614 | break; | ||
615 | case BATTERY_PERCENTAGE: | ||
616 | seq_printf(m, "Battery percentage:\t"); | ||
617 | break; | ||
618 | case EPOW_SENSOR: | ||
619 | seq_printf(m, "EPOW Sensor:\t"); | ||
620 | num_states = sizeof(epow_sensor) / sizeof(char *); | ||
621 | if (state < num_states) { | ||
622 | seq_printf(m, "%s\t", epow_sensor[state]); | ||
623 | have_strings = 1; | ||
624 | } | ||
625 | break; | ||
626 | case BATTERY_CYCLESTATE: | ||
627 | seq_printf(m, "Battery cyclestate:\t"); | ||
628 | num_states = sizeof(battery_cyclestate) / | ||
629 | sizeof(char *); | ||
630 | if (state < num_states) { | ||
631 | seq_printf(m, "%s\t", | ||
632 | battery_cyclestate[state]); | ||
633 | have_strings = 1; | ||
634 | } | ||
635 | break; | ||
636 | case BATTERY_CHARGING: | ||
637 | seq_printf(m, "Battery Charging:\t"); | ||
638 | num_states = sizeof(battery_charging) / sizeof(char *); | ||
639 | if (state < num_states) { | ||
640 | seq_printf(m, "%s\t", | ||
641 | battery_charging[state]); | ||
642 | have_strings = 1; | ||
643 | } | ||
644 | break; | ||
645 | case IBM_SURVEILLANCE: | ||
646 | seq_printf(m, "Surveillance:\t"); | ||
647 | break; | ||
648 | case IBM_FANRPM: | ||
649 | seq_printf(m, "Fan (rpm):\t"); | ||
650 | break; | ||
651 | case IBM_VOLTAGE: | ||
652 | seq_printf(m, "Voltage (mv):\t"); | ||
653 | break; | ||
654 | case IBM_DRCONNECTOR: | ||
655 | seq_printf(m, "DR connector:\t"); | ||
656 | num_states = sizeof(ibm_drconnector) / sizeof(char *); | ||
657 | if (state < num_states) { | ||
658 | seq_printf(m, "%s\t", | ||
659 | ibm_drconnector[state]); | ||
660 | have_strings = 1; | ||
661 | } | ||
662 | break; | ||
663 | case IBM_POWERSUPPLY: | ||
664 | seq_printf(m, "Powersupply:\t"); | ||
665 | break; | ||
666 | default: | ||
667 | seq_printf(m, "Unknown sensor (type %d), ignoring it\n", | ||
668 | s->token); | ||
669 | unknown = 1; | ||
670 | have_strings = 1; | ||
671 | break; | ||
672 | } | ||
673 | if (have_strings == 0) { | ||
674 | if (temperature) { | ||
675 | seq_printf(m, "%4d /%4d\t", state, cel_to_fahr(state)); | ||
676 | } else | ||
677 | seq_printf(m, "%10d\t", state); | ||
678 | } | ||
679 | if (unknown == 0) { | ||
680 | seq_printf(m, "%s\t", ppc_rtas_process_error(error)); | ||
681 | get_location_code(m, s, loc); | ||
682 | } | ||
683 | } | ||
684 | |||
685 | /* ****************************************************************** */ | ||
686 | |||
687 | static void check_location(struct seq_file *m, char *c) | ||
688 | { | ||
689 | switch (c[0]) { | ||
690 | case LOC_PLANAR: | ||
691 | seq_printf(m, "Planar #%c", c[1]); | ||
692 | break; | ||
693 | case LOC_CPU: | ||
694 | seq_printf(m, "CPU #%c", c[1]); | ||
695 | break; | ||
696 | case LOC_FAN: | ||
697 | seq_printf(m, "Fan #%c", c[1]); | ||
698 | break; | ||
699 | case LOC_RACKMOUNTED: | ||
700 | seq_printf(m, "Rack #%c", c[1]); | ||
701 | break; | ||
702 | case LOC_VOLTAGE: | ||
703 | seq_printf(m, "Voltage #%c", c[1]); | ||
704 | break; | ||
705 | case LOC_LCD: | ||
706 | seq_printf(m, "LCD #%c", c[1]); | ||
707 | break; | ||
708 | case '.': | ||
709 | seq_printf(m, "- %c", c[1]); | ||
710 | break; | ||
711 | default: | ||
712 | seq_printf(m, "Unknown location"); | ||
713 | break; | ||
714 | } | ||
715 | } | ||
716 | |||
717 | |||
718 | /* ****************************************************************** */ | ||
719 | /* | ||
720 | * Format: | ||
721 | * ${LETTER}${NUMBER}[[-/]${LETTER}${NUMBER} [ ... ] ] | ||
722 | * the '.' may be an abbrevation | ||
723 | */ | ||
724 | static void check_location_string(struct seq_file *m, char *c) | ||
725 | { | ||
726 | while (*c) { | ||
727 | if (isalpha(*c) || *c == '.') | ||
728 | check_location(m, c); | ||
729 | else if (*c == '/' || *c == '-') | ||
730 | seq_printf(m, " at "); | ||
731 | c++; | ||
732 | } | ||
733 | } | ||
734 | |||
735 | |||
736 | /* ****************************************************************** */ | ||
737 | |||
738 | static void get_location_code(struct seq_file *m, struct individual_sensor *s, char *loc) | ||
739 | { | ||
740 | if (!loc || !*loc) { | ||
741 | seq_printf(m, "---");/* does not have a location */ | ||
742 | } else { | ||
743 | check_location_string(m, loc); | ||
744 | } | ||
745 | seq_putc(m, ' '); | ||
746 | } | ||
747 | /* ****************************************************************** */ | ||
748 | /* INDICATORS - Tone Frequency */ | ||
749 | /* ****************************************************************** */ | ||
750 | static ssize_t ppc_rtas_tone_freq_write(struct file *file, | ||
751 | const char __user *buf, size_t count, loff_t *ppos) | ||
752 | { | ||
753 | unsigned long freq; | ||
754 | int error = parse_number(buf, count, &freq); | ||
755 | if (error) | ||
756 | return error; | ||
757 | |||
758 | rtas_tone_frequency = freq; /* save it for later */ | ||
759 | error = rtas_call(rtas_token("set-indicator"), 3, 1, NULL, | ||
760 | TONE_FREQUENCY, 0, freq); | ||
761 | if (error) | ||
762 | printk(KERN_WARNING "error: setting tone frequency returned: %s\n", | ||
763 | ppc_rtas_process_error(error)); | ||
764 | return count; | ||
765 | } | ||
766 | /* ****************************************************************** */ | ||
767 | static int ppc_rtas_tone_freq_show(struct seq_file *m, void *v) | ||
768 | { | ||
769 | seq_printf(m, "%lu\n", rtas_tone_frequency); | ||
770 | return 0; | ||
771 | } | ||
772 | /* ****************************************************************** */ | ||
773 | /* INDICATORS - Tone Volume */ | ||
774 | /* ****************************************************************** */ | ||
775 | static ssize_t ppc_rtas_tone_volume_write(struct file *file, | ||
776 | const char __user *buf, size_t count, loff_t *ppos) | ||
777 | { | ||
778 | unsigned long volume; | ||
779 | int error = parse_number(buf, count, &volume); | ||
780 | if (error) | ||
781 | return error; | ||
782 | |||
783 | if (volume > 100) | ||
784 | volume = 100; | ||
785 | |||
786 | rtas_tone_volume = volume; /* save it for later */ | ||
787 | error = rtas_call(rtas_token("set-indicator"), 3, 1, NULL, | ||
788 | TONE_VOLUME, 0, volume); | ||
789 | if (error) | ||
790 | printk(KERN_WARNING "error: setting tone volume returned: %s\n", | ||
791 | ppc_rtas_process_error(error)); | ||
792 | return count; | ||
793 | } | ||
794 | /* ****************************************************************** */ | ||
795 | static int ppc_rtas_tone_volume_show(struct seq_file *m, void *v) | ||
796 | { | ||
797 | seq_printf(m, "%lu\n", rtas_tone_volume); | ||
798 | return 0; | ||
799 | } | ||
800 | |||
801 | #define RMO_READ_BUF_MAX 30 | ||
802 | |||
803 | /* RTAS Userspace access */ | ||
804 | static int ppc_rtas_rmo_buf_show(struct seq_file *m, void *v) | ||
805 | { | ||
806 | seq_printf(m, "%016lx %x\n", rtas_rmo_buf, RTAS_RMOBUF_MAX); | ||
807 | return 0; | ||
808 | } | ||
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 4d22eeeeb91d..b7fc2d884950 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -43,6 +43,13 @@ char rtas_data_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned; | |||
43 | unsigned long rtas_rmo_buf; | 43 | unsigned long rtas_rmo_buf; |
44 | 44 | ||
45 | /* | 45 | /* |
46 | * If non-NULL, this gets called when the kernel terminates. | ||
47 | * This is done like this so rtas_flash can be a module. | ||
48 | */ | ||
49 | void (*rtas_flash_term_hook)(int); | ||
50 | EXPORT_SYMBOL(rtas_flash_term_hook); | ||
51 | |||
52 | /* | ||
46 | * call_rtas_display_status and call_rtas_display_status_delay | 53 | * call_rtas_display_status and call_rtas_display_status_delay |
47 | * are designed only for very early low-level debugging, which | 54 | * are designed only for very early low-level debugging, which |
48 | * is why the token is hard-coded to 10. | 55 | * is why the token is hard-coded to 10. |
@@ -206,6 +213,7 @@ void rtas_progress(char *s, unsigned short hex) | |||
206 | 213 | ||
207 | spin_unlock(&progress_lock); | 214 | spin_unlock(&progress_lock); |
208 | } | 215 | } |
216 | EXPORT_SYMBOL(rtas_progress); /* needed by rtas_flash module */ | ||
209 | 217 | ||
210 | int rtas_token(const char *service) | 218 | int rtas_token(const char *service) |
211 | { | 219 | { |
@@ -492,6 +500,8 @@ int rtas_set_indicator(int indicator, int index, int new_value) | |||
492 | 500 | ||
493 | void rtas_restart(char *cmd) | 501 | void rtas_restart(char *cmd) |
494 | { | 502 | { |
503 | if (rtas_flash_term_hook) | ||
504 | rtas_flash_term_hook(SYS_RESTART); | ||
495 | printk("RTAS system-reboot returned %d\n", | 505 | printk("RTAS system-reboot returned %d\n", |
496 | rtas_call(rtas_token("system-reboot"), 0, 1, NULL)); | 506 | rtas_call(rtas_token("system-reboot"), 0, 1, NULL)); |
497 | for (;;); | 507 | for (;;); |
@@ -499,6 +509,8 @@ void rtas_restart(char *cmd) | |||
499 | 509 | ||
500 | void rtas_power_off(void) | 510 | void rtas_power_off(void) |
501 | { | 511 | { |
512 | if (rtas_flash_term_hook) | ||
513 | rtas_flash_term_hook(SYS_POWER_OFF); | ||
502 | /* allow power on only with power button press */ | 514 | /* allow power on only with power button press */ |
503 | printk("RTAS power-off returned %d\n", | 515 | printk("RTAS power-off returned %d\n", |
504 | rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1)); | 516 | rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1)); |
@@ -507,7 +519,12 @@ void rtas_power_off(void) | |||
507 | 519 | ||
508 | void rtas_halt(void) | 520 | void rtas_halt(void) |
509 | { | 521 | { |
510 | rtas_power_off(); | 522 | if (rtas_flash_term_hook) |
523 | rtas_flash_term_hook(SYS_HALT); | ||
524 | /* allow power on only with power button press */ | ||
525 | printk("RTAS power-off returned %d\n", | ||
526 | rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1)); | ||
527 | for (;;); | ||
511 | } | 528 | } |
512 | 529 | ||
513 | /* Must be in the RMO region, so we place it here */ | 530 | /* Must be in the RMO region, so we place it here */ |
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c new file mode 100644 index 000000000000..50500093c97f --- /dev/null +++ b/arch/powerpc/kernel/rtas_flash.c | |||
@@ -0,0 +1,834 @@ | |||
1 | /* | ||
2 | * c 2001 PPC 64 Team, IBM Corp | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version | ||
7 | * 2 of the License, or (at your option) any later version. | ||
8 | * | ||
9 | * /proc/ppc64/rtas/firmware_flash interface | ||
10 | * | ||
11 | * This file implements a firmware_flash interface to pump a firmware | ||
12 | * image into the kernel. At reboot time rtas_restart() will see the | ||
13 | * firmware image and flash it as it reboots (see rtas.c). | ||
14 | */ | ||
15 | |||
16 | #include <linux/module.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/proc_fs.h> | ||
19 | #include <asm/delay.h> | ||
20 | #include <asm/uaccess.h> | ||
21 | #include <asm/rtas.h> | ||
22 | #include <asm/abs_addr.h> | ||
23 | |||
24 | #define MODULE_VERS "1.0" | ||
25 | #define MODULE_NAME "rtas_flash" | ||
26 | |||
27 | #define FIRMWARE_FLASH_NAME "firmware_flash" | ||
28 | #define FIRMWARE_UPDATE_NAME "firmware_update" | ||
29 | #define MANAGE_FLASH_NAME "manage_flash" | ||
30 | #define VALIDATE_FLASH_NAME "validate_flash" | ||
31 | |||
32 | /* General RTAS Status Codes */ | ||
33 | #define RTAS_RC_SUCCESS 0 | ||
34 | #define RTAS_RC_HW_ERR -1 | ||
35 | #define RTAS_RC_BUSY -2 | ||
36 | |||
37 | /* Flash image status values */ | ||
38 | #define FLASH_AUTH -9002 /* RTAS Not Service Authority Partition */ | ||
39 | #define FLASH_NO_OP -1099 /* No operation initiated by user */ | ||
40 | #define FLASH_IMG_SHORT -1005 /* Flash image shorter than expected */ | ||
41 | #define FLASH_IMG_BAD_LEN -1004 /* Bad length value in flash list block */ | ||
42 | #define FLASH_IMG_NULL_DATA -1003 /* Bad data value in flash list block */ | ||
43 | #define FLASH_IMG_READY 0 /* Firmware img ready for flash on reboot */ | ||
44 | |||
45 | /* Manage image status values */ | ||
46 | #define MANAGE_AUTH -9002 /* RTAS Not Service Authority Partition */ | ||
47 | #define MANAGE_ACTIVE_ERR -9001 /* RTAS Cannot Overwrite Active Img */ | ||
48 | #define MANAGE_NO_OP -1099 /* No operation initiated by user */ | ||
49 | #define MANAGE_PARAM_ERR -3 /* RTAS Parameter Error */ | ||
50 | #define MANAGE_HW_ERR -1 /* RTAS Hardware Error */ | ||
51 | |||
52 | /* Validate image status values */ | ||
53 | #define VALIDATE_AUTH -9002 /* RTAS Not Service Authority Partition */ | ||
54 | #define VALIDATE_NO_OP -1099 /* No operation initiated by the user */ | ||
55 | #define VALIDATE_INCOMPLETE -1002 /* User copied < VALIDATE_BUF_SIZE */ | ||
56 | #define VALIDATE_READY -1001 /* Firmware image ready for validation */ | ||
57 | #define VALIDATE_PARAM_ERR -3 /* RTAS Parameter Error */ | ||
58 | #define VALIDATE_HW_ERR -1 /* RTAS Hardware Error */ | ||
59 | #define VALIDATE_TMP_UPDATE 0 /* Validate Return Status */ | ||
60 | #define VALIDATE_FLASH_AUTH 1 /* Validate Return Status */ | ||
61 | #define VALIDATE_INVALID_IMG 2 /* Validate Return Status */ | ||
62 | #define VALIDATE_CUR_UNKNOWN 3 /* Validate Return Status */ | ||
63 | #define VALIDATE_TMP_COMMIT_DL 4 /* Validate Return Status */ | ||
64 | #define VALIDATE_TMP_COMMIT 5 /* Validate Return Status */ | ||
65 | #define VALIDATE_TMP_UPDATE_DL 6 /* Validate Return Status */ | ||
66 | |||
67 | /* ibm,manage-flash-image operation tokens */ | ||
68 | #define RTAS_REJECT_TMP_IMG 0 | ||
69 | #define RTAS_COMMIT_TMP_IMG 1 | ||
70 | |||
71 | /* Array sizes */ | ||
72 | #define VALIDATE_BUF_SIZE 4096 | ||
73 | #define RTAS_MSG_MAXLEN 64 | ||
74 | |||
75 | struct flash_block { | ||
76 | char *data; | ||
77 | unsigned long length; | ||
78 | }; | ||
79 | |||
80 | /* This struct is very similar but not identical to | ||
81 | * that needed by the rtas flash update. | ||
82 | * All we need to do for rtas is rewrite num_blocks | ||
83 | * into a version/length and translate the pointers | ||
84 | * to absolute. | ||
85 | */ | ||
86 | #define FLASH_BLOCKS_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct flash_block)) | ||
87 | struct flash_block_list { | ||
88 | unsigned long num_blocks; | ||
89 | struct flash_block_list *next; | ||
90 | struct flash_block blocks[FLASH_BLOCKS_PER_NODE]; | ||
91 | }; | ||
92 | struct flash_block_list_header { /* just the header of flash_block_list */ | ||
93 | unsigned long num_blocks; | ||
94 | struct flash_block_list *next; | ||
95 | }; | ||
96 | |||
97 | static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; | ||
98 | |||
99 | #define FLASH_BLOCK_LIST_VERSION (1UL) | ||
100 | |||
101 | /* Local copy of the flash block list. | ||
102 | * We only allow one open of the flash proc file and create this | ||
103 | * list as we go. This list will be put in the | ||
104 | * rtas_firmware_flash_list var once it is fully read. | ||
105 | * | ||
106 | * For convenience as we build the list we use virtual addrs, | ||
107 | * we do not fill in the version number, and the length field | ||
108 | * is treated as the number of entries currently in the block | ||
109 | * (i.e. not a byte count). This is all fixed on release. | ||
110 | */ | ||
111 | |||
112 | /* Status int must be first member of struct */ | ||
113 | struct rtas_update_flash_t | ||
114 | { | ||
115 | int status; /* Flash update status */ | ||
116 | struct flash_block_list *flist; /* Local copy of flash block list */ | ||
117 | }; | ||
118 | |||
119 | /* Status int must be first member of struct */ | ||
120 | struct rtas_manage_flash_t | ||
121 | { | ||
122 | int status; /* Returned status */ | ||
123 | unsigned int op; /* Reject or commit image */ | ||
124 | }; | ||
125 | |||
126 | /* Status int must be first member of struct */ | ||
127 | struct rtas_validate_flash_t | ||
128 | { | ||
129 | int status; /* Returned status */ | ||
130 | char buf[VALIDATE_BUF_SIZE]; /* Candidate image buffer */ | ||
131 | unsigned int buf_size; /* Size of image buf */ | ||
132 | unsigned int update_results; /* Update results token */ | ||
133 | }; | ||
134 | |||
135 | static DEFINE_SPINLOCK(flash_file_open_lock); | ||
136 | static struct proc_dir_entry *firmware_flash_pde; | ||
137 | static struct proc_dir_entry *firmware_update_pde; | ||
138 | static struct proc_dir_entry *validate_pde; | ||
139 | static struct proc_dir_entry *manage_pde; | ||
140 | |||
141 | /* Do simple sanity checks on the flash image. */ | ||
142 | static int flash_list_valid(struct flash_block_list *flist) | ||
143 | { | ||
144 | struct flash_block_list *f; | ||
145 | int i; | ||
146 | unsigned long block_size, image_size; | ||
147 | |||
148 | /* Paranoid self test here. We also collect the image size. */ | ||
149 | image_size = 0; | ||
150 | for (f = flist; f; f = f->next) { | ||
151 | for (i = 0; i < f->num_blocks; i++) { | ||
152 | if (f->blocks[i].data == NULL) { | ||
153 | return FLASH_IMG_NULL_DATA; | ||
154 | } | ||
155 | block_size = f->blocks[i].length; | ||
156 | if (block_size <= 0 || block_size > PAGE_SIZE) { | ||
157 | return FLASH_IMG_BAD_LEN; | ||
158 | } | ||
159 | image_size += block_size; | ||
160 | } | ||
161 | } | ||
162 | |||
163 | if (image_size < (256 << 10)) { | ||
164 | if (image_size < 2) | ||
165 | return FLASH_NO_OP; | ||
166 | } | ||
167 | |||
168 | printk(KERN_INFO "FLASH: flash image with %ld bytes stored for hardware flash on reboot\n", image_size); | ||
169 | |||
170 | return FLASH_IMG_READY; | ||
171 | } | ||
172 | |||
173 | static void free_flash_list(struct flash_block_list *f) | ||
174 | { | ||
175 | struct flash_block_list *next; | ||
176 | int i; | ||
177 | |||
178 | while (f) { | ||
179 | for (i = 0; i < f->num_blocks; i++) | ||
180 | free_page((unsigned long)(f->blocks[i].data)); | ||
181 | next = f->next; | ||
182 | free_page((unsigned long)f); | ||
183 | f = next; | ||
184 | } | ||
185 | } | ||
186 | |||
187 | static int rtas_flash_release(struct inode *inode, struct file *file) | ||
188 | { | ||
189 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
190 | struct rtas_update_flash_t *uf; | ||
191 | |||
192 | uf = (struct rtas_update_flash_t *) dp->data; | ||
193 | if (uf->flist) { | ||
194 | /* File was opened in write mode for a new flash attempt */ | ||
195 | /* Clear saved list */ | ||
196 | if (rtas_firmware_flash_list.next) { | ||
197 | free_flash_list(rtas_firmware_flash_list.next); | ||
198 | rtas_firmware_flash_list.next = NULL; | ||
199 | } | ||
200 | |||
201 | if (uf->status != FLASH_AUTH) | ||
202 | uf->status = flash_list_valid(uf->flist); | ||
203 | |||
204 | if (uf->status == FLASH_IMG_READY) | ||
205 | rtas_firmware_flash_list.next = uf->flist; | ||
206 | else | ||
207 | free_flash_list(uf->flist); | ||
208 | |||
209 | uf->flist = NULL; | ||
210 | } | ||
211 | |||
212 | atomic_dec(&dp->count); | ||
213 | return 0; | ||
214 | } | ||
215 | |||
216 | static void get_flash_status_msg(int status, char *buf) | ||
217 | { | ||
218 | char *msg; | ||
219 | |||
220 | switch (status) { | ||
221 | case FLASH_AUTH: | ||
222 | msg = "error: this partition does not have service authority\n"; | ||
223 | break; | ||
224 | case FLASH_NO_OP: | ||
225 | msg = "info: no firmware image for flash\n"; | ||
226 | break; | ||
227 | case FLASH_IMG_SHORT: | ||
228 | msg = "error: flash image short\n"; | ||
229 | break; | ||
230 | case FLASH_IMG_BAD_LEN: | ||
231 | msg = "error: internal error bad length\n"; | ||
232 | break; | ||
233 | case FLASH_IMG_NULL_DATA: | ||
234 | msg = "error: internal error null data\n"; | ||
235 | break; | ||
236 | case FLASH_IMG_READY: | ||
237 | msg = "ready: firmware image ready for flash on reboot\n"; | ||
238 | break; | ||
239 | default: | ||
240 | sprintf(buf, "error: unexpected status value %d\n", status); | ||
241 | return; | ||
242 | } | ||
243 | |||
244 | strcpy(buf, msg); | ||
245 | } | ||
246 | |||
247 | /* Reading the proc file will show status (not the firmware contents) */ | ||
248 | static ssize_t rtas_flash_read(struct file *file, char __user *buf, | ||
249 | size_t count, loff_t *ppos) | ||
250 | { | ||
251 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
252 | struct rtas_update_flash_t *uf; | ||
253 | char msg[RTAS_MSG_MAXLEN]; | ||
254 | int msglen; | ||
255 | |||
256 | uf = (struct rtas_update_flash_t *) dp->data; | ||
257 | |||
258 | if (!strcmp(dp->name, FIRMWARE_FLASH_NAME)) { | ||
259 | get_flash_status_msg(uf->status, msg); | ||
260 | } else { /* FIRMWARE_UPDATE_NAME */ | ||
261 | sprintf(msg, "%d\n", uf->status); | ||
262 | } | ||
263 | msglen = strlen(msg); | ||
264 | if (msglen > count) | ||
265 | msglen = count; | ||
266 | |||
267 | if (ppos && *ppos != 0) | ||
268 | return 0; /* be cheap */ | ||
269 | |||
270 | if (!access_ok(VERIFY_WRITE, buf, msglen)) | ||
271 | return -EINVAL; | ||
272 | |||
273 | if (copy_to_user(buf, msg, msglen)) | ||
274 | return -EFAULT; | ||
275 | |||
276 | if (ppos) | ||
277 | *ppos = msglen; | ||
278 | return msglen; | ||
279 | } | ||
280 | |||
281 | /* We could be much more efficient here. But to keep this function | ||
282 | * simple we allocate a page to the block list no matter how small the | ||
283 | * count is. If the system is low on memory it will be just as well | ||
284 | * that we fail.... | ||
285 | */ | ||
286 | static ssize_t rtas_flash_write(struct file *file, const char __user *buffer, | ||
287 | size_t count, loff_t *off) | ||
288 | { | ||
289 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
290 | struct rtas_update_flash_t *uf; | ||
291 | char *p; | ||
292 | int next_free; | ||
293 | struct flash_block_list *fl; | ||
294 | |||
295 | uf = (struct rtas_update_flash_t *) dp->data; | ||
296 | |||
297 | if (uf->status == FLASH_AUTH || count == 0) | ||
298 | return count; /* discard data */ | ||
299 | |||
300 | /* In the case that the image is not ready for flashing, the memory | ||
301 | * allocated for the block list will be freed upon the release of the | ||
302 | * proc file | ||
303 | */ | ||
304 | if (uf->flist == NULL) { | ||
305 | uf->flist = (struct flash_block_list *) get_zeroed_page(GFP_KERNEL); | ||
306 | if (!uf->flist) | ||
307 | return -ENOMEM; | ||
308 | } | ||
309 | |||
310 | fl = uf->flist; | ||
311 | while (fl->next) | ||
312 | fl = fl->next; /* seek to last block_list for append */ | ||
313 | next_free = fl->num_blocks; | ||
314 | if (next_free == FLASH_BLOCKS_PER_NODE) { | ||
315 | /* Need to allocate another block_list */ | ||
316 | fl->next = (struct flash_block_list *)get_zeroed_page(GFP_KERNEL); | ||
317 | if (!fl->next) | ||
318 | return -ENOMEM; | ||
319 | fl = fl->next; | ||
320 | next_free = 0; | ||
321 | } | ||
322 | |||
323 | if (count > PAGE_SIZE) | ||
324 | count = PAGE_SIZE; | ||
325 | p = (char *)get_zeroed_page(GFP_KERNEL); | ||
326 | if (!p) | ||
327 | return -ENOMEM; | ||
328 | |||
329 | if(copy_from_user(p, buffer, count)) { | ||
330 | free_page((unsigned long)p); | ||
331 | return -EFAULT; | ||
332 | } | ||
333 | fl->blocks[next_free].data = p; | ||
334 | fl->blocks[next_free].length = count; | ||
335 | fl->num_blocks++; | ||
336 | |||
337 | return count; | ||
338 | } | ||
339 | |||
340 | static int rtas_excl_open(struct inode *inode, struct file *file) | ||
341 | { | ||
342 | struct proc_dir_entry *dp = PDE(inode); | ||
343 | |||
344 | /* Enforce exclusive open with use count of PDE */ | ||
345 | spin_lock(&flash_file_open_lock); | ||
346 | if (atomic_read(&dp->count) > 1) { | ||
347 | spin_unlock(&flash_file_open_lock); | ||
348 | return -EBUSY; | ||
349 | } | ||
350 | |||
351 | atomic_inc(&dp->count); | ||
352 | spin_unlock(&flash_file_open_lock); | ||
353 | |||
354 | return 0; | ||
355 | } | ||
356 | |||
357 | static int rtas_excl_release(struct inode *inode, struct file *file) | ||
358 | { | ||
359 | struct proc_dir_entry *dp = PDE(inode); | ||
360 | |||
361 | atomic_dec(&dp->count); | ||
362 | |||
363 | return 0; | ||
364 | } | ||
365 | |||
366 | static void manage_flash(struct rtas_manage_flash_t *args_buf) | ||
367 | { | ||
368 | unsigned int wait_time; | ||
369 | s32 rc; | ||
370 | |||
371 | while (1) { | ||
372 | rc = rtas_call(rtas_token("ibm,manage-flash-image"), 1, | ||
373 | 1, NULL, args_buf->op); | ||
374 | if (rc == RTAS_RC_BUSY) | ||
375 | udelay(1); | ||
376 | else if (rtas_is_extended_busy(rc)) { | ||
377 | wait_time = rtas_extended_busy_delay_time(rc); | ||
378 | udelay(wait_time * 1000); | ||
379 | } else | ||
380 | break; | ||
381 | } | ||
382 | |||
383 | args_buf->status = rc; | ||
384 | } | ||
385 | |||
386 | static ssize_t manage_flash_read(struct file *file, char __user *buf, | ||
387 | size_t count, loff_t *ppos) | ||
388 | { | ||
389 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
390 | struct rtas_manage_flash_t *args_buf; | ||
391 | char msg[RTAS_MSG_MAXLEN]; | ||
392 | int msglen; | ||
393 | |||
394 | args_buf = (struct rtas_manage_flash_t *) dp->data; | ||
395 | if (args_buf == NULL) | ||
396 | return 0; | ||
397 | |||
398 | msglen = sprintf(msg, "%d\n", args_buf->status); | ||
399 | if (msglen > count) | ||
400 | msglen = count; | ||
401 | |||
402 | if (ppos && *ppos != 0) | ||
403 | return 0; /* be cheap */ | ||
404 | |||
405 | if (!access_ok(VERIFY_WRITE, buf, msglen)) | ||
406 | return -EINVAL; | ||
407 | |||
408 | if (copy_to_user(buf, msg, msglen)) | ||
409 | return -EFAULT; | ||
410 | |||
411 | if (ppos) | ||
412 | *ppos = msglen; | ||
413 | return msglen; | ||
414 | } | ||
415 | |||
416 | static ssize_t manage_flash_write(struct file *file, const char __user *buf, | ||
417 | size_t count, loff_t *off) | ||
418 | { | ||
419 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
420 | struct rtas_manage_flash_t *args_buf; | ||
421 | const char reject_str[] = "0"; | ||
422 | const char commit_str[] = "1"; | ||
423 | char stkbuf[10]; | ||
424 | int op; | ||
425 | |||
426 | args_buf = (struct rtas_manage_flash_t *) dp->data; | ||
427 | if ((args_buf->status == MANAGE_AUTH) || (count == 0)) | ||
428 | return count; | ||
429 | |||
430 | op = -1; | ||
431 | if (buf) { | ||
432 | if (count > 9) count = 9; | ||
433 | if (copy_from_user (stkbuf, buf, count)) { | ||
434 | return -EFAULT; | ||
435 | } | ||
436 | if (strncmp(stkbuf, reject_str, strlen(reject_str)) == 0) | ||
437 | op = RTAS_REJECT_TMP_IMG; | ||
438 | else if (strncmp(stkbuf, commit_str, strlen(commit_str)) == 0) | ||
439 | op = RTAS_COMMIT_TMP_IMG; | ||
440 | } | ||
441 | |||
442 | if (op == -1) /* buf is empty, or contains invalid string */ | ||
443 | return -EINVAL; | ||
444 | |||
445 | args_buf->op = op; | ||
446 | manage_flash(args_buf); | ||
447 | |||
448 | return count; | ||
449 | } | ||
450 | |||
451 | static void validate_flash(struct rtas_validate_flash_t *args_buf) | ||
452 | { | ||
453 | int token = rtas_token("ibm,validate-flash-image"); | ||
454 | unsigned int wait_time; | ||
455 | int update_results; | ||
456 | s32 rc; | ||
457 | |||
458 | rc = 0; | ||
459 | while(1) { | ||
460 | spin_lock(&rtas_data_buf_lock); | ||
461 | memcpy(rtas_data_buf, args_buf->buf, VALIDATE_BUF_SIZE); | ||
462 | rc = rtas_call(token, 2, 2, &update_results, | ||
463 | (u32) __pa(rtas_data_buf), args_buf->buf_size); | ||
464 | memcpy(args_buf->buf, rtas_data_buf, VALIDATE_BUF_SIZE); | ||
465 | spin_unlock(&rtas_data_buf_lock); | ||
466 | |||
467 | if (rc == RTAS_RC_BUSY) | ||
468 | udelay(1); | ||
469 | else if (rtas_is_extended_busy(rc)) { | ||
470 | wait_time = rtas_extended_busy_delay_time(rc); | ||
471 | udelay(wait_time * 1000); | ||
472 | } else | ||
473 | break; | ||
474 | } | ||
475 | |||
476 | args_buf->status = rc; | ||
477 | args_buf->update_results = update_results; | ||
478 | } | ||
479 | |||
480 | static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf, | ||
481 | char *msg) | ||
482 | { | ||
483 | int n; | ||
484 | |||
485 | if (args_buf->status >= VALIDATE_TMP_UPDATE) { | ||
486 | n = sprintf(msg, "%d\n", args_buf->update_results); | ||
487 | if ((args_buf->update_results >= VALIDATE_CUR_UNKNOWN) || | ||
488 | (args_buf->update_results == VALIDATE_TMP_UPDATE)) | ||
489 | n += sprintf(msg + n, "%s\n", args_buf->buf); | ||
490 | } else { | ||
491 | n = sprintf(msg, "%d\n", args_buf->status); | ||
492 | } | ||
493 | return n; | ||
494 | } | ||
495 | |||
496 | static ssize_t validate_flash_read(struct file *file, char __user *buf, | ||
497 | size_t count, loff_t *ppos) | ||
498 | { | ||
499 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
500 | struct rtas_validate_flash_t *args_buf; | ||
501 | char msg[RTAS_MSG_MAXLEN]; | ||
502 | int msglen; | ||
503 | |||
504 | args_buf = (struct rtas_validate_flash_t *) dp->data; | ||
505 | |||
506 | if (ppos && *ppos != 0) | ||
507 | return 0; /* be cheap */ | ||
508 | |||
509 | msglen = get_validate_flash_msg(args_buf, msg); | ||
510 | if (msglen > count) | ||
511 | msglen = count; | ||
512 | |||
513 | if (!access_ok(VERIFY_WRITE, buf, msglen)) | ||
514 | return -EINVAL; | ||
515 | |||
516 | if (copy_to_user(buf, msg, msglen)) | ||
517 | return -EFAULT; | ||
518 | |||
519 | if (ppos) | ||
520 | *ppos = msglen; | ||
521 | return msglen; | ||
522 | } | ||
523 | |||
524 | static ssize_t validate_flash_write(struct file *file, const char __user *buf, | ||
525 | size_t count, loff_t *off) | ||
526 | { | ||
527 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
528 | struct rtas_validate_flash_t *args_buf; | ||
529 | int rc; | ||
530 | |||
531 | args_buf = (struct rtas_validate_flash_t *) dp->data; | ||
532 | |||
533 | if (dp->data == NULL) { | ||
534 | dp->data = kmalloc(sizeof(struct rtas_validate_flash_t), | ||
535 | GFP_KERNEL); | ||
536 | if (dp->data == NULL) | ||
537 | return -ENOMEM; | ||
538 | } | ||
539 | |||
540 | /* We are only interested in the first 4K of the | ||
541 | * candidate image */ | ||
542 | if ((*off >= VALIDATE_BUF_SIZE) || | ||
543 | (args_buf->status == VALIDATE_AUTH)) { | ||
544 | *off += count; | ||
545 | return count; | ||
546 | } | ||
547 | |||
548 | if (*off + count >= VALIDATE_BUF_SIZE) { | ||
549 | count = VALIDATE_BUF_SIZE - *off; | ||
550 | args_buf->status = VALIDATE_READY; | ||
551 | } else { | ||
552 | args_buf->status = VALIDATE_INCOMPLETE; | ||
553 | } | ||
554 | |||
555 | if (!access_ok(VERIFY_READ, buf, count)) { | ||
556 | rc = -EFAULT; | ||
557 | goto done; | ||
558 | } | ||
559 | if (copy_from_user(args_buf->buf + *off, buf, count)) { | ||
560 | rc = -EFAULT; | ||
561 | goto done; | ||
562 | } | ||
563 | |||
564 | *off += count; | ||
565 | rc = count; | ||
566 | done: | ||
567 | if (rc < 0) { | ||
568 | kfree(dp->data); | ||
569 | dp->data = NULL; | ||
570 | } | ||
571 | return rc; | ||
572 | } | ||
573 | |||
574 | static int validate_flash_release(struct inode *inode, struct file *file) | ||
575 | { | ||
576 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | ||
577 | struct rtas_validate_flash_t *args_buf; | ||
578 | |||
579 | args_buf = (struct rtas_validate_flash_t *) dp->data; | ||
580 | |||
581 | if (args_buf->status == VALIDATE_READY) { | ||
582 | args_buf->buf_size = VALIDATE_BUF_SIZE; | ||
583 | validate_flash(args_buf); | ||
584 | } | ||
585 | |||
586 | /* The matching atomic_inc was in rtas_excl_open() */ | ||
587 | atomic_dec(&dp->count); | ||
588 | |||
589 | return 0; | ||
590 | } | ||
591 | |||
592 | static void rtas_flash_firmware(int reboot_type) | ||
593 | { | ||
594 | unsigned long image_size; | ||
595 | struct flash_block_list *f, *next, *flist; | ||
596 | unsigned long rtas_block_list; | ||
597 | int i, status, update_token; | ||
598 | |||
599 | if (rtas_firmware_flash_list.next == NULL) | ||
600 | return; /* nothing to do */ | ||
601 | |||
602 | if (reboot_type != SYS_RESTART) { | ||
603 | printk(KERN_ALERT "FLASH: firmware flash requires a reboot\n"); | ||
604 | printk(KERN_ALERT "FLASH: the firmware image will NOT be flashed\n"); | ||
605 | return; | ||
606 | } | ||
607 | |||
608 | update_token = rtas_token("ibm,update-flash-64-and-reboot"); | ||
609 | if (update_token == RTAS_UNKNOWN_SERVICE) { | ||
610 | printk(KERN_ALERT "FLASH: ibm,update-flash-64-and-reboot " | ||
611 | "is not available -- not a service partition?\n"); | ||
612 | printk(KERN_ALERT "FLASH: firmware will not be flashed\n"); | ||
613 | return; | ||
614 | } | ||
615 | |||
616 | /* NOTE: the "first" block list is a global var with no data | ||
617 | * blocks in the kernel data segment. We do this because | ||
618 | * we want to ensure this block_list addr is under 4GB. | ||
619 | */ | ||
620 | rtas_firmware_flash_list.num_blocks = 0; | ||
621 | flist = (struct flash_block_list *)&rtas_firmware_flash_list; | ||
622 | rtas_block_list = virt_to_abs(flist); | ||
623 | if (rtas_block_list >= 4UL*1024*1024*1024) { | ||
624 | printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n"); | ||
625 | return; | ||
626 | } | ||
627 | |||
628 | printk(KERN_ALERT "FLASH: preparing saved firmware image for flash\n"); | ||
629 | /* Update the block_list in place. */ | ||
630 | image_size = 0; | ||
631 | for (f = flist; f; f = next) { | ||
632 | /* Translate data addrs to absolute */ | ||
633 | for (i = 0; i < f->num_blocks; i++) { | ||
634 | f->blocks[i].data = (char *)virt_to_abs(f->blocks[i].data); | ||
635 | image_size += f->blocks[i].length; | ||
636 | } | ||
637 | next = f->next; | ||
638 | /* Don't translate NULL pointer for last entry */ | ||
639 | if (f->next) | ||
640 | f->next = (struct flash_block_list *)virt_to_abs(f->next); | ||
641 | else | ||
642 | f->next = NULL; | ||
643 | /* make num_blocks into the version/length field */ | ||
644 | f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16); | ||
645 | } | ||
646 | |||
647 | printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size); | ||
648 | printk(KERN_ALERT "FLASH: performing flash and reboot\n"); | ||
649 | rtas_progress("Flashing \n", 0x0); | ||
650 | rtas_progress("Please Wait... ", 0x0); | ||
651 | printk(KERN_ALERT "FLASH: this will take several minutes. Do not power off!\n"); | ||
652 | status = rtas_call(update_token, 1, 1, NULL, rtas_block_list); | ||
653 | switch (status) { /* should only get "bad" status */ | ||
654 | case 0: | ||
655 | printk(KERN_ALERT "FLASH: success\n"); | ||
656 | break; | ||
657 | case -1: | ||
658 | printk(KERN_ALERT "FLASH: hardware error. Firmware may not be not flashed\n"); | ||
659 | break; | ||
660 | case -3: | ||
661 | printk(KERN_ALERT "FLASH: image is corrupt or not correct for this platform. Firmware not flashed\n"); | ||
662 | break; | ||
663 | case -4: | ||
664 | printk(KERN_ALERT "FLASH: flash failed when partially complete. System may not reboot\n"); | ||
665 | break; | ||
666 | default: | ||
667 | printk(KERN_ALERT "FLASH: unknown flash return code %d\n", status); | ||
668 | break; | ||
669 | } | ||
670 | } | ||
671 | |||
672 | static void remove_flash_pde(struct proc_dir_entry *dp) | ||
673 | { | ||
674 | if (dp) { | ||
675 | if (dp->data != NULL) | ||
676 | kfree(dp->data); | ||
677 | dp->owner = NULL; | ||
678 | remove_proc_entry(dp->name, dp->parent); | ||
679 | } | ||
680 | } | ||
681 | |||
682 | static int initialize_flash_pde_data(const char *rtas_call_name, | ||
683 | size_t buf_size, | ||
684 | struct proc_dir_entry *dp) | ||
685 | { | ||
686 | int *status; | ||
687 | int token; | ||
688 | |||
689 | dp->data = kmalloc(buf_size, GFP_KERNEL); | ||
690 | if (dp->data == NULL) { | ||
691 | remove_flash_pde(dp); | ||
692 | return -ENOMEM; | ||
693 | } | ||
694 | |||
695 | memset(dp->data, 0, buf_size); | ||
696 | |||
697 | /* | ||
698 | * This code assumes that the status int is the first member of the | ||
699 | * struct | ||
700 | */ | ||
701 | status = (int *) dp->data; | ||
702 | token = rtas_token(rtas_call_name); | ||
703 | if (token == RTAS_UNKNOWN_SERVICE) | ||
704 | *status = FLASH_AUTH; | ||
705 | else | ||
706 | *status = FLASH_NO_OP; | ||
707 | |||
708 | return 0; | ||
709 | } | ||
710 | |||
711 | static struct proc_dir_entry *create_flash_pde(const char *filename, | ||
712 | struct file_operations *fops) | ||
713 | { | ||
714 | struct proc_dir_entry *ent = NULL; | ||
715 | |||
716 | ent = create_proc_entry(filename, S_IRUSR | S_IWUSR, NULL); | ||
717 | if (ent != NULL) { | ||
718 | ent->nlink = 1; | ||
719 | ent->proc_fops = fops; | ||
720 | ent->owner = THIS_MODULE; | ||
721 | } | ||
722 | |||
723 | return ent; | ||
724 | } | ||
725 | |||
726 | static struct file_operations rtas_flash_operations = { | ||
727 | .read = rtas_flash_read, | ||
728 | .write = rtas_flash_write, | ||
729 | .open = rtas_excl_open, | ||
730 | .release = rtas_flash_release, | ||
731 | }; | ||
732 | |||
733 | static struct file_operations manage_flash_operations = { | ||
734 | .read = manage_flash_read, | ||
735 | .write = manage_flash_write, | ||
736 | .open = rtas_excl_open, | ||
737 | .release = rtas_excl_release, | ||
738 | }; | ||
739 | |||
740 | static struct file_operations validate_flash_operations = { | ||
741 | .read = validate_flash_read, | ||
742 | .write = validate_flash_write, | ||
743 | .open = rtas_excl_open, | ||
744 | .release = validate_flash_release, | ||
745 | }; | ||
746 | |||
747 | int __init rtas_flash_init(void) | ||
748 | { | ||
749 | int rc; | ||
750 | |||
751 | if (rtas_token("ibm,update-flash-64-and-reboot") == | ||
752 | RTAS_UNKNOWN_SERVICE) { | ||
753 | printk(KERN_ERR "rtas_flash: no firmware flash support\n"); | ||
754 | return 1; | ||
755 | } | ||
756 | |||
757 | firmware_flash_pde = create_flash_pde("ppc64/rtas/" | ||
758 | FIRMWARE_FLASH_NAME, | ||
759 | &rtas_flash_operations); | ||
760 | if (firmware_flash_pde == NULL) { | ||
761 | rc = -ENOMEM; | ||
762 | goto cleanup; | ||
763 | } | ||
764 | |||
765 | rc = initialize_flash_pde_data("ibm,update-flash-64-and-reboot", | ||
766 | sizeof(struct rtas_update_flash_t), | ||
767 | firmware_flash_pde); | ||
768 | if (rc != 0) | ||
769 | goto cleanup; | ||
770 | |||
771 | firmware_update_pde = create_flash_pde("ppc64/rtas/" | ||
772 | FIRMWARE_UPDATE_NAME, | ||
773 | &rtas_flash_operations); | ||
774 | if (firmware_update_pde == NULL) { | ||
775 | rc = -ENOMEM; | ||
776 | goto cleanup; | ||
777 | } | ||
778 | |||
779 | rc = initialize_flash_pde_data("ibm,update-flash-64-and-reboot", | ||
780 | sizeof(struct rtas_update_flash_t), | ||
781 | firmware_update_pde); | ||
782 | if (rc != 0) | ||
783 | goto cleanup; | ||
784 | |||
785 | validate_pde = create_flash_pde("ppc64/rtas/" VALIDATE_FLASH_NAME, | ||
786 | &validate_flash_operations); | ||
787 | if (validate_pde == NULL) { | ||
788 | rc = -ENOMEM; | ||
789 | goto cleanup; | ||
790 | } | ||
791 | |||
792 | rc = initialize_flash_pde_data("ibm,validate-flash-image", | ||
793 | sizeof(struct rtas_validate_flash_t), | ||
794 | validate_pde); | ||
795 | if (rc != 0) | ||
796 | goto cleanup; | ||
797 | |||
798 | manage_pde = create_flash_pde("ppc64/rtas/" MANAGE_FLASH_NAME, | ||
799 | &manage_flash_operations); | ||
800 | if (manage_pde == NULL) { | ||
801 | rc = -ENOMEM; | ||
802 | goto cleanup; | ||
803 | } | ||
804 | |||
805 | rc = initialize_flash_pde_data("ibm,manage-flash-image", | ||
806 | sizeof(struct rtas_manage_flash_t), | ||
807 | manage_pde); | ||
808 | if (rc != 0) | ||
809 | goto cleanup; | ||
810 | |||
811 | rtas_flash_term_hook = rtas_flash_firmware; | ||
812 | return 0; | ||
813 | |||
814 | cleanup: | ||
815 | remove_flash_pde(firmware_flash_pde); | ||
816 | remove_flash_pde(firmware_update_pde); | ||
817 | remove_flash_pde(validate_pde); | ||
818 | remove_flash_pde(manage_pde); | ||
819 | |||
820 | return rc; | ||
821 | } | ||
822 | |||
823 | void __exit rtas_flash_cleanup(void) | ||
824 | { | ||
825 | rtas_flash_term_hook = NULL; | ||
826 | remove_flash_pde(firmware_flash_pde); | ||
827 | remove_flash_pde(firmware_update_pde); | ||
828 | remove_flash_pde(validate_pde); | ||
829 | remove_flash_pde(manage_pde); | ||
830 | } | ||
831 | |||
832 | module_init(rtas_flash_init); | ||
833 | module_exit(rtas_flash_cleanup); | ||
834 | MODULE_LICENSE("GPL"); | ||
diff --git a/arch/powerpc/kernel/rtas_fw.c b/arch/powerpc/kernel/rtas_fw.c deleted file mode 100644 index 448922e8af1b..000000000000 --- a/arch/powerpc/kernel/rtas_fw.c +++ /dev/null | |||
@@ -1,136 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * Procedures for firmware flash updates. | ||
4 | * | ||
5 | * Peter Bergner, IBM March 2001. | ||
6 | * Copyright (C) 2001 IBM. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License | ||
10 | * as published by the Free Software Foundation; either version | ||
11 | * 2 of the License, or (at your option) any later version. | ||
12 | */ | ||
13 | |||
14 | #include <stdarg.h> | ||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/spinlock.h> | ||
18 | #include <linux/module.h> | ||
19 | #include <linux/init.h> | ||
20 | |||
21 | #include <asm/prom.h> | ||
22 | #include <asm/rtas.h> | ||
23 | #include <asm/semaphore.h> | ||
24 | #include <asm/machdep.h> | ||
25 | #include <asm/page.h> | ||
26 | #include <asm/param.h> | ||
27 | #include <asm/system.h> | ||
28 | #include <asm/abs_addr.h> | ||
29 | #include <asm/udbg.h> | ||
30 | #include <asm/delay.h> | ||
31 | #include <asm/uaccess.h> | ||
32 | #include <asm/systemcfg.h> | ||
33 | |||
34 | struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; | ||
35 | |||
36 | #define FLASH_BLOCK_LIST_VERSION (1UL) | ||
37 | |||
38 | static void rtas_flash_firmware(void) | ||
39 | { | ||
40 | unsigned long image_size; | ||
41 | struct flash_block_list *f, *next, *flist; | ||
42 | unsigned long rtas_block_list; | ||
43 | int i, status, update_token; | ||
44 | |||
45 | update_token = rtas_token("ibm,update-flash-64-and-reboot"); | ||
46 | if (update_token == RTAS_UNKNOWN_SERVICE) { | ||
47 | printk(KERN_ALERT "FLASH: ibm,update-flash-64-and-reboot is not available -- not a service partition?\n"); | ||
48 | printk(KERN_ALERT "FLASH: firmware will not be flashed\n"); | ||
49 | return; | ||
50 | } | ||
51 | |||
52 | /* NOTE: the "first" block list is a global var with no data | ||
53 | * blocks in the kernel data segment. We do this because | ||
54 | * we want to ensure this block_list addr is under 4GB. | ||
55 | */ | ||
56 | rtas_firmware_flash_list.num_blocks = 0; | ||
57 | flist = (struct flash_block_list *)&rtas_firmware_flash_list; | ||
58 | rtas_block_list = virt_to_abs(flist); | ||
59 | if (rtas_block_list >= 4UL*1024*1024*1024) { | ||
60 | printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n"); | ||
61 | return; | ||
62 | } | ||
63 | |||
64 | printk(KERN_ALERT "FLASH: preparing saved firmware image for flash\n"); | ||
65 | /* Update the block_list in place. */ | ||
66 | image_size = 0; | ||
67 | for (f = flist; f; f = next) { | ||
68 | /* Translate data addrs to absolute */ | ||
69 | for (i = 0; i < f->num_blocks; i++) { | ||
70 | f->blocks[i].data = (char *)virt_to_abs(f->blocks[i].data); | ||
71 | image_size += f->blocks[i].length; | ||
72 | } | ||
73 | next = f->next; | ||
74 | /* Don't translate NULL pointer for last entry */ | ||
75 | if (f->next) | ||
76 | f->next = (struct flash_block_list *)virt_to_abs(f->next); | ||
77 | else | ||
78 | f->next = NULL; | ||
79 | /* make num_blocks into the version/length field */ | ||
80 | f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16); | ||
81 | } | ||
82 | |||
83 | printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size); | ||
84 | printk(KERN_ALERT "FLASH: performing flash and reboot\n"); | ||
85 | rtas_progress("Flashing \n", 0x0); | ||
86 | rtas_progress("Please Wait... ", 0x0); | ||
87 | printk(KERN_ALERT "FLASH: this will take several minutes. Do not power off!\n"); | ||
88 | status = rtas_call(update_token, 1, 1, NULL, rtas_block_list); | ||
89 | switch (status) { /* should only get "bad" status */ | ||
90 | case 0: | ||
91 | printk(KERN_ALERT "FLASH: success\n"); | ||
92 | break; | ||
93 | case -1: | ||
94 | printk(KERN_ALERT "FLASH: hardware error. Firmware may not be not flashed\n"); | ||
95 | break; | ||
96 | case -3: | ||
97 | printk(KERN_ALERT "FLASH: image is corrupt or not correct for this platform. Firmware not flashed\n"); | ||
98 | break; | ||
99 | case -4: | ||
100 | printk(KERN_ALERT "FLASH: flash failed when partially complete. System may not reboot\n"); | ||
101 | break; | ||
102 | default: | ||
103 | printk(KERN_ALERT "FLASH: unknown flash return code %d\n", status); | ||
104 | break; | ||
105 | } | ||
106 | } | ||
107 | |||
108 | void rtas_flash_bypass_warning(void) | ||
109 | { | ||
110 | printk(KERN_ALERT "FLASH: firmware flash requires a reboot\n"); | ||
111 | printk(KERN_ALERT "FLASH: the firmware image will NOT be flashed\n"); | ||
112 | } | ||
113 | |||
114 | |||
115 | void rtas_fw_restart(char *cmd) | ||
116 | { | ||
117 | if (rtas_firmware_flash_list.next) | ||
118 | rtas_flash_firmware(); | ||
119 | rtas_restart(cmd); | ||
120 | } | ||
121 | |||
122 | void rtas_fw_power_off(void) | ||
123 | { | ||
124 | if (rtas_firmware_flash_list.next) | ||
125 | rtas_flash_bypass_warning(); | ||
126 | rtas_power_off(); | ||
127 | } | ||
128 | |||
129 | void rtas_fw_halt(void) | ||
130 | { | ||
131 | if (rtas_firmware_flash_list.next) | ||
132 | rtas_flash_bypass_warning(); | ||
133 | rtas_halt(); | ||
134 | } | ||
135 | |||
136 | EXPORT_SYMBOL(rtas_firmware_flash_list); | ||
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 444c3e81884c..876c57c11365 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
44 | #include <asm/cacheflush.h> | 44 | #include <asm/cacheflush.h> |
45 | #ifdef CONFIG_PPC64 | 45 | #ifdef CONFIG_PPC64 |
46 | #include <asm/ppc32.h> | 46 | #include "ppc32.h" |
47 | #include <asm/ppcdebug.h> | 47 | #include <asm/ppcdebug.h> |
48 | #include <asm/unistd.h> | 48 | #include <asm/unistd.h> |
49 | #include <asm/vdso.h> | 49 | #include <asm/vdso.h> |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c new file mode 100644 index 000000000000..ec9d0984b6a0 --- /dev/null +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -0,0 +1,581 @@ | |||
1 | /* | ||
2 | * linux/arch/ppc64/kernel/signal.c | ||
3 | * | ||
4 | * PowerPC version | ||
5 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) | ||
6 | * | ||
7 | * Derived from "arch/i386/kernel/signal.c" | ||
8 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
9 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or | ||
12 | * modify it under the terms of the GNU General Public License | ||
13 | * as published by the Free Software Foundation; either version | ||
14 | * 2 of the License, or (at your option) any later version. | ||
15 | */ | ||
16 | |||
17 | #include <linux/config.h> | ||
18 | #include <linux/sched.h> | ||
19 | #include <linux/mm.h> | ||
20 | #include <linux/smp.h> | ||
21 | #include <linux/smp_lock.h> | ||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/signal.h> | ||
24 | #include <linux/errno.h> | ||
25 | #include <linux/wait.h> | ||
26 | #include <linux/unistd.h> | ||
27 | #include <linux/stddef.h> | ||
28 | #include <linux/elf.h> | ||
29 | #include <linux/ptrace.h> | ||
30 | #include <linux/module.h> | ||
31 | |||
32 | #include <asm/sigcontext.h> | ||
33 | #include <asm/ucontext.h> | ||
34 | #include <asm/uaccess.h> | ||
35 | #include <asm/pgtable.h> | ||
36 | #include <asm/ppcdebug.h> | ||
37 | #include <asm/unistd.h> | ||
38 | #include <asm/cacheflush.h> | ||
39 | #include <asm/vdso.h> | ||
40 | |||
41 | #define DEBUG_SIG 0 | ||
42 | |||
43 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
44 | |||
45 | #define GP_REGS_SIZE min(sizeof(elf_gregset_t), sizeof(struct pt_regs)) | ||
46 | #define FP_REGS_SIZE sizeof(elf_fpregset_t) | ||
47 | |||
48 | #define TRAMP_TRACEBACK 3 | ||
49 | #define TRAMP_SIZE 6 | ||
50 | |||
51 | /* | ||
52 | * When we have signals to deliver, we set up on the user stack, | ||
53 | * going down from the original stack pointer: | ||
54 | * 1) a rt_sigframe struct which contains the ucontext | ||
55 | * 2) a gap of __SIGNAL_FRAMESIZE bytes which acts as a dummy caller | ||
56 | * frame for the signal handler. | ||
57 | */ | ||
58 | |||
59 | struct rt_sigframe { | ||
60 | /* sys_rt_sigreturn requires the ucontext be the first field */ | ||
61 | struct ucontext uc; | ||
62 | unsigned long _unused[2]; | ||
63 | unsigned int tramp[TRAMP_SIZE]; | ||
64 | struct siginfo *pinfo; | ||
65 | void *puc; | ||
66 | struct siginfo info; | ||
67 | /* 64 bit ABI allows for 288 bytes below sp before decrementing it. */ | ||
68 | char abigap[288]; | ||
69 | } __attribute__ ((aligned (16))); | ||
70 | |||
71 | |||
72 | /* | ||
73 | * Atomically swap in the new signal mask, and wait for a signal. | ||
74 | */ | ||
75 | long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, int p3, int p4, | ||
76 | int p6, int p7, struct pt_regs *regs) | ||
77 | { | ||
78 | sigset_t saveset, newset; | ||
79 | |||
80 | /* XXX: Don't preclude handling different sized sigset_t's. */ | ||
81 | if (sigsetsize != sizeof(sigset_t)) | ||
82 | return -EINVAL; | ||
83 | |||
84 | if (copy_from_user(&newset, unewset, sizeof(newset))) | ||
85 | return -EFAULT; | ||
86 | sigdelsetmask(&newset, ~_BLOCKABLE); | ||
87 | |||
88 | spin_lock_irq(¤t->sighand->siglock); | ||
89 | saveset = current->blocked; | ||
90 | current->blocked = newset; | ||
91 | recalc_sigpending(); | ||
92 | spin_unlock_irq(¤t->sighand->siglock); | ||
93 | |||
94 | regs->result = -EINTR; | ||
95 | regs->gpr[3] = EINTR; | ||
96 | regs->ccr |= 0x10000000; | ||
97 | while (1) { | ||
98 | current->state = TASK_INTERRUPTIBLE; | ||
99 | schedule(); | ||
100 | if (do_signal(&saveset, regs)) | ||
101 | return 0; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r5, | ||
106 | unsigned long r6, unsigned long r7, unsigned long r8, | ||
107 | struct pt_regs *regs) | ||
108 | { | ||
109 | return do_sigaltstack(uss, uoss, regs->gpr[1]); | ||
110 | } | ||
111 | |||
112 | |||
113 | /* | ||
114 | * Set up the sigcontext for the signal frame. | ||
115 | */ | ||
116 | |||
117 | static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | ||
118 | int signr, sigset_t *set, unsigned long handler) | ||
119 | { | ||
120 | /* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the | ||
121 | * process never used altivec yet (MSR_VEC is zero in pt_regs of | ||
122 | * the context). This is very important because we must ensure we | ||
123 | * don't lose the VRSAVE content that may have been set prior to | ||
124 | * the process doing its first vector operation | ||
125 | * Userland shall check AT_HWCAP to know wether it can rely on the | ||
126 | * v_regs pointer or not | ||
127 | */ | ||
128 | #ifdef CONFIG_ALTIVEC | ||
129 | elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful); | ||
130 | #endif | ||
131 | long err = 0; | ||
132 | |||
133 | flush_fp_to_thread(current); | ||
134 | |||
135 | /* Make sure signal doesn't get spurrious FP exceptions */ | ||
136 | current->thread.fpscr.val = 0; | ||
137 | |||
138 | #ifdef CONFIG_ALTIVEC | ||
139 | err |= __put_user(v_regs, &sc->v_regs); | ||
140 | |||
141 | /* save altivec registers */ | ||
142 | if (current->thread.used_vr) { | ||
143 | flush_altivec_to_thread(current); | ||
144 | /* Copy 33 vec registers (vr0..31 and vscr) to the stack */ | ||
145 | err |= __copy_to_user(v_regs, current->thread.vr, 33 * sizeof(vector128)); | ||
146 | /* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg) | ||
147 | * contains valid data. | ||
148 | */ | ||
149 | regs->msr |= MSR_VEC; | ||
150 | } | ||
151 | /* We always copy to/from vrsave, it's 0 if we don't have or don't | ||
152 | * use altivec. | ||
153 | */ | ||
154 | err |= __put_user(current->thread.vrsave, (u32 __user *)&v_regs[33]); | ||
155 | #else /* CONFIG_ALTIVEC */ | ||
156 | err |= __put_user(0, &sc->v_regs); | ||
157 | #endif /* CONFIG_ALTIVEC */ | ||
158 | err |= __put_user(&sc->gp_regs, &sc->regs); | ||
159 | err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); | ||
160 | err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); | ||
161 | err |= __put_user(signr, &sc->signal); | ||
162 | err |= __put_user(handler, &sc->handler); | ||
163 | if (set != NULL) | ||
164 | err |= __put_user(set->sig[0], &sc->oldmask); | ||
165 | |||
166 | return err; | ||
167 | } | ||
168 | |||
169 | /* | ||
170 | * Restore the sigcontext from the signal frame. | ||
171 | */ | ||
172 | |||
173 | static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, | ||
174 | struct sigcontext __user *sc) | ||
175 | { | ||
176 | #ifdef CONFIG_ALTIVEC | ||
177 | elf_vrreg_t __user *v_regs; | ||
178 | #endif | ||
179 | unsigned long err = 0; | ||
180 | unsigned long save_r13 = 0; | ||
181 | elf_greg_t *gregs = (elf_greg_t *)regs; | ||
182 | #ifdef CONFIG_ALTIVEC | ||
183 | unsigned long msr; | ||
184 | #endif | ||
185 | int i; | ||
186 | |||
187 | /* If this is not a signal return, we preserve the TLS in r13 */ | ||
188 | if (!sig) | ||
189 | save_r13 = regs->gpr[13]; | ||
190 | |||
191 | /* copy everything before MSR */ | ||
192 | err |= __copy_from_user(regs, &sc->gp_regs, | ||
193 | PT_MSR*sizeof(unsigned long)); | ||
194 | |||
195 | /* skip MSR and SOFTE */ | ||
196 | for (i = PT_MSR+1; i <= PT_RESULT; i++) { | ||
197 | if (i == PT_SOFTE) | ||
198 | continue; | ||
199 | err |= __get_user(gregs[i], &sc->gp_regs[i]); | ||
200 | } | ||
201 | |||
202 | if (!sig) | ||
203 | regs->gpr[13] = save_r13; | ||
204 | err |= __copy_from_user(¤t->thread.fpr, &sc->fp_regs, FP_REGS_SIZE); | ||
205 | if (set != NULL) | ||
206 | err |= __get_user(set->sig[0], &sc->oldmask); | ||
207 | |||
208 | #ifdef CONFIG_ALTIVEC | ||
209 | err |= __get_user(v_regs, &sc->v_regs); | ||
210 | err |= __get_user(msr, &sc->gp_regs[PT_MSR]); | ||
211 | if (err) | ||
212 | return err; | ||
213 | /* Copy 33 vec registers (vr0..31 and vscr) from the stack */ | ||
214 | if (v_regs != 0 && (msr & MSR_VEC) != 0) | ||
215 | err |= __copy_from_user(current->thread.vr, v_regs, | ||
216 | 33 * sizeof(vector128)); | ||
217 | else if (current->thread.used_vr) | ||
218 | memset(current->thread.vr, 0, 33 * sizeof(vector128)); | ||
219 | /* Always get VRSAVE back */ | ||
220 | if (v_regs != 0) | ||
221 | err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]); | ||
222 | else | ||
223 | current->thread.vrsave = 0; | ||
224 | #endif /* CONFIG_ALTIVEC */ | ||
225 | |||
226 | #ifndef CONFIG_SMP | ||
227 | preempt_disable(); | ||
228 | if (last_task_used_math == current) | ||
229 | last_task_used_math = NULL; | ||
230 | if (last_task_used_altivec == current) | ||
231 | last_task_used_altivec = NULL; | ||
232 | preempt_enable(); | ||
233 | #endif | ||
234 | /* Force reload of FP/VEC */ | ||
235 | regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC); | ||
236 | |||
237 | return err; | ||
238 | } | ||
239 | |||
240 | /* | ||
241 | * Allocate space for the signal frame | ||
242 | */ | ||
243 | static inline void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | ||
244 | size_t frame_size) | ||
245 | { | ||
246 | unsigned long newsp; | ||
247 | |||
248 | /* Default to using normal stack */ | ||
249 | newsp = regs->gpr[1]; | ||
250 | |||
251 | if (ka->sa.sa_flags & SA_ONSTACK) { | ||
252 | if (! on_sig_stack(regs->gpr[1])) | ||
253 | newsp = (current->sas_ss_sp + current->sas_ss_size); | ||
254 | } | ||
255 | |||
256 | return (void __user *)((newsp - frame_size) & -16ul); | ||
257 | } | ||
258 | |||
259 | /* | ||
260 | * Setup the trampoline code on the stack | ||
261 | */ | ||
262 | static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp) | ||
263 | { | ||
264 | int i; | ||
265 | long err = 0; | ||
266 | |||
267 | /* addi r1, r1, __SIGNAL_FRAMESIZE # Pop the dummy stackframe */ | ||
268 | err |= __put_user(0x38210000UL | (__SIGNAL_FRAMESIZE & 0xffff), &tramp[0]); | ||
269 | /* li r0, __NR_[rt_]sigreturn| */ | ||
270 | err |= __put_user(0x38000000UL | (syscall & 0xffff), &tramp[1]); | ||
271 | /* sc */ | ||
272 | err |= __put_user(0x44000002UL, &tramp[2]); | ||
273 | |||
274 | /* Minimal traceback info */ | ||
275 | for (i=TRAMP_TRACEBACK; i < TRAMP_SIZE ;i++) | ||
276 | err |= __put_user(0, &tramp[i]); | ||
277 | |||
278 | if (!err) | ||
279 | flush_icache_range((unsigned long) &tramp[0], | ||
280 | (unsigned long) &tramp[TRAMP_SIZE]); | ||
281 | |||
282 | return err; | ||
283 | } | ||
284 | |||
285 | /* | ||
286 | * Restore the user process's signal mask (also used by signal32.c) | ||
287 | */ | ||
288 | void restore_sigmask(sigset_t *set) | ||
289 | { | ||
290 | sigdelsetmask(set, ~_BLOCKABLE); | ||
291 | spin_lock_irq(¤t->sighand->siglock); | ||
292 | current->blocked = *set; | ||
293 | recalc_sigpending(); | ||
294 | spin_unlock_irq(¤t->sighand->siglock); | ||
295 | } | ||
296 | |||
297 | |||
298 | /* | ||
299 | * Handle {get,set,swap}_context operations | ||
300 | */ | ||
301 | int sys_swapcontext(struct ucontext __user *old_ctx, | ||
302 | struct ucontext __user *new_ctx, | ||
303 | long ctx_size, long r6, long r7, long r8, struct pt_regs *regs) | ||
304 | { | ||
305 | unsigned char tmp; | ||
306 | sigset_t set; | ||
307 | |||
308 | /* Context size is for future use. Right now, we only make sure | ||
309 | * we are passed something we understand | ||
310 | */ | ||
311 | if (ctx_size < sizeof(struct ucontext)) | ||
312 | return -EINVAL; | ||
313 | |||
314 | if (old_ctx != NULL) { | ||
315 | if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx)) | ||
316 | || setup_sigcontext(&old_ctx->uc_mcontext, regs, 0, NULL, 0) | ||
317 | || __copy_to_user(&old_ctx->uc_sigmask, | ||
318 | ¤t->blocked, sizeof(sigset_t))) | ||
319 | return -EFAULT; | ||
320 | } | ||
321 | if (new_ctx == NULL) | ||
322 | return 0; | ||
323 | if (!access_ok(VERIFY_READ, new_ctx, sizeof(*new_ctx)) | ||
324 | || __get_user(tmp, (u8 __user *) new_ctx) | ||
325 | || __get_user(tmp, (u8 __user *) (new_ctx + 1) - 1)) | ||
326 | return -EFAULT; | ||
327 | |||
328 | /* | ||
329 | * If we get a fault copying the context into the kernel's | ||
330 | * image of the user's registers, we can't just return -EFAULT | ||
331 | * because the user's registers will be corrupted. For instance | ||
332 | * the NIP value may have been updated but not some of the | ||
333 | * other registers. Given that we have done the access_ok | ||
334 | * and successfully read the first and last bytes of the region | ||
335 | * above, this should only happen in an out-of-memory situation | ||
336 | * or if another thread unmaps the region containing the context. | ||
337 | * We kill the task with a SIGSEGV in this situation. | ||
338 | */ | ||
339 | |||
340 | if (__copy_from_user(&set, &new_ctx->uc_sigmask, sizeof(set))) | ||
341 | do_exit(SIGSEGV); | ||
342 | restore_sigmask(&set); | ||
343 | if (restore_sigcontext(regs, NULL, 0, &new_ctx->uc_mcontext)) | ||
344 | do_exit(SIGSEGV); | ||
345 | |||
346 | /* This returns like rt_sigreturn */ | ||
347 | return 0; | ||
348 | } | ||
349 | |||
350 | |||
351 | /* | ||
352 | * Do a signal return; undo the signal stack. | ||
353 | */ | ||
354 | |||
355 | int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5, | ||
356 | unsigned long r6, unsigned long r7, unsigned long r8, | ||
357 | struct pt_regs *regs) | ||
358 | { | ||
359 | struct ucontext __user *uc = (struct ucontext __user *)regs->gpr[1]; | ||
360 | sigset_t set; | ||
361 | |||
362 | /* Always make any pending restarted system calls return -EINTR */ | ||
363 | current_thread_info()->restart_block.fn = do_no_restart_syscall; | ||
364 | |||
365 | if (!access_ok(VERIFY_READ, uc, sizeof(*uc))) | ||
366 | goto badframe; | ||
367 | |||
368 | if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set))) | ||
369 | goto badframe; | ||
370 | restore_sigmask(&set); | ||
371 | if (restore_sigcontext(regs, NULL, 1, &uc->uc_mcontext)) | ||
372 | goto badframe; | ||
373 | |||
374 | /* do_sigaltstack expects a __user pointer and won't modify | ||
375 | * what's in there anyway | ||
376 | */ | ||
377 | do_sigaltstack(&uc->uc_stack, NULL, regs->gpr[1]); | ||
378 | |||
379 | return regs->result; | ||
380 | |||
381 | badframe: | ||
382 | #if DEBUG_SIG | ||
383 | printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n", | ||
384 | regs, uc, &uc->uc_mcontext); | ||
385 | #endif | ||
386 | force_sig(SIGSEGV, current); | ||
387 | return 0; | ||
388 | } | ||
389 | |||
390 | static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info, | ||
391 | sigset_t *set, struct pt_regs *regs) | ||
392 | { | ||
393 | /* Handler is *really* a pointer to the function descriptor for | ||
394 | * the signal routine. The first entry in the function | ||
395 | * descriptor is the entry address of signal and the second | ||
396 | * entry is the TOC value we need to use. | ||
397 | */ | ||
398 | func_descr_t __user *funct_desc_ptr; | ||
399 | struct rt_sigframe __user *frame; | ||
400 | unsigned long newsp = 0; | ||
401 | long err = 0; | ||
402 | |||
403 | frame = get_sigframe(ka, regs, sizeof(*frame)); | ||
404 | |||
405 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) | ||
406 | goto badframe; | ||
407 | |||
408 | err |= __put_user(&frame->info, &frame->pinfo); | ||
409 | err |= __put_user(&frame->uc, &frame->puc); | ||
410 | err |= copy_siginfo_to_user(&frame->info, info); | ||
411 | if (err) | ||
412 | goto badframe; | ||
413 | |||
414 | /* Create the ucontext. */ | ||
415 | err |= __put_user(0, &frame->uc.uc_flags); | ||
416 | err |= __put_user(0, &frame->uc.uc_link); | ||
417 | err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); | ||
418 | err |= __put_user(sas_ss_flags(regs->gpr[1]), | ||
419 | &frame->uc.uc_stack.ss_flags); | ||
420 | err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); | ||
421 | err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr, NULL, | ||
422 | (unsigned long)ka->sa.sa_handler); | ||
423 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | ||
424 | if (err) | ||
425 | goto badframe; | ||
426 | |||
427 | /* Set up to return from userspace. */ | ||
428 | if (vdso64_rt_sigtramp && current->thread.vdso_base) { | ||
429 | regs->link = current->thread.vdso_base + vdso64_rt_sigtramp; | ||
430 | } else { | ||
431 | err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); | ||
432 | if (err) | ||
433 | goto badframe; | ||
434 | regs->link = (unsigned long) &frame->tramp[0]; | ||
435 | } | ||
436 | funct_desc_ptr = (func_descr_t __user *) ka->sa.sa_handler; | ||
437 | |||
438 | /* Allocate a dummy caller frame for the signal handler. */ | ||
439 | newsp = (unsigned long)frame - __SIGNAL_FRAMESIZE; | ||
440 | err |= put_user(regs->gpr[1], (unsigned long __user *)newsp); | ||
441 | |||
442 | /* Set up "regs" so we "return" to the signal handler. */ | ||
443 | err |= get_user(regs->nip, &funct_desc_ptr->entry); | ||
444 | regs->gpr[1] = newsp; | ||
445 | err |= get_user(regs->gpr[2], &funct_desc_ptr->toc); | ||
446 | regs->gpr[3] = signr; | ||
447 | regs->result = 0; | ||
448 | if (ka->sa.sa_flags & SA_SIGINFO) { | ||
449 | err |= get_user(regs->gpr[4], (unsigned long __user *)&frame->pinfo); | ||
450 | err |= get_user(regs->gpr[5], (unsigned long __user *)&frame->puc); | ||
451 | regs->gpr[6] = (unsigned long) frame; | ||
452 | } else { | ||
453 | regs->gpr[4] = (unsigned long)&frame->uc.uc_mcontext; | ||
454 | } | ||
455 | if (err) | ||
456 | goto badframe; | ||
457 | |||
458 | if (test_thread_flag(TIF_SINGLESTEP)) | ||
459 | ptrace_notify(SIGTRAP); | ||
460 | |||
461 | return 1; | ||
462 | |||
463 | badframe: | ||
464 | #if DEBUG_SIG | ||
465 | printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n", | ||
466 | regs, frame, newsp); | ||
467 | #endif | ||
468 | force_sigsegv(signr, current); | ||
469 | return 0; | ||
470 | } | ||
471 | |||
472 | |||
473 | /* | ||
474 | * OK, we're invoking a handler | ||
475 | */ | ||
476 | static int handle_signal(unsigned long sig, struct k_sigaction *ka, | ||
477 | siginfo_t *info, sigset_t *oldset, struct pt_regs *regs) | ||
478 | { | ||
479 | int ret; | ||
480 | |||
481 | /* Set up Signal Frame */ | ||
482 | ret = setup_rt_frame(sig, ka, info, oldset, regs); | ||
483 | |||
484 | if (ret) { | ||
485 | spin_lock_irq(¤t->sighand->siglock); | ||
486 | sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); | ||
487 | if (!(ka->sa.sa_flags & SA_NODEFER)) | ||
488 | sigaddset(¤t->blocked,sig); | ||
489 | recalc_sigpending(); | ||
490 | spin_unlock_irq(¤t->sighand->siglock); | ||
491 | } | ||
492 | |||
493 | return ret; | ||
494 | } | ||
495 | |||
496 | static inline void syscall_restart(struct pt_regs *regs, struct k_sigaction *ka) | ||
497 | { | ||
498 | switch ((int)regs->result) { | ||
499 | case -ERESTART_RESTARTBLOCK: | ||
500 | case -ERESTARTNOHAND: | ||
501 | /* ERESTARTNOHAND means that the syscall should only be | ||
502 | * restarted if there was no handler for the signal, and since | ||
503 | * we only get here if there is a handler, we dont restart. | ||
504 | */ | ||
505 | regs->result = -EINTR; | ||
506 | break; | ||
507 | case -ERESTARTSYS: | ||
508 | /* ERESTARTSYS means to restart the syscall if there is no | ||
509 | * handler or the handler was registered with SA_RESTART | ||
510 | */ | ||
511 | if (!(ka->sa.sa_flags & SA_RESTART)) { | ||
512 | regs->result = -EINTR; | ||
513 | break; | ||
514 | } | ||
515 | /* fallthrough */ | ||
516 | case -ERESTARTNOINTR: | ||
517 | /* ERESTARTNOINTR means that the syscall should be | ||
518 | * called again after the signal handler returns. | ||
519 | */ | ||
520 | regs->gpr[3] = regs->orig_gpr3; | ||
521 | regs->nip -= 4; | ||
522 | regs->result = 0; | ||
523 | break; | ||
524 | } | ||
525 | } | ||
526 | |||
527 | /* | ||
528 | * Note that 'init' is a special process: it doesn't get signals it doesn't | ||
529 | * want to handle. Thus you cannot kill init even with a SIGKILL even by | ||
530 | * mistake. | ||
531 | */ | ||
532 | int do_signal(sigset_t *oldset, struct pt_regs *regs) | ||
533 | { | ||
534 | siginfo_t info; | ||
535 | int signr; | ||
536 | struct k_sigaction ka; | ||
537 | |||
538 | /* | ||
539 | * If the current thread is 32 bit - invoke the | ||
540 | * 32 bit signal handling code | ||
541 | */ | ||
542 | if (test_thread_flag(TIF_32BIT)) | ||
543 | return do_signal32(oldset, regs); | ||
544 | |||
545 | if (!oldset) | ||
546 | oldset = ¤t->blocked; | ||
547 | |||
548 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); | ||
549 | if (signr > 0) { | ||
550 | /* Whee! Actually deliver the signal. */ | ||
551 | if (TRAP(regs) == 0x0C00) | ||
552 | syscall_restart(regs, &ka); | ||
553 | |||
554 | /* | ||
555 | * Reenable the DABR before delivering the signal to | ||
556 | * user space. The DABR will have been cleared if it | ||
557 | * triggered inside the kernel. | ||
558 | */ | ||
559 | if (current->thread.dabr) | ||
560 | set_dabr(current->thread.dabr); | ||
561 | |||
562 | return handle_signal(signr, &ka, &info, oldset, regs); | ||
563 | } | ||
564 | |||
565 | if (TRAP(regs) == 0x0C00) { /* System Call! */ | ||
566 | if ((int)regs->result == -ERESTARTNOHAND || | ||
567 | (int)regs->result == -ERESTARTSYS || | ||
568 | (int)regs->result == -ERESTARTNOINTR) { | ||
569 | regs->gpr[3] = regs->orig_gpr3; | ||
570 | regs->nip -= 4; /* Back up & retry system call */ | ||
571 | regs->result = 0; | ||
572 | } else if ((int)regs->result == -ERESTART_RESTARTBLOCK) { | ||
573 | regs->gpr[0] = __NR_restart_syscall; | ||
574 | regs->nip -= 4; | ||
575 | regs->result = 0; | ||
576 | } | ||
577 | } | ||
578 | |||
579 | return 0; | ||
580 | } | ||
581 | EXPORT_SYMBOL(do_signal); | ||
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index d8bdaaf74c9b..80b58c1ec412 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -351,7 +351,7 @@ void __init pmac_setup_arch(void) | |||
351 | find_via_pmu(); | 351 | find_via_pmu(); |
352 | smu_init(); | 352 | smu_init(); |
353 | 353 | ||
354 | #ifdef CONFIG_NVRAM | 354 | #if defined(CONFIG_NVRAM) || defined(CONFIG_PPC64) |
355 | pmac_nvram_init(); | 355 | pmac_nvram_init(); |
356 | #endif | 356 | #endif |
357 | 357 | ||
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 2d57f588151d..e3fc3407bb1f 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
@@ -21,15 +21,6 @@ config EEH | |||
21 | depends on PPC_PSERIES | 21 | depends on PPC_PSERIES |
22 | default y if !EMBEDDED | 22 | default y if !EMBEDDED |
23 | 23 | ||
24 | config RTAS_PROC | ||
25 | bool "Proc interface to RTAS" | ||
26 | depends on PPC_RTAS | ||
27 | default y | ||
28 | |||
29 | config RTAS_FLASH | ||
30 | tristate "Firmware flash interface" | ||
31 | depends on PPC64 && RTAS_PROC | ||
32 | |||
33 | config SCANLOG | 24 | config SCANLOG |
34 | tristate "Scanlog dump interface" | 25 | tristate "Scanlog dump interface" |
35 | depends on RTAS_PROC && PPC_PSERIES | 26 | depends on RTAS_PROC && PPC_PSERIES |
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 91909a844736..b9938fece781 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ | 1 | obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ |
2 | setup.o iommu.o ras.o | 2 | setup.o iommu.o ras.o rtasd.o |
3 | obj-$(CONFIG_SMP) += smp.o | 3 | obj-$(CONFIG_SMP) += smp.o |
4 | obj-$(CONFIG_IBMVIO) += vio.o | 4 | obj-$(CONFIG_IBMVIO) += vio.o |
5 | obj-$(CONFIG_XICS) += xics.o | 5 | obj-$(CONFIG_XICS) += xics.o |
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 9e58a1922109..513e27231493 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -499,7 +499,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti | |||
499 | 499 | ||
500 | switch (action) { | 500 | switch (action) { |
501 | case PSERIES_RECONFIG_REMOVE: | 501 | case PSERIES_RECONFIG_REMOVE: |
502 | if (pci->iommu_table && | 502 | if (pci && pci->iommu_table && |
503 | get_property(np, "ibm,dma-window", NULL)) | 503 | get_property(np, "ibm,dma-window", NULL)) |
504 | iommu_free_table(np); | 504 | iommu_free_table(np); |
505 | break; | 505 | break; |
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c new file mode 100644 index 000000000000..e26b0420b6dd --- /dev/null +++ b/arch/powerpc/platforms/pseries/rtasd.c | |||
@@ -0,0 +1,527 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version | ||
7 | * 2 of the License, or (at your option) any later version. | ||
8 | * | ||
9 | * Communication to userspace based on kernel/printk.c | ||
10 | */ | ||
11 | |||
12 | #include <linux/types.h> | ||
13 | #include <linux/errno.h> | ||
14 | #include <linux/sched.h> | ||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/poll.h> | ||
17 | #include <linux/proc_fs.h> | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/vmalloc.h> | ||
20 | #include <linux/spinlock.h> | ||
21 | #include <linux/cpu.h> | ||
22 | #include <linux/delay.h> | ||
23 | |||
24 | #include <asm/uaccess.h> | ||
25 | #include <asm/io.h> | ||
26 | #include <asm/rtas.h> | ||
27 | #include <asm/prom.h> | ||
28 | #include <asm/nvram.h> | ||
29 | #include <asm/atomic.h> | ||
30 | #include <asm/systemcfg.h> | ||
31 | |||
32 | #if 0 | ||
33 | #define DEBUG(A...) printk(KERN_ERR A) | ||
34 | #else | ||
35 | #define DEBUG(A...) | ||
36 | #endif | ||
37 | |||
38 | static DEFINE_SPINLOCK(rtasd_log_lock); | ||
39 | |||
40 | DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait); | ||
41 | |||
42 | static char *rtas_log_buf; | ||
43 | static unsigned long rtas_log_start; | ||
44 | static unsigned long rtas_log_size; | ||
45 | |||
46 | static int surveillance_timeout = -1; | ||
47 | static unsigned int rtas_event_scan_rate; | ||
48 | static unsigned int rtas_error_log_max; | ||
49 | static unsigned int rtas_error_log_buffer_max; | ||
50 | |||
51 | static int full_rtas_msgs = 0; | ||
52 | |||
53 | extern int no_logging; | ||
54 | |||
55 | volatile int error_log_cnt = 0; | ||
56 | |||
57 | /* | ||
58 | * Since we use 32 bit RTAS, the physical address of this must be below | ||
59 | * 4G or else bad things happen. Allocate this in the kernel data and | ||
60 | * make it big enough. | ||
61 | */ | ||
62 | static unsigned char logdata[RTAS_ERROR_LOG_MAX]; | ||
63 | |||
64 | static int get_eventscan_parms(void); | ||
65 | |||
66 | static char *rtas_type[] = { | ||
67 | "Unknown", "Retry", "TCE Error", "Internal Device Failure", | ||
68 | "Timeout", "Data Parity", "Address Parity", "Cache Parity", | ||
69 | "Address Invalid", "ECC Uncorrected", "ECC Corrupted", | ||
70 | }; | ||
71 | |||
72 | static char *rtas_event_type(int type) | ||
73 | { | ||
74 | if ((type > 0) && (type < 11)) | ||
75 | return rtas_type[type]; | ||
76 | |||
77 | switch (type) { | ||
78 | case RTAS_TYPE_EPOW: | ||
79 | return "EPOW"; | ||
80 | case RTAS_TYPE_PLATFORM: | ||
81 | return "Platform Error"; | ||
82 | case RTAS_TYPE_IO: | ||
83 | return "I/O Event"; | ||
84 | case RTAS_TYPE_INFO: | ||
85 | return "Platform Information Event"; | ||
86 | case RTAS_TYPE_DEALLOC: | ||
87 | return "Resource Deallocation Event"; | ||
88 | case RTAS_TYPE_DUMP: | ||
89 | return "Dump Notification Event"; | ||
90 | } | ||
91 | |||
92 | return rtas_type[0]; | ||
93 | } | ||
94 | |||
95 | /* To see this info, grep RTAS /var/log/messages and each entry | ||
96 | * will be collected together with obvious begin/end. | ||
97 | * There will be a unique identifier on the begin and end lines. | ||
98 | * This will persist across reboots. | ||
99 | * | ||
100 | * format of error logs returned from RTAS: | ||
101 | * bytes (size) : contents | ||
102 | * -------------------------------------------------------- | ||
103 | * 0-7 (8) : rtas_error_log | ||
104 | * 8-47 (40) : extended info | ||
105 | * 48-51 (4) : vendor id | ||
106 | * 52-1023 (vendor specific) : location code and debug data | ||
107 | */ | ||
108 | static void printk_log_rtas(char *buf, int len) | ||
109 | { | ||
110 | |||
111 | int i,j,n = 0; | ||
112 | int perline = 16; | ||
113 | char buffer[64]; | ||
114 | char * str = "RTAS event"; | ||
115 | |||
116 | if (full_rtas_msgs) { | ||
117 | printk(RTAS_DEBUG "%d -------- %s begin --------\n", | ||
118 | error_log_cnt, str); | ||
119 | |||
120 | /* | ||
121 | * Print perline bytes on each line, each line will start | ||
122 | * with RTAS and a changing number, so syslogd will | ||
123 | * print lines that are otherwise the same. Separate every | ||
124 | * 4 bytes with a space. | ||
125 | */ | ||
126 | for (i = 0; i < len; i++) { | ||
127 | j = i % perline; | ||
128 | if (j == 0) { | ||
129 | memset(buffer, 0, sizeof(buffer)); | ||
130 | n = sprintf(buffer, "RTAS %d:", i/perline); | ||
131 | } | ||
132 | |||
133 | if ((i % 4) == 0) | ||
134 | n += sprintf(buffer+n, " "); | ||
135 | |||
136 | n += sprintf(buffer+n, "%02x", (unsigned char)buf[i]); | ||
137 | |||
138 | if (j == (perline-1)) | ||
139 | printk(KERN_DEBUG "%s\n", buffer); | ||
140 | } | ||
141 | if ((i % perline) != 0) | ||
142 | printk(KERN_DEBUG "%s\n", buffer); | ||
143 | |||
144 | printk(RTAS_DEBUG "%d -------- %s end ----------\n", | ||
145 | error_log_cnt, str); | ||
146 | } else { | ||
147 | struct rtas_error_log *errlog = (struct rtas_error_log *)buf; | ||
148 | |||
149 | printk(RTAS_DEBUG "event: %d, Type: %s, Severity: %d\n", | ||
150 | error_log_cnt, rtas_event_type(errlog->type), | ||
151 | errlog->severity); | ||
152 | } | ||
153 | } | ||
154 | |||
155 | static int log_rtas_len(char * buf) | ||
156 | { | ||
157 | int len; | ||
158 | struct rtas_error_log *err; | ||
159 | |||
160 | /* rtas fixed header */ | ||
161 | len = 8; | ||
162 | err = (struct rtas_error_log *)buf; | ||
163 | if (err->extended_log_length) { | ||
164 | |||
165 | /* extended header */ | ||
166 | len += err->extended_log_length; | ||
167 | } | ||
168 | |||
169 | if (rtas_error_log_max == 0) { | ||
170 | get_eventscan_parms(); | ||
171 | } | ||
172 | if (len > rtas_error_log_max) | ||
173 | len = rtas_error_log_max; | ||
174 | |||
175 | return len; | ||
176 | } | ||
177 | |||
178 | /* | ||
179 | * First write to nvram, if fatal error, that is the only | ||
180 | * place we log the info. The error will be picked up | ||
181 | * on the next reboot by rtasd. If not fatal, run the | ||
182 | * method for the type of error. Currently, only RTAS | ||
183 | * errors have methods implemented, but in the future | ||
184 | * there might be a need to store data in nvram before a | ||
185 | * call to panic(). | ||
186 | * | ||
187 | * XXX We write to nvram periodically, to indicate error has | ||
188 | * been written and sync'd, but there is a possibility | ||
189 | * that if we don't shutdown correctly, a duplicate error | ||
190 | * record will be created on next reboot. | ||
191 | */ | ||
192 | void pSeries_log_error(char *buf, unsigned int err_type, int fatal) | ||
193 | { | ||
194 | unsigned long offset; | ||
195 | unsigned long s; | ||
196 | int len = 0; | ||
197 | |||
198 | DEBUG("logging event\n"); | ||
199 | if (buf == NULL) | ||
200 | return; | ||
201 | |||
202 | spin_lock_irqsave(&rtasd_log_lock, s); | ||
203 | |||
204 | /* get length and increase count */ | ||
205 | switch (err_type & ERR_TYPE_MASK) { | ||
206 | case ERR_TYPE_RTAS_LOG: | ||
207 | len = log_rtas_len(buf); | ||
208 | if (!(err_type & ERR_FLAG_BOOT)) | ||
209 | error_log_cnt++; | ||
210 | break; | ||
211 | case ERR_TYPE_KERNEL_PANIC: | ||
212 | default: | ||
213 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
214 | return; | ||
215 | } | ||
216 | |||
217 | /* Write error to NVRAM */ | ||
218 | if (!no_logging && !(err_type & ERR_FLAG_BOOT)) | ||
219 | nvram_write_error_log(buf, len, err_type); | ||
220 | |||
221 | /* | ||
222 | * rtas errors can occur during boot, and we do want to capture | ||
223 | * those somewhere, even if nvram isn't ready (why not?), and even | ||
224 | * if rtasd isn't ready. Put them into the boot log, at least. | ||
225 | */ | ||
226 | if ((err_type & ERR_TYPE_MASK) == ERR_TYPE_RTAS_LOG) | ||
227 | printk_log_rtas(buf, len); | ||
228 | |||
229 | /* Check to see if we need to or have stopped logging */ | ||
230 | if (fatal || no_logging) { | ||
231 | no_logging = 1; | ||
232 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
233 | return; | ||
234 | } | ||
235 | |||
236 | /* call type specific method for error */ | ||
237 | switch (err_type & ERR_TYPE_MASK) { | ||
238 | case ERR_TYPE_RTAS_LOG: | ||
239 | offset = rtas_error_log_buffer_max * | ||
240 | ((rtas_log_start+rtas_log_size) & LOG_NUMBER_MASK); | ||
241 | |||
242 | /* First copy over sequence number */ | ||
243 | memcpy(&rtas_log_buf[offset], (void *) &error_log_cnt, sizeof(int)); | ||
244 | |||
245 | /* Second copy over error log data */ | ||
246 | offset += sizeof(int); | ||
247 | memcpy(&rtas_log_buf[offset], buf, len); | ||
248 | |||
249 | if (rtas_log_size < LOG_NUMBER) | ||
250 | rtas_log_size += 1; | ||
251 | else | ||
252 | rtas_log_start += 1; | ||
253 | |||
254 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
255 | wake_up_interruptible(&rtas_log_wait); | ||
256 | break; | ||
257 | case ERR_TYPE_KERNEL_PANIC: | ||
258 | default: | ||
259 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
260 | return; | ||
261 | } | ||
262 | |||
263 | } | ||
264 | |||
265 | |||
266 | static int rtas_log_open(struct inode * inode, struct file * file) | ||
267 | { | ||
268 | return 0; | ||
269 | } | ||
270 | |||
271 | static int rtas_log_release(struct inode * inode, struct file * file) | ||
272 | { | ||
273 | return 0; | ||
274 | } | ||
275 | |||
276 | /* This will check if all events are logged, if they are then, we | ||
277 | * know that we can safely clear the events in NVRAM. | ||
278 | * Next we'll sit and wait for something else to log. | ||
279 | */ | ||
280 | static ssize_t rtas_log_read(struct file * file, char __user * buf, | ||
281 | size_t count, loff_t *ppos) | ||
282 | { | ||
283 | int error; | ||
284 | char *tmp; | ||
285 | unsigned long s; | ||
286 | unsigned long offset; | ||
287 | |||
288 | if (!buf || count < rtas_error_log_buffer_max) | ||
289 | return -EINVAL; | ||
290 | |||
291 | count = rtas_error_log_buffer_max; | ||
292 | |||
293 | if (!access_ok(VERIFY_WRITE, buf, count)) | ||
294 | return -EFAULT; | ||
295 | |||
296 | tmp = kmalloc(count, GFP_KERNEL); | ||
297 | if (!tmp) | ||
298 | return -ENOMEM; | ||
299 | |||
300 | |||
301 | spin_lock_irqsave(&rtasd_log_lock, s); | ||
302 | /* if it's 0, then we know we got the last one (the one in NVRAM) */ | ||
303 | if (rtas_log_size == 0 && !no_logging) | ||
304 | nvram_clear_error_log(); | ||
305 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
306 | |||
307 | |||
308 | error = wait_event_interruptible(rtas_log_wait, rtas_log_size); | ||
309 | if (error) | ||
310 | goto out; | ||
311 | |||
312 | spin_lock_irqsave(&rtasd_log_lock, s); | ||
313 | offset = rtas_error_log_buffer_max * (rtas_log_start & LOG_NUMBER_MASK); | ||
314 | memcpy(tmp, &rtas_log_buf[offset], count); | ||
315 | |||
316 | rtas_log_start += 1; | ||
317 | rtas_log_size -= 1; | ||
318 | spin_unlock_irqrestore(&rtasd_log_lock, s); | ||
319 | |||
320 | error = copy_to_user(buf, tmp, count) ? -EFAULT : count; | ||
321 | out: | ||
322 | kfree(tmp); | ||
323 | return error; | ||
324 | } | ||
325 | |||
326 | static unsigned int rtas_log_poll(struct file *file, poll_table * wait) | ||
327 | { | ||
328 | poll_wait(file, &rtas_log_wait, wait); | ||
329 | if (rtas_log_size) | ||
330 | return POLLIN | POLLRDNORM; | ||
331 | return 0; | ||
332 | } | ||
333 | |||
334 | struct file_operations proc_rtas_log_operations = { | ||
335 | .read = rtas_log_read, | ||
336 | .poll = rtas_log_poll, | ||
337 | .open = rtas_log_open, | ||
338 | .release = rtas_log_release, | ||
339 | }; | ||
340 | |||
341 | static int enable_surveillance(int timeout) | ||
342 | { | ||
343 | int error; | ||
344 | |||
345 | error = rtas_set_indicator(SURVEILLANCE_TOKEN, 0, timeout); | ||
346 | |||
347 | if (error == 0) | ||
348 | return 0; | ||
349 | |||
350 | if (error == -EINVAL) { | ||
351 | printk(KERN_INFO "rtasd: surveillance not supported\n"); | ||
352 | return 0; | ||
353 | } | ||
354 | |||
355 | printk(KERN_ERR "rtasd: could not update surveillance\n"); | ||
356 | return -1; | ||
357 | } | ||
358 | |||
359 | static int get_eventscan_parms(void) | ||
360 | { | ||
361 | struct device_node *node; | ||
362 | int *ip; | ||
363 | |||
364 | node = of_find_node_by_path("/rtas"); | ||
365 | |||
366 | ip = (int *)get_property(node, "rtas-event-scan-rate", NULL); | ||
367 | if (ip == NULL) { | ||
368 | printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n"); | ||
369 | of_node_put(node); | ||
370 | return -1; | ||
371 | } | ||
372 | rtas_event_scan_rate = *ip; | ||
373 | DEBUG("rtas-event-scan-rate %d\n", rtas_event_scan_rate); | ||
374 | |||
375 | /* Make room for the sequence number */ | ||
376 | rtas_error_log_max = rtas_get_error_log_max(); | ||
377 | rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int); | ||
378 | |||
379 | of_node_put(node); | ||
380 | |||
381 | return 0; | ||
382 | } | ||
383 | |||
384 | static void do_event_scan(int event_scan) | ||
385 | { | ||
386 | int error; | ||
387 | do { | ||
388 | memset(logdata, 0, rtas_error_log_max); | ||
389 | error = rtas_call(event_scan, 4, 1, NULL, | ||
390 | RTAS_EVENT_SCAN_ALL_EVENTS, 0, | ||
391 | __pa(logdata), rtas_error_log_max); | ||
392 | if (error == -1) { | ||
393 | printk(KERN_ERR "event-scan failed\n"); | ||
394 | break; | ||
395 | } | ||
396 | |||
397 | if (error == 0) | ||
398 | pSeries_log_error(logdata, ERR_TYPE_RTAS_LOG, 0); | ||
399 | |||
400 | } while(error == 0); | ||
401 | } | ||
402 | |||
403 | static void do_event_scan_all_cpus(long delay) | ||
404 | { | ||
405 | int cpu; | ||
406 | |||
407 | lock_cpu_hotplug(); | ||
408 | cpu = first_cpu(cpu_online_map); | ||
409 | for (;;) { | ||
410 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); | ||
411 | do_event_scan(rtas_token("event-scan")); | ||
412 | set_cpus_allowed(current, CPU_MASK_ALL); | ||
413 | |||
414 | /* Drop hotplug lock, and sleep for the specified delay */ | ||
415 | unlock_cpu_hotplug(); | ||
416 | msleep_interruptible(delay); | ||
417 | lock_cpu_hotplug(); | ||
418 | |||
419 | cpu = next_cpu(cpu, cpu_online_map); | ||
420 | if (cpu == NR_CPUS) | ||
421 | break; | ||
422 | } | ||
423 | unlock_cpu_hotplug(); | ||
424 | } | ||
425 | |||
426 | static int rtasd(void *unused) | ||
427 | { | ||
428 | unsigned int err_type; | ||
429 | int event_scan = rtas_token("event-scan"); | ||
430 | int rc; | ||
431 | |||
432 | daemonize("rtasd"); | ||
433 | |||
434 | if (event_scan == RTAS_UNKNOWN_SERVICE || get_eventscan_parms() == -1) | ||
435 | goto error; | ||
436 | |||
437 | rtas_log_buf = vmalloc(rtas_error_log_buffer_max*LOG_NUMBER); | ||
438 | if (!rtas_log_buf) { | ||
439 | printk(KERN_ERR "rtasd: no memory\n"); | ||
440 | goto error; | ||
441 | } | ||
442 | |||
443 | printk(KERN_INFO "RTAS daemon started\n"); | ||
444 | |||
445 | DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate)); | ||
446 | |||
447 | /* See if we have any error stored in NVRAM */ | ||
448 | memset(logdata, 0, rtas_error_log_max); | ||
449 | |||
450 | rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type); | ||
451 | |||
452 | /* We can use rtas_log_buf now */ | ||
453 | no_logging = 0; | ||
454 | |||
455 | if (!rc) { | ||
456 | if (err_type != ERR_FLAG_ALREADY_LOGGED) { | ||
457 | pSeries_log_error(logdata, err_type | ERR_FLAG_BOOT, 0); | ||
458 | } | ||
459 | } | ||
460 | |||
461 | /* First pass. */ | ||
462 | do_event_scan_all_cpus(1000); | ||
463 | |||
464 | if (surveillance_timeout != -1) { | ||
465 | DEBUG("enabling surveillance\n"); | ||
466 | enable_surveillance(surveillance_timeout); | ||
467 | DEBUG("surveillance enabled\n"); | ||
468 | } | ||
469 | |||
470 | /* Delay should be at least one second since some | ||
471 | * machines have problems if we call event-scan too | ||
472 | * quickly. */ | ||
473 | for (;;) | ||
474 | do_event_scan_all_cpus(30000/rtas_event_scan_rate); | ||
475 | |||
476 | error: | ||
477 | /* Should delete proc entries */ | ||
478 | return -EINVAL; | ||
479 | } | ||
480 | |||
481 | static int __init rtas_init(void) | ||
482 | { | ||
483 | struct proc_dir_entry *entry; | ||
484 | |||
485 | /* No RTAS, only warn if we are on a pSeries box */ | ||
486 | if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) { | ||
487 | if (systemcfg->platform & PLATFORM_PSERIES) | ||
488 | printk(KERN_INFO "rtasd: no event-scan on system\n"); | ||
489 | return 1; | ||
490 | } | ||
491 | |||
492 | entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL); | ||
493 | if (entry) | ||
494 | entry->proc_fops = &proc_rtas_log_operations; | ||
495 | else | ||
496 | printk(KERN_ERR "Failed to create error_log proc entry\n"); | ||
497 | |||
498 | if (kernel_thread(rtasd, NULL, CLONE_FS) < 0) | ||
499 | printk(KERN_ERR "Failed to start RTAS daemon\n"); | ||
500 | |||
501 | return 0; | ||
502 | } | ||
503 | |||
504 | static int __init surveillance_setup(char *str) | ||
505 | { | ||
506 | int i; | ||
507 | |||
508 | if (get_option(&str,&i)) { | ||
509 | if (i >= 0 && i <= 255) | ||
510 | surveillance_timeout = i; | ||
511 | } | ||
512 | |||
513 | return 1; | ||
514 | } | ||
515 | |||
516 | static int __init rtasmsgs_setup(char *str) | ||
517 | { | ||
518 | if (strcmp(str, "on") == 0) | ||
519 | full_rtas_msgs = 1; | ||
520 | else if (strcmp(str, "off") == 0) | ||
521 | full_rtas_msgs = 0; | ||
522 | |||
523 | return 1; | ||
524 | } | ||
525 | __initcall(rtas_init); | ||
526 | __setup("surveillance=", surveillance_setup); | ||
527 | __setup("rtasmsgs=", rtasmsgs_setup); | ||
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index d54e1e4c7c63..65bee939eecc 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -602,9 +602,9 @@ struct machdep_calls __initdata pSeries_md = { | |||
602 | .pcibios_fixup = pSeries_final_fixup, | 602 | .pcibios_fixup = pSeries_final_fixup, |
603 | .pci_probe_mode = pSeries_pci_probe_mode, | 603 | .pci_probe_mode = pSeries_pci_probe_mode, |
604 | .irq_bus_setup = pSeries_irq_bus_setup, | 604 | .irq_bus_setup = pSeries_irq_bus_setup, |
605 | .restart = rtas_fw_restart, | 605 | .restart = rtas_restart, |
606 | .power_off = rtas_fw_power_off, | 606 | .power_off = rtas_power_off, |
607 | .halt = rtas_fw_halt, | 607 | .halt = rtas_halt, |
608 | .panic = rtas_os_term, | 608 | .panic = rtas_os_term, |
609 | .cpu_die = pSeries_mach_cpu_die, | 609 | .cpu_die = pSeries_mach_cpu_die, |
610 | .get_boot_time = rtas_get_boot_time, | 610 | .get_boot_time = rtas_get_boot_time, |