diff options
| author | Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 2006-08-30 14:33:37 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-08-30 14:33:37 +0200 |
| commit | 3b88508a31a77eb3487154922e1eff282dc1d863 (patch) | |
| tree | 64e402e24e45ec3d1f0f940cccdeb622977558fc | |
| parent | 292888c81e74115db5e5a4a838f730a7c3662982 (diff) | |
| download | kernel-crypto-3b88508a31a77eb3487154922e1eff282dc1d863.tar.gz kernel-crypto-3b88508a31a77eb3487154922e1eff282dc1d863.tar.xz kernel-crypto-3b88508a31a77eb3487154922e1eff282dc1d863.zip | |
[S390] cio: no path after machine check.
Devices enter no-path state after disabling a channel path
via the SE even though another path has been reenabled at the SE.
The devices are set into no-path state before triggering path
verification even though other paths may have become available.
To fix this trigger path verification before setting a device into
no-path state.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/cio/chsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 6405e9bd6eb..c28444af091 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c @@ -238,8 +238,6 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) /* Check for single path devices. */ if (sch->schib.pmcw.pim == 0x80) goto out_unreg; - if (sch->vpm == mask) - goto out_unreg; if ((sch->schib.scsw.actl & SCSW_ACTL_DEVACT) && (sch->schib.scsw.actl & SCSW_ACTL_SCHACT) && @@ -258,6 +256,8 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) /* trigger path verification. */ if (sch->driver && sch->driver->verify) sch->driver->verify(&sch->dev); + else if (sch->vpm == mask) + goto out_unreg; out_unlock: spin_unlock_irq(&sch->lock); return 0; |