s390/cio: fix return code after missing interrupt
[ Upstream commit 770b55c995
]
When a timeout occurs for users of ccw_device_start_timeout
we will stop the IO and call the drivers int handler with
the irb pointer set to ERR_PTR(-ETIMEDOUT). Sometimes
however we'd set the irb pointer to ERR_PTR(-EIO) which is
not intended. Just set the correct value in all codepaths.
Reported-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
parent
5df337455c
commit
c5b1b2e218
|
@ -796,6 +796,7 @@ ccw_device_online_timeout(struct ccw_device *cdev, enum dev_event dev_event)
|
|||
|
||||
ccw_device_set_timeout(cdev, 0);
|
||||
cdev->private->iretry = 255;
|
||||
cdev->private->async_kill_io_rc = -ETIMEDOUT;
|
||||
ret = ccw_device_cancel_halt_clear(cdev);
|
||||
if (ret == -EBUSY) {
|
||||
ccw_device_set_timeout(cdev, 3*HZ);
|
||||
|
@ -872,7 +873,7 @@ ccw_device_killing_irq(struct ccw_device *cdev, enum dev_event dev_event)
|
|||
/* OK, i/o is dead now. Call interrupt handler. */
|
||||
if (cdev->handler)
|
||||
cdev->handler(cdev, cdev->private->intparm,
|
||||
ERR_PTR(-EIO));
|
||||
ERR_PTR(cdev->private->async_kill_io_rc));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -889,7 +890,7 @@ ccw_device_killing_timeout(struct ccw_device *cdev, enum dev_event dev_event)
|
|||
ccw_device_online_verify(cdev, 0);
|
||||
if (cdev->handler)
|
||||
cdev->handler(cdev, cdev->private->intparm,
|
||||
ERR_PTR(-EIO));
|
||||
ERR_PTR(cdev->private->async_kill_io_rc));
|
||||
}
|
||||
|
||||
void ccw_device_kill_io(struct ccw_device *cdev)
|
||||
|
@ -897,6 +898,7 @@ void ccw_device_kill_io(struct ccw_device *cdev)
|
|||
int ret;
|
||||
|
||||
cdev->private->iretry = 255;
|
||||
cdev->private->async_kill_io_rc = -EIO;
|
||||
ret = ccw_device_cancel_halt_clear(cdev);
|
||||
if (ret == -EBUSY) {
|
||||
ccw_device_set_timeout(cdev, 3*HZ);
|
||||
|
|
|
@ -157,6 +157,7 @@ struct ccw_device_private {
|
|||
unsigned long intparm; /* user interruption parameter */
|
||||
struct qdio_irq *qdio_data;
|
||||
struct irb irb; /* device status */
|
||||
int async_kill_io_rc;
|
||||
struct senseid senseid; /* SenseID info */
|
||||
struct pgid pgid[8]; /* path group IDs per chpid*/
|
||||
struct ccw1 iccws[2]; /* ccws for SNID/SID/SPGID commands */
|
||||
|
|
Loading…
Reference in New Issue