Commit 56b86b61 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky

[S390] dasd: ignore unsolicited interrupts for DIAG

For the DASD DIAG discipline IO is started through special diagnose
calls. Unsolicited interrupts may contain information about the device
itself. But this information is not needed because the device is not
used directly.
Fix the case that an unimplemented dicipline function may be called
by ignoring unsolicited interrupts for the DIAG disciplin.
Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6d00d00b
...@@ -1107,7 +1107,13 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -1107,7 +1107,13 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
if (cqr) if (cqr)
memcpy(&cqr->irb, irb, sizeof(*irb)); memcpy(&cqr->irb, irb, sizeof(*irb));
device = dasd_device_from_cdev_locked(cdev); device = dasd_device_from_cdev_locked(cdev);
if (!IS_ERR(device)) { if (IS_ERR(device))
return;
/* ignore unsolicited interrupts for DIAG discipline */
if (device->discipline == dasd_diag_discipline_pointer) {
dasd_put_device(device);
return;
}
device->discipline->dump_sense_dbf(device, irb, device->discipline->dump_sense_dbf(device, irb,
"unsolicited"); "unsolicited");
if ((device->features & DASD_FEATURE_ERPLOG)) if ((device->features & DASD_FEATURE_ERPLOG))
...@@ -1117,7 +1123,6 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -1117,7 +1123,6 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
device->discipline->handle_unsolicited_interrupt(device, device->discipline->handle_unsolicited_interrupt(device,
irb); irb);
dasd_put_device(device); dasd_put_device(device);
}
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment