From b630e5ba8a061051785f37511327552d9d11730d Mon Sep 17 00:00:00 2001
From: Stefan Haberland <stefan.haberland@de.ibm.com>
Date: Fri, 10 Oct 2008 21:33:23 +0200
Subject: [PATCH] --- yaml --- r: 110823 b: refs/heads/master c:
 ada3df9171e48b2a5f1e9c828337b61746e19ff0 h: refs/heads/master i:   110821:
 4dd3e719224e4b90451337f9aea1ef73c10f78e2   110819:
 c81ec7c6ac68ff0200b5bf5a2f94ea02d1989e7d   110815:
 5e53e7fc4a71de6b17342beb3ddea93de6370b20 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/s390/block/dasd_eckd.c | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6e8416190abb..412c22606152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a0d0e65379256b4da2c9092e197a2c761f51c01
+refs/heads/master: ada3df9171e48b2a5f1e9c828337b61746e19ff0
diff --git a/trunk/drivers/s390/block/dasd_eckd.c b/trunk/drivers/s390/block/dasd_eckd.c
index 72d3970f11a4..8095629bc493 100644
--- a/trunk/drivers/s390/block/dasd_eckd.c
+++ b/trunk/drivers/s390/block/dasd_eckd.c
@@ -1501,12 +1501,27 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
 		return;
 	}
 
-	/* just report other unsolicited interrupts */
-	DEV_MESSAGE(KERN_DEBUG, device, "%s",
-		    "unsolicited interrupt received");
-	device->discipline->dump_sense(device, NULL, irb);
-	dasd_schedule_device_bh(device);
+	if ((irb->scsw.cmd.cc == 1) &&
+	    (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+	    (irb->scsw.cmd.actl & SCSW_ACTL_START_PEND) &&
+	    (irb->scsw.cmd.stctl & SCSW_STCTL_STATUS_PEND)) {
+		/* fake irb do nothing, they are handled elsewhere */
+		dasd_schedule_device_bh(device);
+		return;
+	}
 
+	if (!(irb->esw.esw0.erw.cons)) {
+		/* just report other unsolicited interrupts */
+		DEV_MESSAGE(KERN_ERR, device, "%s",
+			    "unsolicited interrupt received");
+	} else {
+		DEV_MESSAGE(KERN_ERR, device, "%s",
+			    "unsolicited interrupt received "
+			    "(sense available)");
+		device->discipline->dump_sense(device, NULL, irb);
+	}
+
+	dasd_schedule_device_bh(device);
 	return;
 };