diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-03-26 10:24:01 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-03-26 10:24:10 -0400 |
commit | f5daba1d4116d964435ddd99f32b6c80448a496b (patch) | |
tree | 0c4ace40971e9cc455b556a3d5691b64a24044b5 /arch/s390 | |
parent | 70193af9188113c9b4ff3dde1aed9f9c8f7c4f93 (diff) |
[S390] split/move machine check handler code
Split machine check handler code and move it to cio and kernel code
where it belongs to. No functional change.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/crw.h | 68 | ||||
-rw-r--r-- | arch/s390/include/asm/nmi.h | 66 | ||||
-rw-r--r-- | arch/s390/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/s390/kernel/nmi.c | 383 | ||||
-rw-r--r-- | arch/s390/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
6 files changed, 520 insertions, 5 deletions
diff --git a/arch/s390/include/asm/crw.h b/arch/s390/include/asm/crw.h new file mode 100644 index 000000000000..2185a6d619d3 --- /dev/null +++ b/arch/s390/include/asm/crw.h | |||
@@ -0,0 +1,68 @@ | |||
1 | /* | ||
2 | * Data definitions for channel report processing | ||
3 | * Copyright IBM Corp. 2000,2009 | ||
4 | * Author(s): Ingo Adlung <adlung@de.ibm.com>, | ||
5 | * Martin Schwidefsky <schwidefsky@de.ibm.com>, | ||
6 | * Cornelia Huck <cornelia.huck@de.ibm.com>, | ||
7 | * Heiko Carstens <heiko.carstens@de.ibm.com>, | ||
8 | */ | ||
9 | |||
10 | #ifndef _ASM_S390_CRW_H | ||
11 | #define _ASM_S390_CRW_H | ||
12 | |||
13 | #include <linux/types.h> | ||
14 | |||
15 | /* | ||
16 | * Channel Report Word | ||
17 | */ | ||
18 | struct crw { | ||
19 | __u32 res1 : 1; /* reserved zero */ | ||
20 | __u32 slct : 1; /* solicited */ | ||
21 | __u32 oflw : 1; /* overflow */ | ||
22 | __u32 chn : 1; /* chained */ | ||
23 | __u32 rsc : 4; /* reporting source code */ | ||
24 | __u32 anc : 1; /* ancillary report */ | ||
25 | __u32 res2 : 1; /* reserved zero */ | ||
26 | __u32 erc : 6; /* error-recovery code */ | ||
27 | __u32 rsid : 16; /* reporting-source ID */ | ||
28 | } __attribute__ ((packed)); | ||
29 | |||
30 | typedef void (*crw_handler_t)(struct crw *, struct crw *, int); | ||
31 | |||
32 | extern int crw_register_handler(int rsc, crw_handler_t handler); | ||
33 | extern void crw_unregister_handler(int rsc); | ||
34 | extern void crw_handle_channel_report(void); | ||
35 | |||
36 | #define NR_RSCS 16 | ||
37 | |||
38 | #define CRW_RSC_MONITOR 0x2 /* monitoring facility */ | ||
39 | #define CRW_RSC_SCH 0x3 /* subchannel */ | ||
40 | #define CRW_RSC_CPATH 0x4 /* channel path */ | ||
41 | #define CRW_RSC_CONFIG 0x9 /* configuration-alert facility */ | ||
42 | #define CRW_RSC_CSS 0xB /* channel subsystem */ | ||
43 | |||
44 | #define CRW_ERC_EVENT 0x00 /* event information pending */ | ||
45 | #define CRW_ERC_AVAIL 0x01 /* available */ | ||
46 | #define CRW_ERC_INIT 0x02 /* initialized */ | ||
47 | #define CRW_ERC_TERROR 0x03 /* temporary error */ | ||
48 | #define CRW_ERC_IPARM 0x04 /* installed parm initialized */ | ||
49 | #define CRW_ERC_TERM 0x05 /* terminal */ | ||
50 | #define CRW_ERC_PERRN 0x06 /* perm. error, fac. not init */ | ||
51 | #define CRW_ERC_PERRI 0x07 /* perm. error, facility init */ | ||
52 | #define CRW_ERC_PMOD 0x08 /* installed parameters modified */ | ||
53 | |||
54 | static inline int stcrw(struct crw *pcrw) | ||
55 | { | ||
56 | int ccode; | ||
57 | |||
58 | asm volatile( | ||
59 | " stcrw 0(%2)\n" | ||
60 | " ipm %0\n" | ||
61 | " srl %0,28\n" | ||
62 | : "=d" (ccode), "=m" (*pcrw) | ||
63 | : "a" (pcrw) | ||
64 | : "cc" ); | ||
65 | return ccode; | ||
66 | } | ||
67 | |||
68 | #endif /* _ASM_S390_CRW_H */ | ||
diff --git a/arch/s390/include/asm/nmi.h b/arch/s390/include/asm/nmi.h new file mode 100644 index 000000000000..f4b60441adca --- /dev/null +++ b/arch/s390/include/asm/nmi.h | |||
@@ -0,0 +1,66 @@ | |||
1 | /* | ||
2 | * Machine check handler definitions | ||
3 | * | ||
4 | * Copyright IBM Corp. 2000,2009 | ||
5 | * Author(s): Ingo Adlung <adlung@de.ibm.com>, | ||
6 | * Martin Schwidefsky <schwidefsky@de.ibm.com>, | ||
7 | * Cornelia Huck <cornelia.huck@de.ibm.com>, | ||
8 | * Heiko Carstens <heiko.carstens@de.ibm.com>, | ||
9 | */ | ||
10 | |||
11 | #ifndef _ASM_S390_NMI_H | ||
12 | #define _ASM_S390_NMI_H | ||
13 | |||
14 | #include <linux/types.h> | ||
15 | |||
16 | struct mci { | ||
17 | __u32 sd : 1; /* 00 system damage */ | ||
18 | __u32 pd : 1; /* 01 instruction-processing damage */ | ||
19 | __u32 sr : 1; /* 02 system recovery */ | ||
20 | __u32 : 1; /* 03 */ | ||
21 | __u32 cd : 1; /* 04 timing-facility damage */ | ||
22 | __u32 ed : 1; /* 05 external damage */ | ||
23 | __u32 : 1; /* 06 */ | ||
24 | __u32 dg : 1; /* 07 degradation */ | ||
25 | __u32 w : 1; /* 08 warning pending */ | ||
26 | __u32 cp : 1; /* 09 channel-report pending */ | ||
27 | __u32 sp : 1; /* 10 service-processor damage */ | ||
28 | __u32 ck : 1; /* 11 channel-subsystem damage */ | ||
29 | __u32 : 2; /* 12-13 */ | ||
30 | __u32 b : 1; /* 14 backed up */ | ||
31 | __u32 : 1; /* 15 */ | ||
32 | __u32 se : 1; /* 16 storage error uncorrected */ | ||
33 | __u32 sc : 1; /* 17 storage error corrected */ | ||
34 | __u32 ke : 1; /* 18 storage-key error uncorrected */ | ||
35 | __u32 ds : 1; /* 19 storage degradation */ | ||
36 | __u32 wp : 1; /* 20 psw mwp validity */ | ||
37 | __u32 ms : 1; /* 21 psw mask and key validity */ | ||
38 | __u32 pm : 1; /* 22 psw program mask and cc validity */ | ||
39 | __u32 ia : 1; /* 23 psw instruction address validity */ | ||
40 | __u32 fa : 1; /* 24 failing storage address validity */ | ||
41 | __u32 : 1; /* 25 */ | ||
42 | __u32 ec : 1; /* 26 external damage code validity */ | ||
43 | __u32 fp : 1; /* 27 floating point register validity */ | ||
44 | __u32 gr : 1; /* 28 general register validity */ | ||
45 | __u32 cr : 1; /* 29 control register validity */ | ||
46 | __u32 : 1; /* 30 */ | ||
47 | __u32 st : 1; /* 31 storage logical validity */ | ||
48 | __u32 ie : 1; /* 32 indirect storage error */ | ||
49 | __u32 ar : 1; /* 33 access register validity */ | ||
50 | __u32 da : 1; /* 34 delayed access exception */ | ||
51 | __u32 : 7; /* 35-41 */ | ||
52 | __u32 pr : 1; /* 42 tod programmable register validity */ | ||
53 | __u32 fc : 1; /* 43 fp control register validity */ | ||
54 | __u32 ap : 1; /* 44 ancillary report */ | ||
55 | __u32 : 1; /* 45 */ | ||
56 | __u32 ct : 1; /* 46 cpu timer validity */ | ||
57 | __u32 cc : 1; /* 47 clock comparator validity */ | ||
58 | __u32 : 16; /* 47-63 */ | ||
59 | }; | ||
60 | |||
61 | struct pt_regs; | ||
62 | |||
63 | extern void s390_handle_mcck(void); | ||
64 | extern void s390_do_machine_check(struct pt_regs *regs); | ||
65 | |||
66 | #endif /* _ASM_S390_NMI_H */ | ||
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 33e7aee70513..228e3105ded7 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile | |||
@@ -22,7 +22,7 @@ CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w | |||
22 | obj-y := bitmap.o traps.o time.o process.o base.o early.o setup.o \ | 22 | obj-y := bitmap.o traps.o time.o process.o base.o early.o setup.o \ |
23 | processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ | 23 | processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ |
24 | s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \ | 24 | s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \ |
25 | vdso.o vtime.o sysinfo.o | 25 | vdso.o vtime.o sysinfo.o nmi.o |
26 | 26 | ||
27 | obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) | 27 | obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) |
28 | obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) | 28 | obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) |
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c new file mode 100644 index 000000000000..8d50eaf76a60 --- /dev/null +++ b/arch/s390/kernel/nmi.c | |||
@@ -0,0 +1,383 @@ | |||
1 | /* | ||
2 | * Machine check handler | ||
3 | * | ||
4 | * Copyright IBM Corp. 2000,2009 | ||
5 | * Author(s): Ingo Adlung <adlung@de.ibm.com>, | ||
6 | * Martin Schwidefsky <schwidefsky@de.ibm.com>, | ||
7 | * Cornelia Huck <cornelia.huck@de.ibm.com>, | ||
8 | * Heiko Carstens <heiko.carstens@de.ibm.com>, | ||
9 | */ | ||
10 | |||
11 | #include <linux/init.h> | ||
12 | #include <linux/errno.h> | ||
13 | #include <linux/time.h> | ||
14 | #include <linux/module.h> | ||
15 | #include <asm/lowcore.h> | ||
16 | #include <asm/smp.h> | ||
17 | #include <asm/etr.h> | ||
18 | #include <asm/cpu.h> | ||
19 | #include <asm/nmi.h> | ||
20 | #include <asm/crw.h> | ||
21 | |||
22 | struct mcck_struct { | ||
23 | int kill_task; | ||
24 | int channel_report; | ||
25 | int warning; | ||
26 | unsigned long long mcck_code; | ||
27 | }; | ||
28 | |||
29 | static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck); | ||
30 | |||
31 | static NORET_TYPE void s390_handle_damage(char *msg) | ||
32 | { | ||
33 | smp_send_stop(); | ||
34 | disabled_wait((unsigned long) __builtin_return_address(0)); | ||
35 | while (1); | ||
36 | } | ||
37 | |||
38 | /* | ||
39 | * Main machine check handler function. Will be called with interrupts enabled | ||
40 | * or disabled and machine checks enabled or disabled. | ||
41 | */ | ||
42 | void s390_handle_mcck(void) | ||
43 | { | ||
44 | unsigned long flags; | ||
45 | struct mcck_struct mcck; | ||
46 | |||
47 | /* | ||
48 | * Disable machine checks and get the current state of accumulated | ||
49 | * machine checks. Afterwards delete the old state and enable machine | ||
50 | * checks again. | ||
51 | */ | ||
52 | local_irq_save(flags); | ||
53 | local_mcck_disable(); | ||
54 | mcck = __get_cpu_var(cpu_mcck); | ||
55 | memset(&__get_cpu_var(cpu_mcck), 0, sizeof(struct mcck_struct)); | ||
56 | clear_thread_flag(TIF_MCCK_PENDING); | ||
57 | local_mcck_enable(); | ||
58 | local_irq_restore(flags); | ||
59 | |||
60 | if (mcck.channel_report) | ||
61 | crw_handle_channel_report(); | ||
62 | |||
63 | #ifdef CONFIG_MACHCHK_WARNING | ||
64 | /* | ||
65 | * The warning may remain for a prolonged period on the bare iron. | ||
66 | * (actually till the machine is powered off, or until the problem is gone) | ||
67 | * So we just stop listening for the WARNING MCH and prevent continuously | ||
68 | * being interrupted. One caveat is however, that we must do this per | ||
69 | * processor and cannot use the smp version of ctl_clear_bit(). | ||
70 | * On VM we only get one interrupt per virtally presented machinecheck. | ||
71 | * Though one suffices, we may get one interrupt per (virtual) processor. | ||
72 | */ | ||
73 | if (mcck.warning) { /* WARNING pending ? */ | ||
74 | static int mchchk_wng_posted = 0; | ||
75 | /* | ||
76 | * Use single machine clear, as we cannot handle smp right now | ||
77 | */ | ||
78 | __ctl_clear_bit(14, 24); /* Disable WARNING MCH */ | ||
79 | if (xchg(&mchchk_wng_posted, 1) == 0) | ||
80 | kill_cad_pid(SIGPWR, 1); | ||
81 | } | ||
82 | #endif | ||
83 | |||
84 | if (mcck.kill_task) { | ||
85 | local_irq_enable(); | ||
86 | printk(KERN_EMERG "mcck: Terminating task because of machine " | ||
87 | "malfunction (code 0x%016llx).\n", mcck.mcck_code); | ||
88 | printk(KERN_EMERG "mcck: task: %s, pid: %d.\n", | ||
89 | current->comm, current->pid); | ||
90 | do_exit(SIGSEGV); | ||
91 | } | ||
92 | } | ||
93 | EXPORT_SYMBOL_GPL(s390_handle_mcck); | ||
94 | |||
95 | /* | ||
96 | * returns 0 if all registers could be validated | ||
97 | * returns 1 otherwise | ||
98 | */ | ||
99 | static int notrace s390_revalidate_registers(struct mci *mci) | ||
100 | { | ||
101 | int kill_task; | ||
102 | u64 tmpclock; | ||
103 | u64 zero; | ||
104 | void *fpt_save_area, *fpt_creg_save_area; | ||
105 | |||
106 | kill_task = 0; | ||
107 | zero = 0; | ||
108 | |||
109 | if (!mci->gr) { | ||
110 | /* | ||
111 | * General purpose registers couldn't be restored and have | ||
112 | * unknown contents. Process needs to be terminated. | ||
113 | */ | ||
114 | kill_task = 1; | ||
115 | } | ||
116 | if (!mci->fp) { | ||
117 | /* | ||
118 | * Floating point registers can't be restored and | ||
119 | * therefore the process needs to be terminated. | ||
120 | */ | ||
121 | kill_task = 1; | ||
122 | } | ||
123 | #ifndef CONFIG_64BIT | ||
124 | asm volatile( | ||
125 | " ld 0,0(%0)\n" | ||
126 | " ld 2,8(%0)\n" | ||
127 | " ld 4,16(%0)\n" | ||
128 | " ld 6,24(%0)" | ||
129 | : : "a" (&S390_lowcore.floating_pt_save_area)); | ||
130 | #endif | ||
131 | |||
132 | if (MACHINE_HAS_IEEE) { | ||
133 | #ifdef CONFIG_64BIT | ||
134 | fpt_save_area = &S390_lowcore.floating_pt_save_area; | ||
135 | fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area; | ||
136 | #else | ||
137 | fpt_save_area = (void *) S390_lowcore.extended_save_area_addr; | ||
138 | fpt_creg_save_area = fpt_save_area + 128; | ||
139 | #endif | ||
140 | if (!mci->fc) { | ||
141 | /* | ||
142 | * Floating point control register can't be restored. | ||
143 | * Task will be terminated. | ||
144 | */ | ||
145 | asm volatile("lfpc 0(%0)" : : "a" (&zero), "m" (zero)); | ||
146 | kill_task = 1; | ||
147 | |||
148 | } else | ||
149 | asm volatile("lfpc 0(%0)" : : "a" (fpt_creg_save_area)); | ||
150 | |||
151 | asm volatile( | ||
152 | " ld 0,0(%0)\n" | ||
153 | " ld 1,8(%0)\n" | ||
154 | " ld 2,16(%0)\n" | ||
155 | " ld 3,24(%0)\n" | ||
156 | " ld 4,32(%0)\n" | ||
157 | " ld 5,40(%0)\n" | ||
158 | " ld 6,48(%0)\n" | ||
159 | " ld 7,56(%0)\n" | ||
160 | " ld 8,64(%0)\n" | ||
161 | " ld 9,72(%0)\n" | ||
162 | " ld 10,80(%0)\n" | ||
163 | " ld 11,88(%0)\n" | ||
164 | " ld 12,96(%0)\n" | ||
165 | " ld 13,104(%0)\n" | ||
166 | " ld 14,112(%0)\n" | ||
167 | " ld 15,120(%0)\n" | ||
168 | : : "a" (fpt_save_area)); | ||
169 | } | ||
170 | /* Revalidate access registers */ | ||
171 | asm volatile( | ||
172 | " lam 0,15,0(%0)" | ||
173 | : : "a" (&S390_lowcore.access_regs_save_area)); | ||
174 | if (!mci->ar) { | ||
175 | /* | ||
176 | * Access registers have unknown contents. | ||
177 | * Terminating task. | ||
178 | */ | ||
179 | kill_task = 1; | ||
180 | } | ||
181 | /* Revalidate control registers */ | ||
182 | if (!mci->cr) { | ||
183 | /* | ||
184 | * Control registers have unknown contents. | ||
185 | * Can't recover and therefore stopping machine. | ||
186 | */ | ||
187 | s390_handle_damage("invalid control registers."); | ||
188 | } else { | ||
189 | #ifdef CONFIG_64BIT | ||
190 | asm volatile( | ||
191 | " lctlg 0,15,0(%0)" | ||
192 | : : "a" (&S390_lowcore.cregs_save_area)); | ||
193 | #else | ||
194 | asm volatile( | ||
195 | " lctl 0,15,0(%0)" | ||
196 | : : "a" (&S390_lowcore.cregs_save_area)); | ||
197 | #endif | ||
198 | } | ||
199 | /* | ||
200 | * We don't even try to revalidate the TOD register, since we simply | ||
201 | * can't write something sensible into that register. | ||
202 | */ | ||
203 | #ifdef CONFIG_64BIT | ||
204 | /* | ||
205 | * See if we can revalidate the TOD programmable register with its | ||
206 | * old contents (should be zero) otherwise set it to zero. | ||
207 | */ | ||
208 | if (!mci->pr) | ||
209 | asm volatile( | ||
210 | " sr 0,0\n" | ||
211 | " sckpf" | ||
212 | : : : "0", "cc"); | ||
213 | else | ||
214 | asm volatile( | ||
215 | " l 0,0(%0)\n" | ||
216 | " sckpf" | ||
217 | : : "a" (&S390_lowcore.tod_progreg_save_area) | ||
218 | : "0", "cc"); | ||
219 | #endif | ||
220 | /* Revalidate clock comparator register */ | ||
221 | asm volatile( | ||
222 | " stck 0(%1)\n" | ||
223 | " sckc 0(%1)" | ||
224 | : "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory"); | ||
225 | |||
226 | /* Check if old PSW is valid */ | ||
227 | if (!mci->wp) | ||
228 | /* | ||
229 | * Can't tell if we come from user or kernel mode | ||
230 | * -> stopping machine. | ||
231 | */ | ||
232 | s390_handle_damage("old psw invalid."); | ||
233 | |||
234 | if (!mci->ms || !mci->pm || !mci->ia) | ||
235 | kill_task = 1; | ||
236 | |||
237 | return kill_task; | ||
238 | } | ||
239 | |||
240 | #define MAX_IPD_COUNT 29 | ||
241 | #define MAX_IPD_TIME (5 * 60 * USEC_PER_SEC) /* 5 minutes */ | ||
242 | |||
243 | #define ED_STP_ISLAND 6 /* External damage STP island check */ | ||
244 | #define ED_STP_SYNC 7 /* External damage STP sync check */ | ||
245 | #define ED_ETR_SYNC 12 /* External damage ETR sync check */ | ||
246 | #define ED_ETR_SWITCH 13 /* External damage ETR switch to local */ | ||
247 | |||
248 | /* | ||
249 | * machine check handler. | ||
250 | */ | ||
251 | void notrace s390_do_machine_check(struct pt_regs *regs) | ||
252 | { | ||
253 | static int ipd_count; | ||
254 | static DEFINE_SPINLOCK(ipd_lock); | ||
255 | static unsigned long long last_ipd; | ||
256 | struct mcck_struct *mcck; | ||
257 | unsigned long long tmp; | ||
258 | struct mci *mci; | ||
259 | int umode; | ||
260 | |||
261 | lockdep_off(); | ||
262 | s390_idle_check(); | ||
263 | |||
264 | mci = (struct mci *) &S390_lowcore.mcck_interruption_code; | ||
265 | mcck = &__get_cpu_var(cpu_mcck); | ||
266 | umode = user_mode(regs); | ||
267 | |||
268 | if (mci->sd) { | ||
269 | /* System damage -> stopping machine */ | ||
270 | s390_handle_damage("received system damage machine check."); | ||
271 | } | ||
272 | if (mci->pd) { | ||
273 | if (mci->b) { | ||
274 | /* Processing backup -> verify if we can survive this */ | ||
275 | u64 z_mcic, o_mcic, t_mcic; | ||
276 | #ifdef CONFIG_64BIT | ||
277 | z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29); | ||
278 | o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 | | ||
279 | 1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 | | ||
280 | 1ULL<<30 | 1ULL<<21 | 1ULL<<20 | 1ULL<<17 | | ||
281 | 1ULL<<16); | ||
282 | #else | ||
283 | z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<57 | 1ULL<<50 | | ||
284 | 1ULL<<29); | ||
285 | o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 | | ||
286 | 1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 | | ||
287 | 1ULL<<30 | 1ULL<<20 | 1ULL<<17 | 1ULL<<16); | ||
288 | #endif | ||
289 | t_mcic = *(u64 *)mci; | ||
290 | |||
291 | if (((t_mcic & z_mcic) != 0) || | ||
292 | ((t_mcic & o_mcic) != o_mcic)) { | ||
293 | s390_handle_damage("processing backup machine " | ||
294 | "check with damage."); | ||
295 | } | ||
296 | |||
297 | /* | ||
298 | * Nullifying exigent condition, therefore we might | ||
299 | * retry this instruction. | ||
300 | */ | ||
301 | spin_lock(&ipd_lock); | ||
302 | tmp = get_clock(); | ||
303 | if (((tmp - last_ipd) >> 12) < MAX_IPD_TIME) | ||
304 | ipd_count++; | ||
305 | else | ||
306 | ipd_count = 1; | ||
307 | last_ipd = tmp; | ||
308 | if (ipd_count == MAX_IPD_COUNT) | ||
309 | s390_handle_damage("too many ipd retries."); | ||
310 | spin_unlock(&ipd_lock); | ||
311 | } else { | ||
312 | /* Processing damage -> stopping machine */ | ||
313 | s390_handle_damage("received instruction processing " | ||
314 | "damage machine check."); | ||
315 | } | ||
316 | } | ||
317 | if (s390_revalidate_registers(mci)) { | ||
318 | if (umode) { | ||
319 | /* | ||
320 | * Couldn't restore all register contents while in | ||
321 | * user mode -> mark task for termination. | ||
322 | */ | ||
323 | mcck->kill_task = 1; | ||
324 | mcck->mcck_code = *(unsigned long long *) mci; | ||
325 | set_thread_flag(TIF_MCCK_PENDING); | ||
326 | } else { | ||
327 | /* | ||
328 | * Couldn't restore all register contents while in | ||
329 | * kernel mode -> stopping machine. | ||
330 | */ | ||
331 | s390_handle_damage("unable to revalidate registers."); | ||
332 | } | ||
333 | } | ||
334 | if (mci->cd) { | ||
335 | /* Timing facility damage */ | ||
336 | s390_handle_damage("TOD clock damaged"); | ||
337 | } | ||
338 | if (mci->ed && mci->ec) { | ||
339 | /* External damage */ | ||
340 | if (S390_lowcore.external_damage_code & (1U << ED_ETR_SYNC)) | ||
341 | etr_sync_check(); | ||
342 | if (S390_lowcore.external_damage_code & (1U << ED_ETR_SWITCH)) | ||
343 | etr_switch_to_local(); | ||
344 | if (S390_lowcore.external_damage_code & (1U << ED_STP_SYNC)) | ||
345 | stp_sync_check(); | ||
346 | if (S390_lowcore.external_damage_code & (1U << ED_STP_ISLAND)) | ||
347 | stp_island_check(); | ||
348 | } | ||
349 | if (mci->se) | ||
350 | /* Storage error uncorrected */ | ||
351 | s390_handle_damage("received storage error uncorrected " | ||
352 | "machine check."); | ||
353 | if (mci->ke) | ||
354 | /* Storage key-error uncorrected */ | ||
355 | s390_handle_damage("received storage key-error uncorrected " | ||
356 | "machine check."); | ||
357 | if (mci->ds && mci->fa) | ||
358 | /* Storage degradation */ | ||
359 | s390_handle_damage("received storage degradation machine " | ||
360 | "check."); | ||
361 | if (mci->cp) { | ||
362 | /* Channel report word pending */ | ||
363 | mcck->channel_report = 1; | ||
364 | set_thread_flag(TIF_MCCK_PENDING); | ||
365 | } | ||
366 | if (mci->w) { | ||
367 | /* Warning pending */ | ||
368 | mcck->warning = 1; | ||
369 | set_thread_flag(TIF_MCCK_PENDING); | ||
370 | } | ||
371 | lockdep_on(); | ||
372 | } | ||
373 | |||
374 | static int __init machine_check_init(void) | ||
375 | { | ||
376 | ctl_set_bit(14, 25); /* enable external damage MCH */ | ||
377 | ctl_set_bit(14, 27); /* enable system recovery MCH */ | ||
378 | #ifdef CONFIG_MACHCHK_WARNING | ||
379 | ctl_set_bit(14, 24); /* enable warning MCH */ | ||
380 | #endif | ||
381 | return 0; | ||
382 | } | ||
383 | arch_initcall(machine_check_init); | ||
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index e6b480625cb3..bd616fb31e75 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <asm/processor.h> | 39 | #include <asm/processor.h> |
40 | #include <asm/irq.h> | 40 | #include <asm/irq.h> |
41 | #include <asm/timer.h> | 41 | #include <asm/timer.h> |
42 | #include <asm/nmi.h> | ||
42 | #include "entry.h" | 43 | #include "entry.h" |
43 | 44 | ||
44 | asmlinkage void ret_from_fork(void) asm ("ret_from_fork"); | 45 | asmlinkage void ret_from_fork(void) asm ("ret_from_fork"); |
@@ -68,7 +69,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
68 | return sf->gprs[8]; | 69 | return sf->gprs[8]; |
69 | } | 70 | } |
70 | 71 | ||
71 | extern void s390_handle_mcck(void); | ||
72 | /* | 72 | /* |
73 | * The idle loop on a S390... | 73 | * The idle loop on a S390... |
74 | */ | 74 | */ |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index c55a4b9ffd88..caa4d2877016 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
24 | #include <asm/lowcore.h> | 24 | #include <asm/lowcore.h> |
25 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
26 | 26 | #include <asm/nmi.h> | |
27 | #include "kvm-s390.h" | 27 | #include "kvm-s390.h" |
28 | #include "gaccess.h" | 28 | #include "gaccess.h" |
29 | 29 | ||
@@ -440,8 +440,6 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, | |||
440 | return -EINVAL; /* not implemented yet */ | 440 | return -EINVAL; /* not implemented yet */ |
441 | } | 441 | } |
442 | 442 | ||
443 | extern void s390_handle_mcck(void); | ||
444 | |||
445 | static void __vcpu_run(struct kvm_vcpu *vcpu) | 443 | static void __vcpu_run(struct kvm_vcpu *vcpu) |
446 | { | 444 | { |
447 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); | 445 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); |