s390 (2/13): common i/o layer.
Subsystems (2)
PATCH 1/1 s390 (2/13): common i/o layer.
updates for the channel subsystem and qdio driver
This adds the missing support for chp machine checks, i.e. enabling or disabling a set of devices from the service element. Some minor bugs in the driver are fixed as well.
drivers/s390/cio/ccwgroup.c +1 -1
@@ -1,7 +1,7 @@/* * drivers/s390/cio/ccwgroup.c * bus driver for ccwgroup -* $Revision: 1.5 $ +* $Revision: 1.6 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation
drivers/s390/cio/chsc.c +203 -98
397 lines not on this page · raw message
drivers/s390/cio/chsc.h +1 -1
@@ -95,7 +95,7 @@struct channel_path {int id;int state; -struct sys_device sdev; +struct device dev; };extern struct channel_path *chps[];
drivers/s390/cio/cio.c +2 -3
@@ -1,7 +1,7 @@/* * drivers/s390/cio/cio.c * S/390 common I/O routines -- low level i/o calls -* $Revision: 1.90 $ +* $Revision: 1.91 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation
@@ -197,8 +197,7 @@ sch->orb.pfch = sch->options.prefetch ==0 ; sch->orb.spnd = sch->options.suspend; sch->orb.ssic = sch->options.suspend && sch->options.inter; - sch->orb.lpm = (lpm !=0 ) ? (lpm & sch->lpm) : sch->lpm; - + sch->orb.lpm = (lpm !=0 ) ? lpm : sch->lpm;#ifdef CONFIG_ARCH_S390X /* * for 64 bit we always support 64 bit IDAWs with 4k page size only
drivers/s390/cio/device.c +28 -9
@@ -1,7 +1,7 @@/* * drivers/s390/cio/device.c * bus driver for ccw devices -* $Revision: 1.45 $ +* $Revision: 1.50 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation
@@ -215,6 +215,8 @@void ccw_device_set_offline (struct ccw_device *cdev) { +int ret; +if (!cdev)return ;if (!cdev->online || !cdev->drv)
@@ -226,23 +228,36 @@ cdev->online =0 ;spin_lock_irq (cdev->ccwlock); -ccw_device_offline (cdev); + ret =ccw_device_offline (cdev);spin_unlock_irq (cdev->ccwlock); -wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +if (ret ==0 ) +wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +else +//FIXME: we can't fail! +pr_debug ("ccw_device_offline returned %d, device %s\n" , + ret, cdev->dev.bus_id); }void ccw_device_set_online (struct ccw_device *cdev) { -if (!cdev || !cdev->handler) +int ret; + +if (!cdev)return ;if (cdev->online || !cdev->drv)return ;spin_lock_irq (cdev->ccwlock); -ccw_device_online (cdev); + ret =ccw_device_online (cdev);spin_unlock_irq (cdev->ccwlock); -wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +if (ret ==0 ) +wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +else { +pr_debug ("ccw_device_online returned %d, device %s\n" , + ret, cdev->dev.bus_id); +return ; + }if (cdev->private->state !=DEV_STATE_ONLINE )return ;if (!cdev->drv->set_online || cdev->drv->set_online (cdev) ==0 ) {
@@ -250,9 +265,13 @@return ; }spin_lock_irq (cdev->ccwlock); -ccw_device_offline (cdev); + ret =ccw_device_offline (cdev);spin_unlock_irq (cdev->ccwlock); -wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +if (ret ==0 ) +wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); +else +pr_debug ("ccw_device_offline returned %d, device %s\n" , + ret, cdev->dev.bus_id); } static ssize_t
@@ -574,7 +593,7 @@* doubled code. * This is safe because of the checks in ccw_device_set_offline. */ -pr_debug (KERN_INFO "removing device %s, sch %d, devno %x\n" , +pr_debug ("removing device %s, sch %d, devno %x\n" , cdev->dev.name, cdev->private->irq, cdev->private->devno);
drivers/s390/cio/device_id.c +1 -1
@@ -136,7 +136,7 @@ ccode =diag210 (&diag_data); ps->reserved =0xff ; -/* Special case for bloddy osa devices. */ +/* Special case for bloody osa devices. */ if (diag_data.vrdcvcla ==0x02 && diag_data.vrdcvtyp ==0x20 ) { ps->cu_type =0x3088 ;
drivers/s390/cio/device_ops.c +18 -8
@@ -48,7 +48,8 @@if (!cdev)return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE && - cdev->private->state !=DEV_STATE_W4SENSE ) + cdev->private->state !=DEV_STATE_W4SENSE && + cdev->private->state !=DEV_STATE_QDIO_ACTIVE )return -EINVAL ; sch =to_subchannel (cdev->dev.parent);if (!sch)
@@ -122,6 +123,15 @@ {struct subchannel *sch;unsigned int stctl; +void (*handler)(struct ccw_device *,unsigned long ,struct irb *); + +if (cdev->private->state ==DEV_STATE_QDIO_ACTIVE ) { +if (cdev->private->qdio_data) + handler = cdev->private->qdio_data->handler; +else + handler =NULL ; + }else + handler = cdev->handler; sch =to_subchannel (cdev->dev.parent);
@@ -144,13 +154,9 @@/* * Now we are ready to call the device driver interrupt handler. */ -if (cdev->private->state ==DEV_STATE_QDIO_ACTIVE ) { -if (cdev->private->qdio_data && - cdev->private->qdio_data->handler) - cdev->private->qdio_data->handler (cdev, sch->u_intparm, - &cdev->private->irb); - }else - cdev->handler (cdev, sch->u_intparm, &cdev->private->irb); +if (handler) +handler (cdev, sch->u_intparm, &cdev->private->irb); +/* * Clear the old and now useless interrupt response block. */
@@ -245,6 +251,8 @@wait_event (cdev->private->wait_q, sch->schib.scsw.actl ==0 );spin_lock_irqsave (&sch->lock, flags); +/* FIXME: Check if we got sensible stuff. */ +break ; } }/* Restore interrupt handler. */
@@ -317,6 +325,8 @@spin_unlock_irqrestore (&sch->lock, flags);wait_event (cdev->private->wait_q, sch->schib.scsw.actl ==0 );spin_lock_irqsave (&sch->lock, flags); +/* FIXME: Check if we got sensible stuff. */ +break ; }/* Restore interrupt handler. */ cdev->handler = handler;
drivers/s390/cio/device_pgid.c +12 -0
@@ -141,6 +141,8 @@struct subchannel *sch;struct irb *irb;int ret; +int opm; +int i; irb = (struct irb *) __LC_IRB;/* Ignore unsolicited interrupts. */
@@ -154,6 +156,16 @@/* 0, -ETIME, -EOPNOTSUPP, -EAGAIN, -EACCES or -EUSERS */ case 0 :/* Sense Path Group ID successful. */ cdev->private->flags.pgid_supp =1 ; + opm = sch->schib.pmcw.pim & + sch->schib.pmcw.pam & + sch->schib.pmcw.pom; +for (i=0 ;i<8 ;i++) { +if (opm == (0x80 << i)) { +/* Don't group single path devices. */ + cdev->private->flags.pgid_supp =0 ; +break ; + } + }if (cdev->private->pgid.inf.ps.state1 ==SNID_STATE1_RESET )memcpy (&cdev->private->pgid, &global_pgid,sizeof (struct pgid ));
drivers/s390/cio/device_status.c +5 -4
@@ -62,8 +62,9 @@ sch =to_subchannel (cdev->dev.parent);stsch (sch->irq, &sch->schib); -CIO_MSG_EVENT (0 ,"cio_process_irq(%04X) - path(s) %02x are " -"not operational " , sch->irq, sch->schib.pmcw.pnom); +CIO_MSG_EVENT (0 ,"%s(%04X) - path(s) %02x are " +"not operational \n" , __FUNCTION__, sch->irq, + sch->schib.pmcw.pnom); sch->lpm &= ~sch->schib.pmcw.pnom;dev_fsm_event (cdev,DEV_EVENT_VERIFY );
@@ -289,7 +290,7 @@ sch =to_subchannel (cdev->dev.parent);/* A sense is required, can we do it now ? */ -if (irb->scsw.actl !=0 ) +if ((irb->scsw.actl & (SCSW_ACTL_DEVACT |SCSW_ACTL_SCHACT )) !=0 )/* * we received an Unit Check but we have no final * status yet, therefore we must delay the SENSE
@@ -348,7 +349,7 @@ ccw_device_accumulate_and_sense(struct ccw_device *cdev, struct irb *irb) {ccw_device_accumulate_irb (cdev, irb); -if (irb->scsw.actl !=0 ) +if ((irb->scsw.actl & (SCSW_ACTL_DEVACT |SCSW_ACTL_SCHACT )) !=0 )return -EBUSY ;/* Check for basic sense. */ if (cdev->private->flags.dosense &&
drivers/s390/cio/ioasm.h +0 -77
83 lines not on this page · raw message
drivers/s390/cio/qdio.c +211 -112
615 lines not on this page · raw message
drivers/s390/cio/qdio.h +7 -2
@@ -1,7 +1,7 @@#ifndef _CIO_QDIO_H#define _CIO_QDIO_H -#define VERSION_CIO_QDIO_H "$Revision: 1.8 $" +#define VERSION_CIO_QDIO_H "$Revision: 1.11 $"//#define QDIO_DBF_LIKE_HELL
@@ -48,6 +48,10 @@#define QDIO_STATS_CLASSES 2 #define QDIO_STATS_COUNT_NEEDED 2*/ +#define QDIO_ACTIVATE_DELAY 5/* according to brenton belmar and paul +gioquindo it can take up to 5ms before +queues are really active */ +#define QDIO_NO_USE_COUNT_TIME 10#define QDIO_NO_USE_COUNT_TIMEOUT 1000/* wait for 1 sec on each q before exiting without having use_count
@@ -579,6 +583,7 @@int is_input_q;int irq; +struct ccw_device *cdev;unsigned int is_iqdio_q;
@@ -670,7 +675,7 @@unsigned int sync_done_on_outb_pcis;unsigned int state; -spinlock_t setting_up_lock; +struct semaphore setting_up_sema;unsigned int no_input_qs;unsigned int no_output_qs;
drivers/s390/s390mach.c +8 -11
@@ -21,6 +21,7 @@extern void css_process_crw (int );extern void chsc_process_crw (void ); +extern void chp_process_crw (int );static void s390_handle_damage (char *msg)
@@ -53,29 +54,25 @@ crw.erc, crw.rsid);switch (crw.rsc) {case CRW_RSC_SCH : -pr_debug (KERN_NOTICE ,"source is subchannel %04X\n" , - crw.rsid); +pr_debug ("source is subchannel %04X\n" , crw.rsid);css_process_crw (crw.rsid);break ;case CRW_RSC_MONITOR : -pr_debug (KERN_NOTICE , -"source is monitoring facility\n" ); +pr_debug ("source is monitoring facility\n" );break ;case CRW_RSC_CPATH : -pr_debug (KERN_NOTICE , -"source is channel path %02X\n" , - pcrwe->crw.rsid); +pr_debug ("source is channel path %02X\n" , crw.rsid); +chp_process_crw (crw.rsid);break ;case CRW_RSC_CONFIG : -pr_debug (KERN_NOTICE , -"source is configuration-alert facility\n" ); +pr_debug ("source is configuration-alert facility\n" );break ;case CRW_RSC_CSS : -pr_debug (KERN_NOTICE ,"source is channel subsystem\n" ); +pr_debug ("source is channel subsystem\n" );chsc_process_crw ();break ;default : -pr_debug (KERN_NOTICE ,"unknown source\n" ); +pr_debug ("unknown source\n" );break ; } }while (crw.chn);
include/asm-s390/qdio.h +7 -3
@@ -50,11 +50,11 @@ } __attribute__ ((packed,aligned(256))); -/* params are: irq, status, qdio_error, siga_error, +/* params are: ccw_device, status, qdio_error, siga_error, queue_number, first element processed, number of elements processed, int_parm */ -typedef void qdio_handler_t (int ,unsigned int ,unsigned int ,unsigned int , -unsigned int ,int ,int ,unsigned long ); +typedef void qdio_handler_t (struct ccw_device *,unsigned int ,unsigned int , +unsigned int ,unsigned int ,int ,int ,unsigned long );#define QDIO_STATUS_INBOUND_INT 0x01
@@ -100,6 +100,8 @@void **output_sbal_addr_array;/* addr of n*128 void ptrs */ };extern int qdio_initialize (struct qdio_initialize *init_data); +extern int qdio_allocate (struct qdio_initialize *init_data); +extern int qdio_establish (struct ccw_device *);extern int qdio_activate (struct ccw_device *,int flags);
@@ -127,6 +129,8 @@ unsigned int queue_number);extern int qdio_cleanup (struct ccw_device *,int how); +extern int qdio_shutdown (struct ccw_device *,int how); +extern int qdio_free (struct ccw_device *); unsigned char qdio_get_slsb_state(struct ccw_device*, unsigned int flag, unsigned int queue_number,
include/asm-s390x/qdio.h +7 -3
@@ -50,11 +50,11 @@ } __attribute__ ((packed,aligned(256))); -/* params are: irq, status, qdio_error, siga_error, +/* params are: ccw_device, status, qdio_error, siga_error, queue_number, first element processed, number of elements processed, int_parm */ -typedef void qdio_handler_t (int ,unsigned int ,unsigned int ,unsigned int , -unsigned int ,int ,int ,unsigned long ); +typedef void qdio_handler_t (struct ccw_device *,unsigned int ,unsigned int , +unsigned int ,unsigned int ,int ,int ,unsigned long );#define QDIO_STATUS_INBOUND_INT 0x01
@@ -100,6 +100,8 @@void **output_sbal_addr_array;/* addr of n*128 void ptrs */ };extern int qdio_initialize (struct qdio_initialize *init_data); +extern int qdio_allocate (struct qdio_initialize *init_data); +extern int qdio_establish (struct ccw_device *);extern int qdio_activate (struct ccw_device *,int flags);
@@ -127,6 +129,8 @@ unsigned int queue_number);extern int qdio_cleanup (struct ccw_device *,int how); +extern int qdio_shutdown (struct ccw_device *,int how); +extern int qdio_free (struct ccw_device *); unsigned char qdio_get_slsb_state(struct ccw_device*, unsigned int flag, unsigned int queue_number,