s390 (2/6): common i/o layer.
Subsystems (2)
PATCH 1/1 s390 (2/6): common i/o layer.
[PATCH] s390: cio changes.
From: Martin Schwidefsky <[email protected]>
Common i/o layer changes:
- Delay unregister/register of ccw devices reappering on a different subchannel. Search for the old ccw_device & subchannel for the reattached device and deregister it too to avoid inconsistencies.
- Fix path grouping for devices that present command reject for SetPGID but not for SensePGID.
diffstat:
drivers/s390/cio/css.c | 23 +++++++--- drivers/s390/cio/device.c | 92 ++++++++++++++++++++++++++++++++++++----- drivers/s390/cio/device_fsm.c | 11 +++- drivers/s390/cio/device_pgid.c | 4 + 4 files changed, 110 insertions(+), 20 deletions(-)
drivers/s390/cio/css.c +16 -7
@@ -1,7 +1,7 @@/* * drivers/s390/cio/css.c * driver for channel subsystem -* $Revision: 1.73 $ +* $Revision: 1.74 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation
@@ -218,12 +218,21 @@* We don't notify the driver since we have to throw the device * away in any case. */ -device_unregister (&sch->dev); -/* Reset intparm to zeroes. */ - sch->schib.pmcw.intparm =0 ; -cio_modify (sch); -put_device (&sch->dev); - ret =css_probe_device (irq); +if (!disc) { +device_unregister (&sch->dev); +/* Reset intparm to zeroes. */ + sch->schib.pmcw.intparm =0 ; +cio_modify (sch); +put_device (&sch->dev); + ret =css_probe_device (irq); + }else { +/* +* We can't immediately deregister the disconnected +* device since it might block. +*/ +device_trigger_reprobe (sch); + ret =0 ; + }break ;case CIO_OPER :if (disc)
drivers/s390/cio/device.c +83 -9
116 lines not on this page · raw message
drivers/s390/cio/device_fsm.c +7 -4
@@ -152,14 +152,15 @@/* * Check if cu type and device type still match. If * not, it is certainly another device and we have to -* de- and re-register. +* de- and re-register. Also check here for non-matching devno. */ if (cdev->id.cu_type != cdev->private->senseid.cu_type || cdev->id.cu_model != cdev->private->senseid.cu_model || cdev->id.dev_type != cdev->private->senseid.dev_type || - cdev->id.dev_model != cdev->private->senseid.dev_model) { + cdev->id.dev_model != cdev->private->senseid.dev_model || + cdev->private->devno != sch->schib.pmcw.dev) {PREPARE_WORK (&cdev->private->kick_work, - ccw_device_do_unreg_rereg, (void *)&cdev->dev); + ccw_device_do_unreg_rereg, (void *)cdev);queue_work (ccw_device_work, &cdev->private->kick_work);return ; }
@@ -295,7 +296,7 @@ sch->driver->notify(&sch->dev, CIO_OPER) : 0;if (!ret)/* Driver doesn't want device back. */ -ccw_device_do_unreg_rereg ((void *)&cdev->dev); +ccw_device_do_unreg_rereg ((void *)cdev);else wake_up (&cdev->private->wait_q); }
@@ -476,6 +477,8 @@ { cdev->private->flags.doverify =0 ;switch (err) { +case -EOPNOTSUPP :/* path grouping not supported, just set online. */ + cdev->private->options.pgroup =0 ;case 0 :ccw_device_done (cdev,DEV_STATE_ONLINE );break ;
drivers/s390/cio/device_pgid.c +4 -0
@@ -338,6 +338,10 @@* One of those strange devices which claim to be able * to do multipathing but not for Set Path Group ID. */ +if (cdev->private->flags.pgid_single) { +ccw_device_verify_done (cdev, -EOPNOTSUPP ); +break ; + } cdev->private->flags.pgid_single =1 ;/* fall through. */ case -EAGAIN :/* Try again. */