redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[S390] Add timeouts during sense PGID, path verification and disband PGID. 

While the machine owns us an interrupt in these cases (and we should get
one), reality isn't always like that...

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
hifive-unleashed-5.1
Cornelia Huck 2006-10-04 20:02:02 +02:00 committed by Martin Schwidefsky
parent b05e370352
commit f1ee3281be
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/cio/device_fsm.c
View File

@ -349,6 +349,8 @@ ccw_device_done(struct ccw_device *cdev, int state)
sch = to_subchannel(cdev->dev.parent);
ccw_device_set_timeout(cdev, 0);
if (state != DEV_STATE_ONLINE)
cio_disable_subchannel(sch);

3
drivers/s390/cio/device_ops.c
View File

@ -216,6 +216,9 @@ ccw_device_call_handler(struct ccw_device *cdev)
(stctl & SCSW_STCTL_PRIM_STATUS)))
return 0;
/* Clear pending timers for device driver initiated I/O. */
if (ending_status)
ccw_device_set_timeout(cdev, 0);
/*
* Now we are ready to call the device driver interrupt handler.
*/

8
drivers/s390/cio/device_pgid.c
View File

@ -96,6 +96,9 @@ ccw_device_sense_pgid_start(struct ccw_device *cdev)
{
int ret;
/* Set a timeout of 60s */
ccw_device_set_timeout(cdev, 60*HZ);
cdev->private->state = DEV_STATE_SENSE_PGID;
cdev->private->imask = 0x80;
cdev->private->iretry = 5;
@ -480,6 +483,8 @@ ccw_device_verify_start(struct ccw_device *cdev)
ccw_device_verify_done(cdev, -ENODEV);
return;
}
/* After 60s path verification is considered to have failed. */
ccw_device_set_timeout(cdev, 60*HZ);
__ccw_device_verify_start(cdev);
}
@ -554,6 +559,9 @@ ccw_device_disband_irq(struct ccw_device *cdev, enum dev_event dev_event)
void
ccw_device_disband_start(struct ccw_device *cdev)
{
/* After 60s disbanding is considered to have failed. */
ccw_device_set_timeout(cdev, 60*HZ);
cdev->private->flags.pgid_single = 0;
cdev->private->iretry = 5;
cdev->private->imask = 0x80;