[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>

[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>
Heiko Carstens · Martin Schwidefsky
1 parent 70193af918
Showing 15 changed files with 677 additions and 676 deletions Side-by-side Diff
arch/s390/include/asm/crw.h
arch/s390/include/asm/nmi.h
arch/s390/kernel/Makefile
arch/s390/kernel/nmi.c
arch/s390/kernel/process.c
arch/s390/kvm/kvm-s390.c
drivers/s390/Makefile
drivers/s390/cio/Makefile
drivers/s390/cio/chp.c
drivers/s390/cio/chsc.c
drivers/s390/cio/cio.c
drivers/s390/cio/crw.c
drivers/s390/cio/css.c
drivers/s390/s390mach.c
drivers/s390/s390mach.h
+/*
+ *   Data definitions for channel report processing
+ *    Copyright IBM Corp. 2000,2009
+ *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
+ *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *		 Cornelia Huck <cornelia.huck@de.ibm.com>,
+ *		 Heiko Carstens <heiko.carstens@de.ibm.com>,
+ */
+
+#ifndef _ASM_S390_CRW_H
+#define _ASM_S390_CRW_H
+
+#include <linux/types.h>
+
+/*
+ * Channel Report Word
+ */
+struct crw {
+	__u32 res1 :  1;   /* reserved zero */
+	__u32 slct :  1;   /* solicited */
+	__u32 oflw :  1;   /* overflow */
+	__u32 chn  :  1;   /* chained */
+	__u32 rsc  :  4;   /* reporting source code */
+	__u32 anc  :  1;   /* ancillary report */
+	__u32 res2 :  1;   /* reserved zero */
+	__u32 erc  :  6;   /* error-recovery code */
+	__u32 rsid : 16;   /* reporting-source ID */
+} __attribute__ ((packed));
+
+typedef void (*crw_handler_t)(struct crw *, struct crw *, int);
+
+extern int crw_register_handler(int rsc, crw_handler_t handler);
+extern void crw_unregister_handler(int rsc);
+extern void crw_handle_channel_report(void);
+
+#define NR_RSCS 16
+
+#define CRW_RSC_MONITOR  0x2  /* monitoring facility */
+#define CRW_RSC_SCH	 0x3  /* subchannel */
+#define CRW_RSC_CPATH	 0x4  /* channel path */
+#define CRW_RSC_CONFIG	 0x9  /* configuration-alert facility */
+#define CRW_RSC_CSS	 0xB  /* channel subsystem */
+
+#define CRW_ERC_EVENT	 0x00 /* event information pending */
+#define CRW_ERC_AVAIL	 0x01 /* available */
+#define CRW_ERC_INIT	 0x02 /* initialized */
+#define CRW_ERC_TERROR	 0x03 /* temporary error */
+#define CRW_ERC_IPARM	 0x04 /* installed parm initialized */
+#define CRW_ERC_TERM	 0x05 /* terminal */
+#define CRW_ERC_PERRN	 0x06 /* perm. error, fac. not init */
+#define CRW_ERC_PERRI	 0x07 /* perm. error, facility init */
+#define CRW_ERC_PMOD	 0x08 /* installed parameters modified */
+
+static inline int stcrw(struct crw *pcrw)
+{
+	int ccode;
+
+	asm volatile(
+		"	stcrw	0(%2)\n"
+		"	ipm	%0\n"
+		"	srl	%0,28\n"
+		: "=d" (ccode), "=m" (*pcrw)
+		: "a" (pcrw)
+		: "cc" );
+	return ccode;
+}
+
+#endif /* _ASM_S390_CRW_H */
+/*
+ *   Machine check handler definitions
+ *
+ *    Copyright IBM Corp. 2000,2009
+ *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
+ *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *		 Cornelia Huck <cornelia.huck@de.ibm.com>,
+ *		 Heiko Carstens <heiko.carstens@de.ibm.com>,
+ */
+
+#ifndef _ASM_S390_NMI_H
+#define _ASM_S390_NMI_H
+
+#include <linux/types.h>
+
+struct mci {
+	__u32 sd :  1; /* 00 system damage */
+	__u32 pd :  1; /* 01 instruction-processing damage */
+	__u32 sr :  1; /* 02 system recovery */
+	__u32	 :  1; /* 03 */
+	__u32 cd :  1; /* 04 timing-facility damage */
+	__u32 ed :  1; /* 05 external damage */
+	__u32	 :  1; /* 06 */
+	__u32 dg :  1; /* 07 degradation */
+	__u32 w  :  1; /* 08 warning pending */
+	__u32 cp :  1; /* 09 channel-report pending */
+	__u32 sp :  1; /* 10 service-processor damage */
+	__u32 ck :  1; /* 11 channel-subsystem damage */
+	__u32	 :  2; /* 12-13 */
+	__u32 b  :  1; /* 14 backed up */
+	__u32	 :  1; /* 15 */
+	__u32 se :  1; /* 16 storage error uncorrected */
+	__u32 sc :  1; /* 17 storage error corrected */
+	__u32 ke :  1; /* 18 storage-key error uncorrected */
+	__u32 ds :  1; /* 19 storage degradation */
+	__u32 wp :  1; /* 20 psw mwp validity */
+	__u32 ms :  1; /* 21 psw mask and key validity */
+	__u32 pm :  1; /* 22 psw program mask and cc validity */
+	__u32 ia :  1; /* 23 psw instruction address validity */
+	__u32 fa :  1; /* 24 failing storage address validity */
+	__u32	 :  1; /* 25 */
+	__u32 ec :  1; /* 26 external damage code validity */
+	__u32 fp :  1; /* 27 floating point register validity */
+	__u32 gr :  1; /* 28 general register validity */
+	__u32 cr :  1; /* 29 control register validity */
+	__u32	 :  1; /* 30 */
+	__u32 st :  1; /* 31 storage logical validity */
+	__u32 ie :  1; /* 32 indirect storage error */
+	__u32 ar :  1; /* 33 access register validity */
+	__u32 da :  1; /* 34 delayed access exception */
+	__u32	 :  7; /* 35-41 */
+	__u32 pr :  1; /* 42 tod programmable register validity */
+	__u32 fc :  1; /* 43 fp control register validity */
+	__u32 ap :  1; /* 44 ancillary report */
+	__u32	 :  1; /* 45 */
+	__u32 ct :  1; /* 46 cpu timer validity */
+	__u32 cc :  1; /* 47 clock comparator validity */
+	__u32	 : 16; /* 47-63 */
+};
+
+struct pt_regs;
+
+extern void s390_handle_mcck(void);
+extern void s390_do_machine_check(struct pt_regs *regs);
+
+#endif /* _ASM_S390_NMI_H */
@@ -22,7 +22,7 @@
 obj-y	:=  bitmap.o traps.o time.o process.o base.o early.o setup.o \
 	    processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
 	    s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \
-	    vdso.o vtime.o sysinfo.o
+	    vdso.o vtime.o sysinfo.o nmi.o
  
 obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
+/*
+ *   Machine check handler
+ *
+ *    Copyright IBM Corp. 2000,2009
+ *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
+ *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *		 Cornelia Huck <cornelia.huck@de.ibm.com>,
+ *		 Heiko Carstens <heiko.carstens@de.ibm.com>,
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/time.h>
+#include <linux/module.h>
+#include <asm/lowcore.h>
+#include <asm/smp.h>
+#include <asm/etr.h>
+#include <asm/cpu.h>
+#include <asm/nmi.h>
+#include <asm/crw.h>
+
+struct mcck_struct {
+	int kill_task;
+	int channel_report;
+	int warning;
+	unsigned long long mcck_code;
+};
+
+static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
+
+static NORET_TYPE void s390_handle_damage(char *msg)
+{
+	smp_send_stop();
+	disabled_wait((unsigned long) __builtin_return_address(0));
+	while (1);
+}
+
+/*
+ * Main machine check handler function. Will be called with interrupts enabled
+ * or disabled and machine checks enabled or disabled.
+ */
+void s390_handle_mcck(void)
+{
+	unsigned long flags;
+	struct mcck_struct mcck;
+
+	/*
+	 * Disable machine checks and get the current state of accumulated
+	 * machine checks. Afterwards delete the old state and enable machine
+	 * checks again.
+	 */
+	local_irq_save(flags);
+	local_mcck_disable();
+	mcck = __get_cpu_var(cpu_mcck);
+	memset(&__get_cpu_var(cpu_mcck), 0, sizeof(struct mcck_struct));
+	clear_thread_flag(TIF_MCCK_PENDING);
+	local_mcck_enable();
+	local_irq_restore(flags);
+
+	if (mcck.channel_report)
+		crw_handle_channel_report();
+
+#ifdef CONFIG_MACHCHK_WARNING
+/*
+ * The warning may remain for a prolonged period on the bare iron.
+ * (actually till the machine is powered off, or until the problem is gone)
+ * So we just stop listening for the WARNING MCH and prevent continuously
+ * being interrupted.  One caveat is however, that we must do this per
+ * processor and cannot use the smp version of ctl_clear_bit().
+ * On VM we only get one interrupt per virtally presented machinecheck.
+ * Though one suffices, we may get one interrupt per (virtual) processor.
+ */
+	if (mcck.warning) {	/* WARNING pending ? */
+		static int mchchk_wng_posted = 0;
+		/*
+		 * Use single machine clear, as we cannot handle smp right now
+		 */
+		__ctl_clear_bit(14, 24);	/* Disable WARNING MCH */
+		if (xchg(&mchchk_wng_posted, 1) == 0)
+			kill_cad_pid(SIGPWR, 1);
+	}
+#endif
+
+	if (mcck.kill_task) {
+		local_irq_enable();
+		printk(KERN_EMERG "mcck: Terminating task because of machine "
+		       "malfunction (code 0x%016llx).\n", mcck.mcck_code);
+		printk(KERN_EMERG "mcck: task: %s, pid: %d.\n",
+		       current->comm, current->pid);
+		do_exit(SIGSEGV);
+	}
+}
+EXPORT_SYMBOL_GPL(s390_handle_mcck);
+
+/*
+ * returns 0 if all registers could be validated
+ * returns 1 otherwise
+ */
+static int notrace s390_revalidate_registers(struct mci *mci)
+{
+	int kill_task;
+	u64 tmpclock;
+	u64 zero;
+	void *fpt_save_area, *fpt_creg_save_area;
+
+	kill_task = 0;
+	zero = 0;
+
+	if (!mci->gr) {
+		/*
+		 * General purpose registers couldn't be restored and have
+		 * unknown contents. Process needs to be terminated.
+		 */
+		kill_task = 1;
+	}
+	if (!mci->fp) {
+		/*
+		 * Floating point registers can't be restored and
+		 * therefore the process needs to be terminated.
+		 */
+		kill_task = 1;
+	}
+#ifndef CONFIG_64BIT
+	asm volatile(
+		"	ld	0,0(%0)\n"
+		"	ld	2,8(%0)\n"
+		"	ld	4,16(%0)\n"
+		"	ld	6,24(%0)"
+		: : "a" (&S390_lowcore.floating_pt_save_area));
+#endif
+
+	if (MACHINE_HAS_IEEE) {
+#ifdef CONFIG_64BIT
+		fpt_save_area = &S390_lowcore.floating_pt_save_area;
+		fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;
+#else
+		fpt_save_area = (void *) S390_lowcore.extended_save_area_addr;
+		fpt_creg_save_area = fpt_save_area + 128;
+#endif
+		if (!mci->fc) {
+			/*
+			 * Floating point control register can't be restored.
+			 * Task will be terminated.
+			 */
+			asm volatile("lfpc 0(%0)" : : "a" (&zero), "m" (zero));
+			kill_task = 1;
+
+		} else
+			asm volatile("lfpc 0(%0)" : : "a" (fpt_creg_save_area));
+
+		asm volatile(
+			"	ld	0,0(%0)\n"
+			"	ld	1,8(%0)\n"
+			"	ld	2,16(%0)\n"
+			"	ld	3,24(%0)\n"
+			"	ld	4,32(%0)\n"
+			"	ld	5,40(%0)\n"
+			"	ld	6,48(%0)\n"
+			"	ld	7,56(%0)\n"
+			"	ld	8,64(%0)\n"
+			"	ld	9,72(%0)\n"
+			"	ld	10,80(%0)\n"
+			"	ld	11,88(%0)\n"
+			"	ld	12,96(%0)\n"
+			"	ld	13,104(%0)\n"
+			"	ld	14,112(%0)\n"
+			"	ld	15,120(%0)\n"
+			: : "a" (fpt_save_area));
+	}
+	/* Revalidate access registers */
+	asm volatile(
+		"	lam	0,15,0(%0)"
+		: : "a" (&S390_lowcore.access_regs_save_area));
+	if (!mci->ar) {
+		/*
+		 * Access registers have unknown contents.
+		 * Terminating task.
+		 */
+		kill_task = 1;
+	}
+	/* Revalidate control registers */
+	if (!mci->cr) {
+		/*
+		 * Control registers have unknown contents.
+		 * Can't recover and therefore stopping machine.
+		 */
+		s390_handle_damage("invalid control registers.");
+	} else {
+#ifdef CONFIG_64BIT
+		asm volatile(
+			"	lctlg	0,15,0(%0)"
+			: : "a" (&S390_lowcore.cregs_save_area));
+#else
+		asm volatile(
+			"	lctl	0,15,0(%0)"
+			: : "a" (&S390_lowcore.cregs_save_area));
+#endif
+	}
+	/*
+	 * We don't even try to revalidate the TOD register, since we simply
+	 * can't write something sensible into that register.
+	 */
+#ifdef CONFIG_64BIT
+	/*
+	 * See if we can revalidate the TOD programmable register with its
+	 * old contents (should be zero) otherwise set it to zero.
+	 */
+	if (!mci->pr)
+		asm volatile(
+			"	sr	0,0\n"
+			"	sckpf"
+			: : : "0", "cc");
+	else
+		asm volatile(
+			"	l	0,0(%0)\n"
+			"	sckpf"
+			: : "a" (&S390_lowcore.tod_progreg_save_area)
+			: "0", "cc");
+#endif
+	/* Revalidate clock comparator register */
+	asm volatile(
+		"	stck	0(%1)\n"
+		"	sckc	0(%1)"
+		: "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory");
+
+	/* Check if old PSW is valid */
+	if (!mci->wp)
+		/*
+		 * Can't tell if we come from user or kernel mode
+		 * -> stopping machine.
+		 */
+		s390_handle_damage("old psw invalid.");
+
+	if (!mci->ms || !mci->pm || !mci->ia)
+		kill_task = 1;
+
+	return kill_task;
+}
+
+#define MAX_IPD_COUNT	29
+#define MAX_IPD_TIME	(5 * 60 * USEC_PER_SEC) /* 5 minutes */
+
+#define ED_STP_ISLAND	6	/* External damage STP island check */
+#define ED_STP_SYNC	7	/* External damage STP sync check */
+#define ED_ETR_SYNC	12	/* External damage ETR sync check */
+#define ED_ETR_SWITCH	13	/* External damage ETR switch to local */
+
+/*
+ * machine check handler.
+ */
+void notrace s390_do_machine_check(struct pt_regs *regs)
+{
+	static int ipd_count;
+	static DEFINE_SPINLOCK(ipd_lock);
+	static unsigned long long last_ipd;
+	struct mcck_struct *mcck;
+	unsigned long long tmp;
+	struct mci *mci;
+	int umode;
+
+	lockdep_off();
+	s390_idle_check();
+
+	mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
+	mcck = &__get_cpu_var(cpu_mcck);
+	umode = user_mode(regs);
+
+	if (mci->sd) {
+		/* System damage -> stopping machine */
+		s390_handle_damage("received system damage machine check.");
+	}
+	if (mci->pd) {
+		if (mci->b) {
+			/* Processing backup -> verify if we can survive this */
+			u64 z_mcic, o_mcic, t_mcic;
+#ifdef CONFIG_64BIT
+			z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29);
+			o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+				  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+				  1ULL<<30 | 1ULL<<21 | 1ULL<<20 | 1ULL<<17 |
+				  1ULL<<16);
+#else
+			z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<57 | 1ULL<<50 |
+				  1ULL<<29);
+			o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+				  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+				  1ULL<<30 | 1ULL<<20 | 1ULL<<17 | 1ULL<<16);
+#endif
+			t_mcic = *(u64 *)mci;
+
+			if (((t_mcic & z_mcic) != 0) ||
+			    ((t_mcic & o_mcic) != o_mcic)) {
+				s390_handle_damage("processing backup machine "
+						   "check with damage.");
+			}
+
+			/*
+			 * Nullifying exigent condition, therefore we might
+			 * retry this instruction.
+			 */
+			spin_lock(&ipd_lock);
+			tmp = get_clock();
+			if (((tmp - last_ipd) >> 12) < MAX_IPD_TIME)
+				ipd_count++;
+			else
+				ipd_count = 1;
+			last_ipd = tmp;
+			if (ipd_count == MAX_IPD_COUNT)
+				s390_handle_damage("too many ipd retries.");
+			spin_unlock(&ipd_lock);
+		} else {
+			/* Processing damage -> stopping machine */
+			s390_handle_damage("received instruction processing "
+					   "damage machine check.");
+		}
+	}
+	if (s390_revalidate_registers(mci)) {
+		if (umode) {
+			/*
+			 * Couldn't restore all register contents while in
+			 * user mode -> mark task for termination.
+			 */
+			mcck->kill_task = 1;
+			mcck->mcck_code = *(unsigned long long *) mci;
+			set_thread_flag(TIF_MCCK_PENDING);
+		} else {
+			/*
+			 * Couldn't restore all register contents while in
+			 * kernel mode -> stopping machine.
+			 */
+			s390_handle_damage("unable to revalidate registers.");
+		}
+	}
+	if (mci->cd) {
+		/* Timing facility damage */
+		s390_handle_damage("TOD clock damaged");
+	}
+	if (mci->ed && mci->ec) {
+		/* External damage */
+		if (S390_lowcore.external_damage_code & (1U << ED_ETR_SYNC))
+			etr_sync_check();
+		if (S390_lowcore.external_damage_code & (1U << ED_ETR_SWITCH))
+			etr_switch_to_local();
+		if (S390_lowcore.external_damage_code & (1U << ED_STP_SYNC))
+			stp_sync_check();
+		if (S390_lowcore.external_damage_code & (1U << ED_STP_ISLAND))
+			stp_island_check();
+	}
+	if (mci->se)
+		/* Storage error uncorrected */
+		s390_handle_damage("received storage error uncorrected "
+				   "machine check.");
+	if (mci->ke)
+		/* Storage key-error uncorrected */
+		s390_handle_damage("received storage key-error uncorrected "
+				   "machine check.");
+	if (mci->ds && mci->fa)
+		/* Storage degradation */
+		s390_handle_damage("received storage degradation machine "
+				   "check.");
+	if (mci->cp) {
+		/* Channel report word pending */
+		mcck->channel_report = 1;
+		set_thread_flag(TIF_MCCK_PENDING);
+	}
+	if (mci->w) {
+		/* Warning pending */
+		mcck->warning = 1;
+		set_thread_flag(TIF_MCCK_PENDING);
+	}
+	lockdep_on();
+}
+
+static int __init machine_check_init(void)
+{
+	ctl_set_bit(14, 25);	/* enable external damage MCH */
+	ctl_set_bit(14, 27);	/* enable system recovery MCH */
+#ifdef CONFIG_MACHCHK_WARNING
+	ctl_set_bit(14, 24);	/* enable warning MCH */
+#endif
+	return 0;
+}
+arch_initcall(machine_check_init);
@@ -39,6 +39,7 @@
 #include <asm/processor.h>
 #include <asm/irq.h>
 #include <asm/timer.h>
+#include <asm/nmi.h>
 #include "entry.h"
  
 asmlinkage void ret_from_fork(void) asm ("ret_from_fork");
@@ -68,7 +69,6 @@
 	return sf->gprs[8];
 }
  
-extern void s390_handle_mcck(void);
 /*
  * The idle loop on a S390...
  */
@@ -23,7 +23,7 @@
 #include <linux/timer.h>
 #include <asm/lowcore.h>
 #include <asm/pgtable.h>
-
+#include <asm/nmi.h>
 #include "kvm-s390.h"
 #include "gaccess.h"
  
@@ -439,8 +439,6 @@
 {
 	return -EINVAL; /* not implemented yet */
 }
-
-extern void s390_handle_mcck(void);
  
 static void __vcpu_run(struct kvm_vcpu *vcpu)
 {
@@ -2,7 +2,6 @@
 # Makefile for the S/390 specific device drivers
 #
  
-obj-y += s390mach.o
 obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
  
 drivers-y += drivers/s390/built-in.o
@@ -3,7 +3,7 @@
 #
  
 obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o scsw.o \
-	fcx.o itcw.o
+	fcx.o itcw.o crw.o
 ccw_device-objs += device.o device_fsm.o device_ops.o
 ccw_device-objs += device_id.o device_pgid.o device_status.o
 obj-y += ccw_device.o cmf.o
@@ -17,8 +17,8 @@
 #include <linux/errno.h>
 #include <asm/chpid.h>
 #include <asm/sclp.h>
+#include <asm/crw.h>
  
-#include "../s390mach.h"
 #include "cio.h"
 #include "css.h"
 #include "ioasm.h"
  
@@ -706,12 +706,12 @@
 	struct chp_id chpid;
 	int ret;
  
-	ret = s390_register_crw_handler(CRW_RSC_CPATH, chp_process_crw);
+	ret = crw_register_handler(CRW_RSC_CPATH, chp_process_crw);
 	if (ret)
 		return ret;
 	chp_wq = create_singlethread_workqueue("cio_chp");
 	if (!chp_wq) {
-		s390_unregister_crw_handler(CRW_RSC_CPATH);
+		crw_unregister_handler(CRW_RSC_CPATH);
 		return -ENOMEM;
 	}
 	INIT_WORK(&cfg_work, cfg_func);
@@ -19,8 +19,8 @@
 #include <asm/cio.h>
 #include <asm/chpid.h>
 #include <asm/chsc.h>
+#include <asm/crw.h>
  
-#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -820,7 +820,7 @@
 			      "chsc machine checks!\n");
 		return -ENOMEM;
 	}
