s390 (2/10): common i/o layer.
Subsystems (3)
PATCH 1/1 s390 (2/10): common i/o layer.
Common i/o layer fixes:
- Improve blacklist argument parsing.
- Fix device recognition for devices where SenseID fails.
- Don't try to set a device online that has no driver.
- Chain a release ccw to the unconditional reserve ccw for forced online.
- Fix irb accumulation for pure status pending with eswf set.
- Fix rc handling in qdio_shutdown.
- Improve retry behavious for busy conditions on qdio.
- Fix activity check in ccw_device_start/read_dev_chars and read_conf_data.
diffstat:
Documentation/s390/driver-model.txt | 2 drivers/s390/cio/blacklist.c | 64 +++++++++++++------- drivers/s390/cio/css.h | 1 drivers/s390/cio/device.c | 55 ++++++++++++----- drivers/s390/cio/device_fsm.c | 3 drivers/s390/cio/device_ops.c | 40 +++++++++--- drivers/s390/cio/device_status.c | 2 drivers/s390/cio/qdio.c | 112 ++++++++++++++++++++++++++++++------ drivers/s390/cio/qdio.h | 7 +- include/asm-s390/cio.h | 1 10 files changed, 216 insertions(+), 71 deletions(-)
Documentation/s390/driver-model.txt +1 -1
@@ -250,7 +250,7 @@ ----------- The netiucv driver creates an attribute 'connection' under -bus/iucv/drivers/NETIUCV. Piping to this attibute creates a new netiucv +bus/iucv/drivers/netiucv. Piping to this attibute creates a new netiucv connection to the specified host. Netiucv connections show up under devices/iucv/ as "netiucv<ifnum>". The interface
drivers/s390/cio/blacklist.c +41 -23
131 lines not on this page · raw message
drivers/s390/cio/css.h +1 -0
@@ -82,6 +82,7 @@ unsigned int dosense:1; /* delayed SENSE required */ unsigned int doverify:1; /* delayed path verification */ unsigned int donotify:1; /* call notify function */ + unsigned int recog_done:1; /* dev. recog. complete */ } __attribute__((packed)) flags;unsigned long intparm;/* user interruption parameter */ struct qdio_irq *qdio_data;
drivers/s390/cio/device.c +38 -17
123 lines not on this page · raw message
drivers/s390/cio/device_fsm.c +3 -0
@@ -148,6 +148,7 @@struct subchannel *sch; sch =to_subchannel (cdev->dev.parent); + cdev->private->flags.recog_done =1 ;/* * Check if cu type and device type still match. If * not, it is certainly another device and we have to
@@ -217,6 +218,7 @@__recover_lost_chpids (sch, old_lpm);if (cdev->private->state ==DEV_STATE_DISCONNECTED_SENSE_ID ) {if (state ==DEV_STATE_NOT_OPER ) { + cdev->private->flags.recog_done =1 ; cdev->private->state =DEV_STATE_DISCONNECTED ;return ; }
@@ -393,6 +395,7 @@* timeout (or if sense pgid during path verification detects the device * is locked, as may happen on newer devices). */ + cdev->private->flags.recog_done =0 ; cdev->private->state =DEV_STATE_SENSE_ID ;ccw_device_sense_id_start (cdev);return 0 ;
drivers/s390/cio/device_ops.c +31 -9
@@ -79,7 +79,8 @@if (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE || - sch->schib.scsw.actl !=0 || + ((sch->schib.scsw.stctl &SCSW_STCTL_PRIM_STATUS ) && + !(sch->schib.scsw.stctl &SCSW_STCTL_SEC_STATUS )) || cdev->private->flags.doverify)return -EBUSY ; ret =cio_set_options (sch, flags);
@@ -347,7 +348,9 @@ cdev->handler = ccw_device_wake_up;if (cdev->private->state !=DEV_STATE_ONLINE ) ret = -ENODEV ; -else if (sch->schib.scsw.actl !=0 || cdev->private->flags.doverify) +else if (((sch->schib.scsw.stctl &SCSW_STCTL_PRIM_STATUS ) && + !(sch->schib.scsw.stctl &SCSW_STCTL_SEC_STATUS )) || + cdev->private->flags.doverify) ret = -EBUSY ;else /* 0x00D9C4C3 == ebcdic "RDC" */
@@ -414,7 +417,9 @@ cdev->handler = ccw_device_wake_up;if (cdev->private->state !=DEV_STATE_ONLINE ) ret = -ENODEV ; -else if (sch->schib.scsw.actl !=0 || cdev->private->flags.doverify) +else if (((sch->schib.scsw.stctl &SCSW_STCTL_PRIM_STATUS ) && + !(sch->schib.scsw.stctl &SCSW_STCTL_SEC_STATUS )) || + cdev->private->flags.doverify) ret = -EBUSY ;else /* 0x00D9C3C4 == ebcdic "RCD" */
@@ -441,12 +446,12 @@ }/* -* Try to issue an unconditional reserve on a boxed device. +* Try to break the lock on a boxed device. */ int ccw_device_stlck (struct ccw_device *cdev) { -char buf[32 ]; +void *buf, *buf2;unsigned long flags;struct subchannel *sch;int ret;
@@ -462,16 +467,30 @@CIO_TRACE_EVENT (2 ,"stl lock" );CIO_TRACE_EVENT (2 , cdev->dev.bus_id); + buf =kmalloc (32 *sizeof (char ),GFP_DMA |GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + buf2 =kmalloc (32 *sizeof (char ),GFP_DMA |GFP_KERNEL ); +if (!buf2) { +kfree (buf); +return -ENOMEM ; + }spin_lock_irqsave (&sch->lock, flags); ret =cio_enable_subchannel (sch,3 );if (ret) goto out_unlock; -/* Setup ccw. This cmd code seems not to be in use elsewhere. */ +/* +* Setup ccw. We chain an unconditional reserve and a release so we +* only break the lock. +*/ cdev->private->iccws[0 ].cmd_code =CCW_CMD_STLCK ; cdev->private->iccws[0 ].cda = (__u32 )__pa (buf); cdev->private->iccws[0 ].count =32 ; - cdev->private->iccws[0 ].flags =CCW_FLAG_SLI ; - + cdev->private->iccws[0 ].flags =CCW_FLAG_CC ; + cdev->private->iccws[1 ].cmd_code =CCW_CMD_RELEASE ; + cdev->private->iccws[1 ].cda = (__u32 )__pa (buf2); + cdev->private->iccws[1 ].count =32 ; + cdev->private->iccws[1 ].flags =0 ; ret =cio_start (sch, cdev->private->iccws,0 );if (ret) {cio_disable_subchannel (sch);//FIXME: return code?
@@ -486,10 +505,13 @@ (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) || (cdev->private->irb.scsw.cstat != 0)) ret = -EIO ; -/* Clear irb. */ memset (&cdev->private->irb,0 ,sizeof (struct irb )); out_unlock: +if (buf) +kfree (buf); +if (buf2) +kfree (buf2);spin_unlock_irqrestore (&sch->lock, flags);return ret; }
drivers/s390/cio/device_status.c +1 -1
@@ -99,7 +99,7 @@static inline int ccw_device_accumulate_esw_valid (struct irb *irb) { -if (irb->scsw.eswf && irb->scsw.stctl ==SCSW_STCTL_STATUS_PEND ) +if (!irb->scsw.eswf && irb->scsw.stctl ==SCSW_STCTL_STATUS_PEND )return 0 ; if (irb->scsw.stctl == (SCSW_STCTL_INTER_STATUS|SCSW_STCTL_STATUS_PEND) &&
drivers/s390/cio/qdio.c +94 -18
192 lines not on this page · raw message
drivers/s390/cio/qdio.h +5 -2
@@ -1,7 +1,7 @@#ifndef _CIO_QDIO_H#define _CIO_QDIO_H -#define VERSION_CIO_QDIO_H "$Revision: 1.22 $" +#define VERSION_CIO_QDIO_H "$Revision: 1.23 $"//#define QDIO_DBF_LIKE_HELL
@@ -33,7 +33,8 @@#define TIQDIO_THININT_ISC 3#define TIQDIO_DELAY_TARGET 0 -#define QDIO_BUSY_BIT_PATIENCE 2000/* in microsecs */ +#define QDIO_BUSY_BIT_PATIENCE 100/* in microsecs */ +#define QDIO_BUSY_BIT_GIVE_UP 10000000/* 10 seconds */ #define IQDIO_GLOBAL_LAPS 2/* GLOBAL_LAPS are not used as we */ #define IQDIO_GLOBAL_LAPS_INT 1/* don't global summary */ #define IQDIO_LOCAL_LAPS 4
@@ -599,7 +600,9 @@int last_transfer_index; */ __u64 last_transfer_time; +__u64 busy_start; } timing; +atomic_t busy_siga_counter;unsigned int queue_type;/* leave this member at the end. won't be cleared in qdio_fill_qs */
include/asm-s390/cio.h +1 -0
@@ -132,6 +132,7 @@#define CCW_CMD_SENSE_PGID 0x34#define CCW_CMD_SUSPEND_RECONN 0x5B#define CCW_CMD_RDC 0x64 +#define CCW_CMD_RELEASE 0x94#define CCW_CMD_SET_PGID 0xAF#define CCW_CMD_SENSE_ID 0xE4#define CCW_CMD_DCTL 0xF3