3 files changed, 47 insertions, 0 deletions

diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index b19db20a0bef..e6700df52df4 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1996,6 +1996,36 @@ dasd_3990_erp_compound(struct dasd_ccw_req * erp, char *sense)
 }                               /* end dasd_3990_erp_compound */
 
 /*
+ *DASD_3990_ERP_HANDLE_SIM
+ *
+ *DESCRIPTION
+ *  inspects the SIM SENSE data and starts an appropriate action
+ *
+ * PARAMETER
+ *   sense         sense data of the actual error
+ *
+ * RETURN VALUES
+ *   none
+ */
+void
+dasd_3990_erp_handle_sim(struct dasd_device *device, char *sense)
+{
+        /* print message according to log or message to operator mode */
+        if ((sense[24] & DASD_SIM_MSG_TO_OP) || (sense[1] & 0x10)) {
+
+                /* print SIM SRC from RefCode */
+                DEV_MESSAGE(KERN_ERR, device, "SIM - SRC: "
+                            "%02x%02x%02x%02x", sense[22],
+                            sense[23], sense[11], sense[12]);
+        } else if (sense[24] & DASD_SIM_LOG) {
+                /* print SIM SRC Refcode */
+                DEV_MESSAGE(KERN_WARNING, device, "SIM - SRC: "
+                            "%02x%02x%02x%02x", sense[22],
+                            sense[23], sense[11], sense[12]);
+        }
+}
+
+/*
  * DASD_3990_ERP_INSPECT_32
  *
  * DESCRIPTION
@@ -2018,6 +2048,10 @@ dasd_3990_erp_inspect_32(struct dasd_ccw_req * erp, char *sense)
 
         erp->function = dasd_3990_erp_inspect_32;
 
+        /* check for SIM sense data */
+        if ((sense[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE)
+                dasd_3990_erp_handle_sim(device, sense);
+
         if (sense[25] & DASD_SENSE_BIT_0) {
 
                 /* compound program action codes (byte25 bit 0 == '1') */
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 61f16937c1e0..a0edae091b5e 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1415,6 +1415,13 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
                 return;
         }
 
+
+        /* service information message SIM */
+        if ((irb->ecw[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE) {
+                dasd_3990_erp_handle_sim(device, irb->ecw);
+                return;
+        }
+
         /* just report other unsolicited interrupts */
         DEV_MESSAGE(KERN_DEBUG, device, "%s",
                     "unsolicited interrupt received");
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 44b2984dfbee..6c624bf44617 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -72,6 +72,11 @@ struct dasd_block;
 #define DASD_SENSE_BIT_2 0x20
 #define DASD_SENSE_BIT_3 0x10
 
+/* BIT DEFINITIONS FOR SIM SENSE */
+#define DASD_SIM_SENSE 0x0F
+#define DASD_SIM_MSG_TO_OP 0x03
+#define DASD_SIM_LOG 0x0C
+
 /*
  * SECTION: MACROs for klogd and s390 debug feature (dbf)
  */
@@ -621,6 +626,7 @@ void dasd_log_sense(struct dasd_ccw_req *, struct irb *);
 
 /* externals in dasd_3990_erp.c */
 struct dasd_ccw_req *dasd_3990_erp_action(struct dasd_ccw_req *);
+void dasd_3990_erp_handle_sim(struct dasd_device *, char *);
 
 /* externals in dasd_eer.c */
 #ifdef CONFIG_DASD_EER