-	ret = s390_register_crw_handler(CRW_RSC_CSS, chsc_process_crw);
+	ret = crw_register_handler(CRW_RSC_CSS, chsc_process_crw);
 	if (ret)
 		kfree(sei_page);
 	return ret;
@@ -828,7 +828,7 @@
  
 void __init chsc_free_sei_area(void)
 {
-	s390_unregister_crw_handler(CRW_RSC_CSS);
+	crw_unregister_handler(CRW_RSC_CSS);
 	kfree(sei_page);
 }
  
@@ -30,6 +30,8 @@
 #include <asm/isc.h>
 #include <asm/cpu.h>
 #include <asm/fcx.h>
+#include <asm/nmi.h>
+#include <asm/crw.h>
 #include "cio.h"
 #include "css.h"
 #include "chsc.h"
@@ -38,7 +40,6 @@
 #include "blacklist.h"
 #include "cio_debug.h"
 #include "chp.h"
-#include "../s390mach.h"
  
 debug_info_t *cio_debug_msg_id;
 debug_info_t *cio_debug_trace_id;
+/*
+ *   Channel report handling code
+ *
+ *    Copyright IBM Corp. 2000,2009
+ *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
+ *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *		 Cornelia Huck <cornelia.huck@de.ibm.com>,
+ *		 Heiko Carstens <heiko.carstens@de.ibm.com>,
+ */
+
+#include <linux/semaphore.h>
+#include <linux/kthread.h>
+#include <linux/init.h>
+#include <asm/crw.h>
+
+static struct semaphore crw_semaphore;
+static crw_handler_t crw_handlers[NR_RSCS];
+
+/**
+ * crw_register_handler() - register a channel report word handler
+ * @rsc: reporting source code to handle
+ * @handler: handler to be registered
+ *
+ * Returns %0 on success and a negative error value otherwise.
+ */
+int crw_register_handler(int rsc, crw_handler_t handler)
+{
+	if ((rsc < 0) || (rsc >= NR_RSCS))
+		return -EINVAL;
+	if (!cmpxchg(&crw_handlers[rsc], NULL, handler))
+		return 0;
+	return -EBUSY;
+}
+
+/**
+ * crw_unregister_handler() - unregister a channel report word handler
+ * @rsc: reporting source code to handle
+ */
+void crw_unregister_handler(int rsc)
+{
+	if ((rsc < 0) || (rsc >= NR_RSCS))
+		return;
+	xchg(&crw_handlers[rsc], NULL);
+	synchronize_sched();
+}
+
+/*
+ * Retrieve CRWs and call function to handle event.
+ */
+static int crw_collect_info(void *unused)
+{
+	struct crw crw[2];
+	int ccode;
+	unsigned int chain;
+	int ignore;
+
+repeat:
+	ignore = down_interruptible(&crw_semaphore);
+	chain = 0;
+	while (1) {
+		if (unlikely(chain > 1)) {
+			struct crw tmp_crw;
+
+			printk(KERN_WARNING"%s: Code does not support more "
+			       "than two chained crws; please report to "
+			       "linux390@de.ibm.com!\n", __func__);
+			ccode = stcrw(&tmp_crw);
+			printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, "
+			       "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+			       __func__, tmp_crw.slct, tmp_crw.oflw,
+			       tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc,
+			       tmp_crw.erc, tmp_crw.rsid);
+			printk(KERN_WARNING"%s: This was crw number %x in the "
+			       "chain\n", __func__, chain);
+			if (ccode != 0)
+				break;
+			chain = tmp_crw.chn ? chain + 1 : 0;
+			continue;
+		}
+		ccode = stcrw(&crw[chain]);
+		if (ccode != 0)
+			break;
+		printk(KERN_DEBUG "crw_info : CRW reports slct=%d, oflw=%d, "
+		       "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+		       crw[chain].slct, crw[chain].oflw, crw[chain].chn,
+		       crw[chain].rsc, crw[chain].anc, crw[chain].erc,
+		       crw[chain].rsid);
+		/* Check for overflows. */
+		if (crw[chain].oflw) {
+			int i;
+
+			pr_debug("%s: crw overflow detected!\n", __func__);
+			for (i = 0; i < NR_RSCS; i++) {
+				if (crw_handlers[i])
+					crw_handlers[i](NULL, NULL, 1);
+			}
+			chain = 0;
+			continue;
+		}
+		if (crw[0].chn && !chain) {
+			chain++;
+			continue;
+		}
+		if (crw_handlers[crw[chain].rsc])
+			crw_handlers[crw[chain].rsc](&crw[0],
+						     chain ? &crw[1] : NULL,
+						     0);
+		/* chain is always 0 or 1 here. */
+		chain = crw[chain].chn ? chain + 1 : 0;
+	}
+	goto repeat;
+	return 0;
+}
+
+void crw_handle_channel_report(void)
+{
+	up(&crw_semaphore);
+}
+
+/*
+ * Separate initcall needed for semaphore initialization since
+ * crw_handle_channel_report might be called before crw_machine_check_init.
+ */
+static int __init crw_init_semaphore(void)
+{
+	init_MUTEX_LOCKED(&crw_semaphore);
+	return 0;
+}
+pure_initcall(crw_init_semaphore);
+
+/*
+ * Machine checks for the channel subsystem must be enabled
+ * after the channel subsystem is initialized
+ */
+static int __init crw_machine_check_init(void)
+{
+	struct task_struct *task;
+
+	task = kthread_run(crw_collect_info, NULL, "kmcheck");
+	if (IS_ERR(task))
+		return PTR_ERR(task);
+	ctl_set_bit(14, 28);	/* enable channel report MCH */
+	return 0;
+}
+device_initcall(crw_machine_check_init);
@@ -18,8 +18,8 @@
 #include <linux/list.h>
 #include <linux/reboot.h>
 #include <asm/isc.h>
