s390: cio chpid offline
Subsystems (2)
PATCH 1/1 s390: cio chpid offline
From: Cornelia Huck <[email protected]>
[S390] cio chpid offline.
After setting a path to a dasd offline at the SE, I/O hangs on that dasd for 5 minutes, then continues.
I/O for which an interrupt will not be reported after the channel path has been disabled was not terminated by the common I/O layer, causing the dasd MIH to hit after 5 minutes.
Be more aggressive in terminating I/O after setting a channel path offline. Also make sure to generate a fake irb if the device driver issues an I/O request after being notified of the killed I/O and clear residual information from the irb before trying to start the delayed verification.
Signed-off-by Cornelia Huck <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/cio/chsc.c | 3 +-- drivers/s390/cio/device_fsm.c | 2 ++ drivers/s390/cio/device_ops.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/s390/cio/chsc.c +1 -2
@@ -244,8 +244,7 @@ s390_subchannel_remove_chpid(struct deviif ((sch->schib.scsw.actl &SCSW_ACTL_DEVACT ) && (sch->schib.scsw.actl &SCSW_ACTL_SCHACT ) && - (sch->schib.pmcw.lpum == mask) && - (sch->vpm ==0 )) { + (sch->schib.pmcw.lpum == mask)) {int cc; cc =cio_clear (sch);
drivers/s390/cio/device_fsm.c +2 -0
@@ -864,6 +864,8 @@ ccw_device_clear_verify(struct ccw_devic irb = (struct irb *) __LC_IRB;/* Accumulate status. We don't do basic sense. */ ccw_device_accumulate_irb (cdev, irb); +/* Remember to clear irb to avoid residuals. */ +memset (&cdev->private->irb,0 ,sizeof (struct irb ));/* Try to start delayed device verification. */ ccw_device_online_verify (cdev,0 );/* Note: Don't call handler for cio initiated clear! */
drivers/s390/cio/device_ops.c +2 -1
@@ -78,7 +78,8 @@ ccw_device_start_key(struct ccw_device *return -ENODEV ;if (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ; -if (cdev->private->state ==DEV_STATE_VERIFY ) { +if (cdev->private->state ==DEV_STATE_VERIFY || + cdev->private->state ==DEV_STATE_CLEAR_VERIFY ) {/* Remember to fake irb when finished. */ if (!cdev->private->flags.fake_irb) { cdev->private->flags.fake_irb =1 ;