s390 bug fixes
Subsystems (5)
Hi Linus,
please pull from 'for-linus' branch of
git://git390.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
Heiko Carstens (2):
sysrq: include interrupt.h instead of irq.h
[S390] fix hypfs build failure
Sebastian Ott (5):
[S390] cio: wake up on failed recognition
[S390] cio: introduce ccw_device_schedule_sch_unregister [S390] cio: introduce notifier for boxed state
[S390] cio: disallow online setting of device in transient state [S390] cio: online_store - trigger recognition for boxed devices
arch/s390/hypfs/hypfs_diag.c | 2 + arch/s390/include/asm/cio.h | 2 + drivers/char/sysrq.c | 2 +- drivers/s390/block/dasd.c | 1 + drivers/s390/cio/device.c | 43 +++++++++++++++++++++++++--------------- drivers/s390/cio/device.h | 1 + drivers/s390/cio/device_fsm.c | 31 ++++++++++++++++++----------- drivers/s390/scsi/zfcp_ccw.c | 5 ++++ 8 files changed, 58 insertions(+), 29 deletions(-)
arch/s390/hypfs/hypfs_diag.c +2 -0
@@ -12,6 +12,8 @@#include <linux/types.h> #include <linux/errno.h> +#include <linux/gfp.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/vmalloc.h> #include <asm/ebcdic.h>
arch/s390/include/asm/cio.h +2 -0
@@ -456,6 +456,8 @@ struct ciw {#define CIO_OPER 0x0004/* Sick revalidation of device. */ #define CIO_REVALIDATE 0x0008 +/* Device did not respond in time. */ +#define CIO_BOXED 0x0010/** * struct ccw_dev_id - unique identifier for ccw devices
drivers/char/sysrq.c +1 -1
@@ -35,7 +35,7 @@#include <linux/vt_kern.h> #include <linux/workqueue.h> #include <linux/kexec.h> -#include <linux/irq.h> +#include <linux/interrupt.h> #include <linux/hrtimer.h> #include <linux/oom.h>
drivers/s390/block/dasd.c +1 -0
@@ -2363,6 +2363,7 @@ int dasd_generic_notify(struct ccw_device *cdev, int event) ret =0 ;switch (event) {case CIO_GONE : +case CIO_BOXED :case CIO_NO_PATH :/* First of all call extended error reporting. */ dasd_eer_write (device,NULL ,DASD_EER_NOPATH );
drivers/s390/cio/device.c +27 -16
117 lines not on this page · raw message
drivers/s390/cio/device.h +1 -0
@@ -87,6 +87,7 @@ int ccw_device_is_orphan(struct ccw_device *);int ccw_device_recognition (struct ccw_device *);int ccw_device_online (struct ccw_device *);int ccw_device_offline (struct ccw_device *); +void ccw_device_schedule_sch_unregister (struct ccw_device *);int ccw_purge_blacklisted (void );/* Function prototypes for device status and basic sense stuff. */
drivers/s390/cio/device_fsm.c +19 -12
@@ -256,13 +256,12 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) old_lpm =0 ;if (sch->lpm != old_lpm)__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 ; - } -/* Boxed devices don't need extra treatment. */ +if (cdev->private->state ==DEV_STATE_DISCONNECTED_SENSE_ID && + (state ==DEV_STATE_NOT_OPER || state ==DEV_STATE_BOXED )) { + cdev->private->flags.recog_done =1 ; + cdev->private->state =DEV_STATE_DISCONNECTED ; +wake_up (&cdev->private->wait_q); +return ; } notify =0 ; same_dev =0 ;/* Keep the compiler quiet... */
@@ -274,7 +273,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) sch->schid.ssid, sch->schid.sch_no);break ;case DEV_STATE_OFFLINE : -if (cdev->private->state ==DEV_STATE_DISCONNECTED_SENSE_ID ) { +if (cdev->online) { same_dev =ccw_device_handle_oper (cdev); notify =1 ; }
@@ -307,12 +306,17 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)" subchannel 0.%x.%04x\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no); +if (cdev->id.cu_type !=0 ) {/* device was recognized before */ + cdev->private->flags.recog_done =1 ; + cdev->private->state =DEV_STATE_BOXED ; +wake_up (&cdev->private->wait_q); +return ; + }break ; } cdev->private->state = state;io_subchannel_recog_done (cdev); -if (state !=DEV_STATE_NOT_OPER ) -wake_up (&cdev->private->wait_q); +wake_up (&cdev->private->wait_q); }/*
@@ -390,10 +394,13 @@ ccw_device_done(struct ccw_device *cdev, int state) cdev->private->state = state; - -if (state ==DEV_STATE_BOXED ) +if (state ==DEV_STATE_BOXED ) {CIO_MSG_EVENT (0 ,"Boxed device %04x on subchannel %04x\n" , cdev->private->dev_id.devno, sch->schid.sch_no); +if (cdev->online && !ccw_device_notify (cdev,CIO_BOXED )) +ccw_device_schedule_sch_unregister (cdev); + cdev->private->flags.donotify =0 ; + }if (cdev->private->flags.donotify) { cdev->private->flags.donotify =0 ;
drivers/s390/scsi/zfcp_ccw.c +5 -0
@@ -176,6 +176,11 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)zfcp_erp_adapter_reopen (adapter,ZFCP_STATUS_COMMON_ERP_FAILED ,"ccnoti4" ,NULL );break ; +case CIO_BOXED : +dev_warn (&adapter->ccw_device->dev, +"The ccw device did not respond in time.\n" ); +zfcp_erp_adapter_shutdown (adapter,0 ,"ccnoti5" ,NULL ); +break ; }return 1 ; }