+#include <asm/crw.h>
  
-#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -765,7 +765,7 @@
 	if (ret)
 		goto out;
  
-	ret = s390_register_crw_handler(CRW_RSC_SCH, css_process_crw);
+	ret = crw_register_handler(CRW_RSC_SCH, css_process_crw);
 	if (ret)
 		goto out;
  
@@ -845,7 +845,7 @@
 out_bus:
 	bus_unregister(&css_bus_type);
 out:
-	s390_unregister_crw_handler(CRW_RSC_CSS);
+	crw_unregister_handler(CRW_RSC_CSS);
 	chsc_free_sei_area();
 	kfree(slow_subchannel_set);
 	pr_alert("The CSS device driver initialization failed with "
-/*
- *  drivers/s390/s390mach.c
- *   S/390 machine check handler
- *
- *    Copyright IBM Corp. 2000,2008
- *    Author(s): Ingo Adlung (adlung@de.ibm.com)
- *		 Martin Schwidefsky (schwidefsky@de.ibm.com)
- *		 Cornelia Huck <cornelia.huck@de.ibm.com>
- */
-
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/workqueue.h>
-#include <linux/time.h>
-#include <linux/device.h>
-#include <linux/kthread.h>
-#include <asm/etr.h>
-#include <asm/lowcore.h>
-#include <asm/cio.h>
-#include <asm/cpu.h>
-#include "s390mach.h"
-
-static struct semaphore m_sem;
-
-static NORET_TYPE void
-s390_handle_damage(char *msg)
-{
-#ifdef CONFIG_SMP
-	smp_send_stop();
-#endif
-	disabled_wait((unsigned long) __builtin_return_address(0));
-	for(;;);
-}
-
-static crw_handler_t crw_handlers[NR_RSCS];
-
-/**
- * s390_register_crw_handler() - register a channel report word handler
- * @rsc: reporting source code to handle
- * @handler: handler to be registered
- *
- * Returns %0 on success and a negative error value otherwise.
- */
-int s390_register_crw_handler(int rsc, crw_handler_t handler)
-{
-	if ((rsc < 0) || (rsc >= NR_RSCS))
-		return -EINVAL;
-	if (!cmpxchg(&crw_handlers[rsc], NULL, handler))
-		return 0;
-	return -EBUSY;
-}
-
-/**
- * s390_unregister_crw_handler() - unregister a channel report word handler
- * @rsc: reporting source code to handle
- */
-void s390_unregister_crw_handler(int rsc)
-{
-	if ((rsc < 0) || (rsc >= NR_RSCS))
-		return;
-	xchg(&crw_handlers[rsc], NULL);
-	synchronize_sched();
-}
-
-/*
- * Retrieve CRWs and call function to handle event.
- */
-static int s390_collect_crw_info(void *param)
-{
-	struct crw crw[2];
-	int ccode;
-	struct semaphore *sem;
-	unsigned int chain;
-	int ignore;
-
-	sem = (struct semaphore *)param;
-repeat:
-	ignore = down_interruptible(sem);
-	chain = 0;
-	while (1) {
-		if (unlikely(chain > 1)) {
-			struct crw tmp_crw;
-
-			printk(KERN_WARNING"%s: Code does not support more "
-			       "than two chained crws; please report to "
-			       "linux390@de.ibm.com!\n", __func__);
-			ccode = stcrw(&tmp_crw);
-			printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, "
-			       "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
-			       __func__, tmp_crw.slct, tmp_crw.oflw,
-			       tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc,
-			       tmp_crw.erc, tmp_crw.rsid);
-			printk(KERN_WARNING"%s: This was crw number %x in the "
-			       "chain\n", __func__, chain);
-			if (ccode != 0)
-				break;
-			chain = tmp_crw.chn ? chain + 1 : 0;
-			continue;
-		}
-		ccode = stcrw(&crw[chain]);
-		if (ccode != 0)
-			break;
-		printk(KERN_DEBUG "crw_info : CRW reports slct=%d, oflw=%d, "
-		       "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
-		       crw[chain].slct, crw[chain].oflw, crw[chain].chn,
-		       crw[chain].rsc, crw[chain].anc, crw[chain].erc,
-		       crw[chain].rsid);
-		/* Check for overflows. */
-		if (crw[chain].oflw) {
-			int i;
-
-			pr_debug("%s: crw overflow detected!\n", __func__);
-			for (i = 0; i < NR_RSCS; i++) {
-				if (crw_handlers[i])
-					crw_handlers[i](NULL, NULL, 1);
-			}
-			chain = 0;
-			continue;
-		}
-		if (crw[0].chn && !chain) {
-			chain++;
-			continue;
-		}
-		if (crw_handlers[crw[chain].rsc])
-			crw_handlers[crw[chain].rsc](&crw[0],
-						     chain ? &crw[1] : NULL,
-						     0);
-		/* chain is always 0 or 1 here. */
-		chain = crw[chain].chn ? chain + 1 : 0;
-	}
-	goto repeat;
-	return 0;
-}
-
-struct mcck_struct {
-	int kill_task;
-	int channel_report;
-	int warning;
-	unsigned long long mcck_code;
-};
-
-static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
-
-/*
- * Main machine check handler function. Will be called with interrupts enabled
- * or disabled and machine checks enabled or disabled.
- */
-void
-s390_handle_mcck(void)
-{
-	unsigned long flags;
-	struct mcck_struct mcck;
-
-	/*
-	 * Disable machine checks and get the current state of accumulated
-	 * machine checks. Afterwards delete the old state and enable machine
-	 * checks again.
-	 */
-	local_irq_save(flags);
-	local_mcck_disable();
-	mcck = __get_cpu_var(cpu_mcck);
-	memset(&__get_cpu_var(cpu_mcck), 0, sizeof(struct mcck_struct));
-	clear_thread_flag(TIF_MCCK_PENDING);
-	local_mcck_enable();
-	local_irq_restore(flags);
-
-	if (mcck.channel_report)
-		up(&m_sem);
-
-#ifdef CONFIG_MACHCHK_WARNING
-/*
- * The warning may remain for a prolonged period on the bare iron.
- * (actually till the machine is powered off, or until the problem is gone)
- * So we just stop listening for the WARNING MCH and prevent continuously
- * being interrupted.  One caveat is however, that we must do this per
- * processor and cannot use the smp version of ctl_clear_bit().
- * On VM we only get one interrupt per virtally presented machinecheck.
- * Though one suffices, we may get one interrupt per (virtual) processor.
- */
-	if (mcck.warning) {	/* WARNING pending ? */
-		static int mchchk_wng_posted = 0;
-		/*
-		 * Use single machine clear, as we cannot handle smp right now
-		 */
-		__ctl_clear_bit(14, 24);	/* Disable WARNING MCH */
-		if (xchg(&mchchk_wng_posted, 1) == 0)
-			kill_cad_pid(SIGPWR, 1);
-	}
-#endif
-
-	if (mcck.kill_task) {
-		local_irq_enable();
-		printk(KERN_EMERG "mcck: Terminating task because of machine "
-		       "malfunction (code 0x%016llx).\n", mcck.mcck_code);
-		printk(KERN_EMERG "mcck: task: %s, pid: %d.\n",
-		       current->comm, current->pid);
-		do_exit(SIGSEGV);
-	}
-}
-EXPORT_SYMBOL_GPL(s390_handle_mcck);
-
-/*
- * returns 0 if all registers could be validated
- * returns 1 otherwise
- */
-static int
-s390_revalidate_registers(struct mci *mci)
-{
-	int kill_task;
-	u64 tmpclock;
-	u64 zero;
-	void *fpt_save_area, *fpt_creg_save_area;
-
-	kill_task = 0;
-	zero = 0;
-	/* General purpose registers */
-	if (!mci->gr)
-		/*
-		 * General purpose registers couldn't be restored and have
-		 * unknown contents. Process needs to be terminated.
-		 */
-		kill_task = 1;
-
-	/* Revalidate floating point registers */
-	if (!mci->fp)
-		/*
-		 * Floating point registers can't be restored and
-		 * therefore the process needs to be terminated.
-		 */
-		kill_task = 1;
-
-#ifndef CONFIG_64BIT
-	asm volatile(
-		"	ld	0,0(%0)\n"
-		"	ld	2,8(%0)\n"
-		"	ld	4,16(%0)\n"
-		"	ld	6,24(%0)"
-		: : "a" (&S390_lowcore.floating_pt_save_area));
-#endif
-
-	if (MACHINE_HAS_IEEE) {
-#ifdef CONFIG_64BIT
-		fpt_save_area = &S390_lowcore.floating_pt_save_area;
-		fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;
-#else
-		fpt_save_area = (void *) S390_lowcore.extended_save_area_addr;
-		fpt_creg_save_area = fpt_save_area+128;
-#endif
-		/* Floating point control register */
-		if (!mci->fc) {
-			/*
-			 * Floating point control register can't be restored.
-			 * Task will be terminated.
-			 */
-			asm volatile("lfpc 0(%0)" : : "a" (&zero), "m" (zero));
-			kill_task = 1;
-
-		} else
-			asm volatile("lfpc 0(%0)" : : "a" (fpt_creg_save_area));
-
-		asm volatile(
-			"	ld	0,0(%0)\n"
-			"	ld	1,8(%0)\n"
-			"	ld	2,16(%0)\n"
-			"	ld	3,24(%0)\n"
-			"	ld	4,32(%0)\n"
-			"	ld	5,40(%0)\n"
-			"	ld	6,48(%0)\n"
-			"	ld	7,56(%0)\n"
-			"	ld	8,64(%0)\n"
-			"	ld	9,72(%0)\n"
-			"	ld	10,80(%0)\n"
-			"	ld	11,88(%0)\n"
-			"	ld	12,96(%0)\n"
-			"	ld	13,104(%0)\n"
-			"	ld	14,112(%0)\n"
-			"	ld	15,120(%0)\n"
-			: : "a" (fpt_save_area));
-	}
-
-	/* Revalidate access registers */
-	asm volatile(
-		"	lam	0,15,0(%0)"
-		: : "a" (&S390_lowcore.access_regs_save_area));
-	if (!mci->ar)
-		/*
-		 * Access registers have unknown contents.
-		 * Terminating task.
-		 */
-		kill_task = 1;
-
-	/* Revalidate control registers */
-	if (!mci->cr)
-		/*
-		 * Control registers have unknown contents.
-		 * Can't recover and therefore stopping machine.
-		 */
-		s390_handle_damage("invalid control registers.");
-	else
-#ifdef CONFIG_64BIT
-		asm volatile(
-			"	lctlg	0,15,0(%0)"
-			: : "a" (&S390_lowcore.cregs_save_area));
-#else
-		asm volatile(
-			"	lctl	0,15,0(%0)"
-			: : "a" (&S390_lowcore.cregs_save_area));
-#endif
-
-	/*
-	 * We don't even try to revalidate the TOD register, since we simply
-	 * can't write something sensible into that register.
-	 */
-
-#ifdef CONFIG_64BIT
-	/*
-	 * See if we can revalidate the TOD programmable register with its
-	 * old contents (should be zero) otherwise set it to zero.
-	 */
-	if (!mci->pr)
-		asm volatile(
-			"	sr	0,0\n"
-			"	sckpf"
-			: : : "0", "cc");
-	else
-		asm volatile(
-			"	l	0,0(%0)\n"
-			"	sckpf"
-			: : "a" (&S390_lowcore.tod_progreg_save_area)
-			: "0", "cc");
-#endif
-
-	/* Revalidate clock comparator register */
-	asm volatile(
-		"	stck	0(%1)\n"
-		"	sckc	0(%1)"
-		: "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory");
-
-	/* Check if old PSW is valid */
-	if (!mci->wp)
-		/*
-		 * Can't tell if we come from user or kernel mode
-		 * -> stopping machine.
-		 */
-		s390_handle_damage("old psw invalid.");
-
-	if (!mci->ms || !mci->pm || !mci->ia)
-		kill_task = 1;
-
-	return kill_task;
-}
-
-#define MAX_IPD_COUNT	29
-#define MAX_IPD_TIME	(5 * 60 * USEC_PER_SEC) /* 5 minutes */
-
-/*
- * machine check handler.
- */
-void notrace s390_do_machine_check(struct pt_regs *regs)
-{
-	static DEFINE_SPINLOCK(ipd_lock);
-	static unsigned long long last_ipd;
-	static int ipd_count;
-	unsigned long long tmp;
-	struct mci *mci;
-	struct mcck_struct *mcck;
-	int umode;
-
-	lockdep_off();
-
-	s390_idle_check();
-
-	mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
-	mcck = &__get_cpu_var(cpu_mcck);
-	umode = user_mode(regs);
-
-	if (mci->sd)
-		/* System damage -> stopping machine */
-		s390_handle_damage("received system damage machine check.");
-
-	if (mci->pd) {
-		if (mci->b) {
-			/* Processing backup -> verify if we can survive this */
-			u64 z_mcic, o_mcic, t_mcic;
-#ifdef CONFIG_64BIT
-			z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29);
-			o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
-				  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
-				  1ULL<<30 | 1ULL<<21 | 1ULL<<20 | 1ULL<<17 |
-				  1ULL<<16);
-#else
-			z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<57 | 1ULL<<50 |
-				  1ULL<<29);
-			o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
-				  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
-				  1ULL<<30 | 1ULL<<20 | 1ULL<<17 | 1ULL<<16);
-#endif
-			t_mcic = *(u64 *)mci;
-
-			if (((t_mcic & z_mcic) != 0) ||
-			    ((t_mcic & o_mcic) != o_mcic)) {
-				s390_handle_damage("processing backup machine "
-						   "check with damage.");
-			}
-
-			/*
-			 * Nullifying exigent condition, therefore we might
-			 * retry this instruction.
-			 */
-
-			spin_lock(&ipd_lock);
-
-			tmp = get_clock();
-
-			if (((tmp - last_ipd) >> 12) < MAX_IPD_TIME)
-				ipd_count++;
-			else
-				ipd_count = 1;
-
-			last_ipd = tmp;
-
-			if (ipd_count == MAX_IPD_COUNT)
-				s390_handle_damage("too many ipd retries.");
-
-			spin_unlock(&ipd_lock);
-		}
-		else {
-			/* Processing damage -> stopping machine */
-			s390_handle_damage("received instruction processing "
-					   "damage machine check.");
-		}
-	}
-	if (s390_revalidate_registers(mci)) {
-		if (umode) {
-			/*
-			 * Couldn't restore all register contents while in
-			 * user mode -> mark task for termination.
-			 */
-			mcck->kill_task = 1;
-			mcck->mcck_code = *(unsigned long long *) mci;
-			set_thread_flag(TIF_MCCK_PENDING);
-		}
-		else
-			/*
-			 * Couldn't restore all register contents while in
-			 * kernel mode -> stopping machine.
-			 */
-			s390_handle_damage("unable to revalidate registers.");
-	}
-
-	if (mci->cd) {
-		/* Timing facility damage */
-		s390_handle_damage("TOD clock damaged");
-	}
-
-	if (mci->ed && mci->ec) {
-		/* External damage */
-		if (S390_lowcore.external_damage_code & (1U << ED_ETR_SYNC))
-			etr_sync_check();
-		if (S390_lowcore.external_damage_code & (1U << ED_ETR_SWITCH))
-			etr_switch_to_local();
-		if (S390_lowcore.external_damage_code & (1U << ED_STP_SYNC))
-			stp_sync_check();
-		if (S390_lowcore.external_damage_code & (1U << ED_STP_ISLAND))
-			stp_island_check();
-	}
-
-	if (mci->se)
-		/* Storage error uncorrected */
-		s390_handle_damage("received storage error uncorrected "
-				   "machine check.");
-
-	if (mci->ke)
-		/* Storage key-error uncorrected */
-		s390_handle_damage("received storage key-error uncorrected "
-				   "machine check.");
-
-	if (mci->ds && mci->fa)
-		/* Storage degradation */
-		s390_handle_damage("received storage degradation machine "
-				   "check.");
-
-	if (mci->cp) {
-		/* Channel report word pending */
-		mcck->channel_report = 1;
-		set_thread_flag(TIF_MCCK_PENDING);
-	}
-
-	if (mci->w) {
-		/* Warning pending */
-		mcck->warning = 1;
-		set_thread_flag(TIF_MCCK_PENDING);
-	}
-	lockdep_on();
-}
-
-/*
- * s390_init_machine_check
- *
- * initialize machine check handling
- */
-static int
-machine_check_init(void)
-{
-	init_MUTEX_LOCKED(&m_sem);
-	ctl_set_bit(14, 25);	/* enable external damage MCH */
-	ctl_set_bit(14, 27);    /* enable system recovery MCH */
-#ifdef CONFIG_MACHCHK_WARNING
-	ctl_set_bit(14, 24);	/* enable warning MCH */
-#endif
-	return 0;
-}
-
-/*
- * Initialize the machine check handler really early to be able to
- * catch all machine checks that happen during boot
- */
-arch_initcall(machine_check_init);
-
-/*
- * Machine checks for the channel subsystem must be enabled
- * after the channel subsystem is initialized
- */
-static int __init
-machine_check_crw_init (void)
-{
-	struct task_struct *task;
-
-	task = kthread_run(s390_collect_crw_info, &m_sem, "kmcheck");
-	if (IS_ERR(task))
-		return PTR_ERR(task);
-	ctl_set_bit(14, 28);	/* enable channel report MCH */
-	return 0;
-}
-
-device_initcall (machine_check_crw_init);
-/*
- *  drivers/s390/s390mach.h
- *   S/390 data definitions for machine check processing
- *
- *  S390 version
- *    Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Ingo Adlung (adlung@de.ibm.com)
- */
-
-#ifndef __s390mach_h
-#define __s390mach_h
-
-#include <asm/types.h>
-
-struct mci {
-	__u32   sd              :  1; /* 00 system damage */
-	__u32   pd              :  1; /* 01 instruction-processing damage */
-	__u32   sr              :  1; /* 02 system recovery */
-	__u32   to_be_defined_1 :  1; /* 03 */
-	__u32   cd              :  1; /* 04 timing-facility damage */
-	__u32   ed              :  1; /* 05 external damage */
-	__u32   to_be_defined_2 :  1; /* 06 */
-	__u32   dg              :  1; /* 07 degradation */
-	__u32   w               :  1; /* 08 warning pending */
-	__u32   cp              :  1; /* 09 channel-report pending */
-	__u32   sp              :  1; /* 10 service-processor damage */
-	__u32   ck              :  1; /* 11 channel-subsystem damage */
-	__u32   to_be_defined_3 :  2; /* 12-13 */
-	__u32   b               :  1; /* 14 backed up */
-	__u32   to_be_defined_4 :  1; /* 15 */
-	__u32   se              :  1; /* 16 storage error uncorrected */
-	__u32   sc              :  1; /* 17 storage error corrected */
-	__u32   ke              :  1; /* 18 storage-key error uncorrected */
-	__u32   ds              :  1; /* 19 storage degradation */
-	__u32   wp              :  1; /* 20 psw mwp validity */
-	__u32   ms              :  1; /* 21 psw mask and key validity */
-	__u32   pm              :  1; /* 22 psw program mask and cc validity */
-	__u32   ia              :  1; /* 23 psw instruction address validity */
-	__u32   fa              :  1; /* 24 failing storage address validity */
-	__u32   to_be_defined_5 :  1; /* 25 */
-	__u32   ec              :  1; /* 26 external damage code validity */
-	__u32   fp              :  1; /* 27 floating point register validity */
-	__u32   gr              :  1; /* 28 general register validity */
-	__u32   cr              :  1; /* 29 control register validity */
-	__u32   to_be_defined_6 :  1; /* 30 */
-	__u32   st              :  1; /* 31 storage logical validity */
-	__u32   ie              :  1; /* 32 indirect storage error */
-	__u32   ar              :  1; /* 33 access register validity */
-	__u32   da              :  1; /* 34 delayed access exception */
-	__u32   to_be_defined_7 :  7; /* 35-41 */
-	__u32   pr              :  1; /* 42 tod programmable register validity */
-	__u32   fc              :  1; /* 43 fp control register validity */
-	__u32   ap              :  1; /* 44 ancillary report */
-	__u32   to_be_defined_8 :  1; /* 45 */
-	__u32   ct              :  1; /* 46 cpu timer validity */
-	__u32   cc              :  1; /* 47 clock comparator validity */
-	__u32	to_be_defined_9 : 16; /* 47-63 */
-};
-
-/*
- * Channel Report Word
- */
-struct crw {
-	__u32 res1    :  1;   /* reserved zero */
-	__u32 slct    :  1;   /* solicited */
-	__u32 oflw    :  1;   /* overflow */
-	__u32 chn     :  1;   /* chained */
-	__u32 rsc     :  4;   /* reporting source code */
-	__u32 anc     :  1;   /* ancillary report */
-	__u32 res2    :  1;   /* reserved zero */
-	__u32 erc     :  6;   /* error-recovery code */
-	__u32 rsid    : 16;   /* reporting-source ID */
-} __attribute__ ((packed));
-
-typedef void (*crw_handler_t)(struct crw *, struct crw *, int);
-
-extern int s390_register_crw_handler(int rsc, crw_handler_t handler);
-extern void s390_unregister_crw_handler(int rsc);
-
-#define NR_RSCS 16
-
-#define CRW_RSC_MONITOR  0x2  /* monitoring facility */
-#define CRW_RSC_SCH      0x3  /* subchannel */
-#define CRW_RSC_CPATH    0x4  /* channel path */
-#define CRW_RSC_CONFIG   0x9  /* configuration-alert facility */
-#define CRW_RSC_CSS      0xB  /* channel subsystem */
-
-#define CRW_ERC_EVENT    0x00 /* event information pending */
-#define CRW_ERC_AVAIL    0x01 /* available */
-#define CRW_ERC_INIT     0x02 /* initialized */
-#define CRW_ERC_TERROR   0x03 /* temporary error */
-#define CRW_ERC_IPARM    0x04 /* installed parm initialized */
-#define CRW_ERC_TERM     0x05 /* terminal */
-#define CRW_ERC_PERRN    0x06 /* perm. error, fac. not init */
-#define CRW_ERC_PERRI    0x07 /* perm. error, facility init */
-#define CRW_ERC_PMOD     0x08 /* installed parameters modified */
-
-static inline int stcrw(struct crw *pcrw )
-{
-	int ccode;
-
-	__asm__ __volatile__(
-		"stcrw 0(%2)\n\t"
-		"ipm %0\n\t"
-		"srl %0,28\n\t"
-		: "=d" (ccode), "=m" (*pcrw)
-		: "a" (pcrw)
-		: "cc" );
-	return ccode;
-}
-
-#define ED_ETR_SYNC	12	/* External damage ETR sync check */
-#define ED_ETR_SWITCH	13	/* External damage ETR switch to local */
-
-#define ED_STP_SYNC	7	/* External damage STP sync check */
-#define ED_STP_ISLAND	6	/* External damage STP island check */
-
-struct pt_regs;
-
-void s390_handle_mcck(void);
-void s390_do_machine_check(struct pt_regs *regs);
-#endif /* __s390mach */
	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 */
	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 */
...	...	@@ -22,7 +22,7 @@
22	22	obj-y := bitmap.o traps.o time.o process.o base.o early.o setup.o \
23	23	processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
24	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	27	obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o)
28	28	obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
	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);
...	...	@@ -39,6 +39,7 @@
39	39	#include <asm/processor.h>
40	40	#include <asm/irq.h>
41	41	#include <asm/timer.h>
	42	+#include <asm/nmi.h>
42	43	#include "entry.h"
43	44
44	45	asmlinkage void ret_from_fork(void) asm ("ret_from_fork");
...	...	@@ -68,7 +69,6 @@
68	69	return sf->gprs[8];
69	70	}
70	71
71		-extern void s390_handle_mcck(void);
72	72	/*
73	73	* The idle loop on a S390...
74	74	*/
...	...	@@ -23,7 +23,7 @@
23	23	#include <linux/timer.h>
24	24	#include <asm/lowcore.h>
25	25	#include <asm/pgtable.h>
26		-
	26	+#include <asm/nmi.h>
27	27	#include "kvm-s390.h"
28	28	#include "gaccess.h"
29	29
...	...	@@ -439,8 +439,6 @@
439	439	{
440	440	return -EINVAL; /* not implemented yet */
441	441	}
442		-
443		-extern void s390_handle_mcck(void);
444	442
445	443	static void __vcpu_run(struct kvm_vcpu *vcpu)
446	444	{
...	...	@@ -2,7 +2,6 @@
2	2	# Makefile for the S/390 specific device drivers
3	3	#
4	4
5		-obj-y += s390mach.o
6	5	obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/
7	6
8	7	drivers-y += drivers/s390/built-in.o
...	...	@@ -3,7 +3,7 @@
3	3	#
4	4
5	5	obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o scsw.o \
6		- fcx.o itcw.o
	6	+ fcx.o itcw.o crw.o
7	7	ccw_device-objs += device.o device_fsm.o device_ops.o
8	8	ccw_device-objs += device_id.o device_pgid.o device_status.o
9	9	obj-y += ccw_device.o cmf.o
...	...	@@ -17,8 +17,8 @@
17	17	#include <linux/errno.h>
18	18	#include <asm/chpid.h>
19	19	#include <asm/sclp.h>
	20	+#include <asm/crw.h>
20	21
21		-#include "../s390mach.h"
22	22	#include "cio.h"
23	23	#include "css.h"
24	24	#include "ioasm.h"
25	25
...	...	@@ -706,12 +706,12 @@
706	706	struct chp_id chpid;
707	707	int ret;
708	708
709		- ret = s390_register_crw_handler(CRW_RSC_CPATH, chp_process_crw);
	709	+ ret = crw_register_handler(CRW_RSC_CPATH, chp_process_crw);
710	710	if (ret)
711	711	return ret;
712	712	chp_wq = create_singlethread_workqueue("cio_chp");
713	713	if (!chp_wq) {
714		- s390_unregister_crw_handler(CRW_RSC_CPATH);
	714	+ crw_unregister_handler(CRW_RSC_CPATH);
715	715	return -ENOMEM;
716	716	}
717	717	INIT_WORK(&cfg_work, cfg_func);
...	...	@@ -19,8 +19,8 @@
19	19	#include <asm/cio.h>
20	20	#include <asm/chpid.h>
21	21	#include <asm/chsc.h>
	22	+#include <asm/crw.h>
22	23
23		-#include "../s390mach.h"
24	24	#include "css.h"
25	25	#include "cio.h"
26	26	#include "cio_debug.h"
...	...	@@ -820,7 +820,7 @@
820	820	"chsc machine checks!\n");
821	821	return -ENOMEM;
822	822	}
823		- ret = s390_register_crw_handler(CRW_RSC_CSS, chsc_process_crw);
	823	+ ret = crw_register_handler(CRW_RSC_CSS, chsc_process_crw);
824	824	if (ret)
825	825	kfree(sei_page);
826	826	return ret;
...	...	@@ -828,7 +828,7 @@
828	828
829	829	void __init chsc_free_sei_area(void)
830	830	{
831		- s390_unregister_crw_handler(CRW_RSC_CSS);
	831	+ crw_unregister_handler(CRW_RSC_CSS);
832	832	kfree(sei_page);
833	833	}
834	834