10 files changed, 226 insertions, 86 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 2d78f0f4a40f..dbfb77b03928 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -251,6 +251,8 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
                cc = cio_clear(sch);
                if (cc == -ENODEV)
                        goto out_unreg;
+                /* Request retry of internal operation. */
+                device_set_intretry(sch);
                /* Call handler. */
                if (sch->driver && sch->driver->termination)
                        sch->driver->termination(&sch->dev);
@@ -711,9 +713,6 @@ static inline int check_for_io_on_path(struct subchannel *sch, int index)
 {
        int cc;
-        if (!device_is_online(sch))
-                /* cio could be doing I/O. */
-                return 0;
        cc = stsch(sch->schid, &sch->schib);
        if (cc)
                return 0;
@@ -722,6 +721,26 @@ static inline int check_for_io_on_path(struct subchannel *sch, int index)
        return 0;
 }
+static void terminate_internal_io(struct subchannel *sch)
+{
+        if (cio_clear(sch)) {
+                /* Recheck device in case clear failed. */
+                sch->lpm = 0;
+                if (device_trigger_verify(sch) != 0) {
+                        if(css_enqueue_subchannel_slow(sch->schid)) {
+                                css_clear_subchannel_slow_list();
+                                need_rescan = 1;
+                        }
+                }
+                return;
+        }
+        /* Request retry of internal operation. */
+        device_set_intretry(sch);
+        /* Call handler. */
+        if (sch->driver && sch->driver->termination)
+                sch->driver->termination(&sch->dev);
+}
 static inline void
 __s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
 {
@@ -744,20 +763,26 @@ __s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
                                device_trigger_reprobe(sch);
                        else if (sch->driver && sch->driver->verify)
                                sch->driver->verify(&sch->dev);
-                } else {
+                        break;
-                        sch->opm &= ~(0x80 >> chp);
+                }
-                        sch->lpm &= ~(0x80 >> chp);
+                sch->opm &= ~(0x80 >> chp);
-                        if (check_for_io_on_path(sch, chp))
+                sch->lpm &= ~(0x80 >> chp);
+                if (check_for_io_on_path(sch, chp)) {
+                        if (device_is_online(sch))
                                /* Path verification is done after killing. */
                                device_kill_io(sch);
-                        else if (!sch->lpm) {
+                        else
+                                /* Kill and retry internal I/O. */
+                                terminate_internal_io(sch);
+                } else if (!sch->lpm) {
+                        if (device_trigger_verify(sch) != 0) {
                                if (css_enqueue_subchannel_slow(sch->schid)) {
                                        css_clear_subchannel_slow_list();
                                        need_rescan = 1;
                                }
-                        } else if (sch->driver && sch->driver->verify)
+                        }
-                                sch->driver->verify(&sch->dev);
+                } else if (sch->driver && sch->driver->verify)
-                }
+                        sch->driver->verify(&sch->dev);
                break;
        }
        spin_unlock_irqrestore(&sch->lock, flags);
@@ -1465,41 +1490,6 @@ chsc_get_chp_desc(struct subchannel *sch, int chp_no)
        return desc;
 }
-static int reset_channel_path(struct channel_path *chp)
-{
-        int cc;
-        cc = rchp(chp->id);
-        switch (cc) {
-        case 0:
-                return 0;
-        case 2:
-                return -EBUSY;
-        default:
-                return -ENODEV;
-        }
-}
-static void reset_channel_paths_css(struct channel_subsystem *css)
-{
-        int i;
-        for (i = 0; i <= __MAX_CHPID; i++) {
-                if (css->chps[i])
-                        reset_channel_path(css->chps[i]);
-        }
-}
-void cio_reset_channel_paths(void)
-{
-        int i;
-        for (i = 0; i <= __MAX_CSSID; i++) {
-                if (css[i] && css[i]->valid)
-                        reset_channel_paths_css(css[i]);
-        }
-}
 static int __init
 chsc_alloc_sei_area(void)
 {
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 8936e460a807..20aee2783847 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -21,6 +21,7 @@
 #include <asm/irq.h>
 #include <asm/irq_regs.h>
 #include <asm/setup.h>
+#include <asm/reset.h>
 #include "airq.h"
 #include "cio.h"
 #include "css.h"
@@ -28,6 +29,7 @@
 #include "ioasm.h"
 #include "blacklist.h"
 #include "cio_debug.h"
+#include "../s390mach.h"
 debug_info_t *cio_debug_msg_id;
 debug_info_t *cio_debug_trace_id;
@@ -841,26 +843,12 @@ __clear_subchannel_easy(struct subchannel_id schid)
        return -EBUSY;
 }
-struct sch_match_id {
+static int __shutdown_subchannel_easy(struct subchannel_id schid, void *data)
-        struct subchannel_id schid;
-        struct ccw_dev_id devid;
-        int rc;
-};
-static int __shutdown_subchannel_easy_and_match(struct subchannel_id schid,
-        void *data)
 {
        struct schib schib;
-        struct sch_match_id *match_id = data;
        if (stsch_err(schid, &schib))
                return -ENXIO;
-        if (match_id && schib.pmcw.dnv &&
-                (schib.pmcw.dev == match_id->devid.devno) &&
-                (schid.ssid == match_id->devid.ssid)) {
-                match_id->schid = schid;
-                match_id->rc = 0;
-        }
        if (!schib.pmcw.ena)
                return 0;
        switch(__disable_subchannel_easy(schid, &schib)) {
@@ -876,27 +864,111 @@ static int __shutdown_subchannel_easy_and_match(struct subchannel_id schid,
        return 0;
 }
-static int clear_all_subchannels_and_match(struct ccw_dev_id *devid,
+static atomic_t chpid_reset_count;
-        struct subchannel_id *schid)
+static void s390_reset_chpids_mcck_handler(void)
+{
+        struct crw crw;
+        struct mci *mci;
+        /* Check for pending channel report word. */
+        mci = (struct mci *)&S390_lowcore.mcck_interruption_code;
+        if (!mci->cp)
+                return;
+        /* Process channel report words. */
+        while (stcrw(&crw) == 0) {
+                /* Check for responses to RCHP. */
+                if (crw.slct && crw.rsc == CRW_RSC_CPATH)
+                        atomic_dec(&chpid_reset_count);
+        }
+}
+#define RCHP_TIMEOUT (30 * USEC_PER_SEC)
+static void css_reset(void)
+{
+        int i, ret;
+        unsigned long long timeout;
+        /* Reset subchannels. */
+        for_each_subchannel(__shutdown_subchannel_easy,  NULL);
+        /* Reset channel paths. */
+        s390_reset_mcck_handler = s390_reset_chpids_mcck_handler;
+        /* Enable channel report machine checks. */
+        __ctl_set_bit(14, 28);
+        /* Temporarily reenable machine checks. */
+        local_mcck_enable();
+        for (i = 0; i <= __MAX_CHPID; i++) {
+                ret = rchp(i);
+                if ((ret == 0) || (ret == 2))
+                        /*
+                         * rchp either succeeded, or another rchp is already
+                         * in progress. In either case, we'll get a crw.
+                         */
+                        atomic_inc(&chpid_reset_count);
+        }
+        /* Wait for machine check for all channel paths. */
+        timeout = get_clock() + (RCHP_TIMEOUT << 12);
+        while (atomic_read(&chpid_reset_count) != 0) {
+                if (get_clock() > timeout)
+                        break;
+                cpu_relax();
+        }
+        /* Disable machine checks again. */
+        local_mcck_disable();
+        /* Disable channel report machine checks. */
+        __ctl_clear_bit(14, 28);
+        s390_reset_mcck_handler = NULL;
+}
+static struct reset_call css_reset_call = {
+        .fn = css_reset,
+};
+static int __init init_css_reset_call(void)
+{
+        atomic_set(&chpid_reset_count, 0);
+        register_reset_call(&css_reset_call);
+        return 0;
+}
+arch_initcall(init_css_reset_call);
+struct sch_match_id {
+        struct subchannel_id schid;
+        struct ccw_dev_id devid;
+        int rc;
+};
+static int __reipl_subchannel_match(struct subchannel_id schid, void *data)
+{
+        struct schib schib;
+        struct sch_match_id *match_id = data;
+        if (stsch_err(schid, &schib))
+                return -ENXIO;
+        if (schib.pmcw.dnv &&
+            (schib.pmcw.dev == match_id->devid.devno) &&
+            (schid.ssid == match_id->devid.ssid)) {
+                match_id->schid = schid;
+                match_id->rc = 0;
+                return 1;
+        }
+        return 0;
+}
+static int reipl_find_schid(struct ccw_dev_id *devid,
+                            struct subchannel_id *schid)
 {
        struct sch_match_id match_id;
        match_id.devid = *devid;
        match_id.rc = -ENODEV;
-        local_irq_disable();
+        for_each_subchannel(__reipl_subchannel_match, &match_id);
-        for_each_subchannel(__shutdown_subchannel_easy_and_match, &match_id);
        if (match_id.rc == 0)
                *schid = match_id.schid;
        return match_id.rc;
 }
-void clear_all_subchannels(void)
-{
-        local_irq_disable();
-        for_each_subchannel(__shutdown_subchannel_easy_and_match, NULL);
-}
 extern void do_reipl_asm(__u32 schid);
 /* Make sure all subchannels are quiet before we re-ipl an lpar. */
@@ -904,9 +976,9 @@ void reipl_ccw_dev(struct ccw_dev_id *devid)
 {
        struct subchannel_id schid;
-        if (clear_all_subchannels_and_match(devid, &schid))
+        s390_reset_system();
+        if (reipl_find_schid(devid, &schid) != 0)
                panic("IPL Device not found\n");
-        cio_reset_channel_paths();
        do_reipl_asm(*((__u32*)&schid));
 }
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 4c2ff8336288..9ff064e71767 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -94,6 +94,7 @@ struct ccw_device_private {
                unsigned int donotify:1;    /* call notify function */
                unsigned int recog_done:1;  /* dev. recog. complete */
                unsigned int fake_irb:1;    /* deliver faked irb */
+                unsigned int intretry:1;    /* retry internal operation */
        } __attribute__((packed)) flags;
        unsigned long intparm;  /* user interruption parameter */
        struct qdio_irq *qdio_data;
@@ -171,6 +172,8 @@ void device_trigger_reprobe(struct subchannel *);
 /* Helper functions for vary on/off. */
 int device_is_online(struct subchannel *);
 void device_kill_io(struct subchannel *);
+void device_set_intretry(struct subchannel *sch);
+int device_trigger_verify(struct subchannel *sch);
 /* Machine check helper function. */
 void device_kill_pending_timer(struct subchannel *);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 39c98f940507..d3d3716ff84b 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -687,8 +687,20 @@ io_subchannel_register(void *data)
        cdev = data;
        sch = to_subchannel(cdev->dev.parent);
+        /*
+         * io_subchannel_register() will also be called after device
+         * recognition has been done for a boxed device (which will already
+         * be registered). We need to reprobe since we may now have sense id
+         * information.
+         */
        if (klist_node_attached(&cdev->dev.knode_parent)) {
-                bus_rescan_devices(&ccw_bus_type);
+                if (!cdev->drv) {
+                        ret = device_reprobe(&cdev->dev);
+                        if (ret)
+                                /* We can't do much here. */
+                                dev_info(&cdev->dev, "device_reprobe() returned"
+                                         " %d\n", ret);
+                }
                goto out;
        }
        /* make it known to the system */
@@ -948,6 +960,9 @@ io_subchannel_ioterm(struct device *dev)
        cdev = dev->driver_data;
        if (!cdev)
                return;
+        /* Internal I/O will be retried by the interrupt handler. */
+        if (cdev->private->flags.intretry)
+                return;
        cdev->private->state = DEV_STATE_CLEAR_VERIFY;
        if (cdev->handler)
                cdev->handler(cdev, cdev->private->intparm,
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index de3d0857db9f..09c7672eb3f3 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -59,6 +59,27 @@ device_set_disconnected(struct subchannel *sch)
        cdev->private->state = DEV_STATE_DISCONNECTED;
 }
+void device_set_intretry(struct subchannel *sch)
+{
+        struct ccw_device *cdev;
+        cdev = sch->dev.driver_data;
+        if (!cdev)
+                return;
+        cdev->private->flags.intretry = 1;
+}
+int device_trigger_verify(struct subchannel *sch)
+{
+        struct ccw_device *cdev;
+        cdev = sch->dev.driver_data;
+        if (!cdev || !cdev->online)
+                return -EINVAL;
+        dev_fsm_event(cdev, DEV_EVENT_VERIFY);
+        return 0;
+}
 /*
 * Timeout function. It just triggers a DEV_EVENT_TIMEOUT.
 */
@@ -893,6 +914,12 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
         * had killed the original request.
         */
        if (irb->scsw.fctl & (SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_HALT_FUNC)) {
+                /* Retry Basic Sense if requested. */
+                if (cdev->private->flags.intretry) {
+                        cdev->private->flags.intretry = 0;
+                        ccw_device_do_sense(cdev, irb);
+                        return;
+                }
                cdev->private->flags.dosense = 0;
                memset(&cdev->private->irb, 0, sizeof(struct irb));
                ccw_device_accumulate_irb(cdev, irb);
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index a74785b9e4eb..f17275917fe5 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -191,6 +191,8 @@ __ccw_device_sense_id_start(struct ccw_device *cdev)
                if ((sch->opm & cdev->private->imask) != 0 &&
                    cdev->private->iretry > 0) {
                        cdev->private->iretry--;
+                        /* Reset internal retry indication. */
+                        cdev->private->flags.intretry = 0;
                        ret = cio_start (sch, cdev->private->iccws,
                                         cdev->private->imask);
                        /* ret is 0, -EBUSY, -EACCES or -ENODEV */
@@ -237,8 +239,14 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                return 0; /* Success */
        }
        /* Check the error cases. */
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC))
+        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+                /* Retry Sense ID if requested. */
+                if (cdev->private->flags.intretry) {
+                        cdev->private->flags.intretry = 0;
+                        return -EAGAIN;
+                }
                return -ETIME;
+        }
        if (irb->esw.esw0.erw.cons && (irb->ecw[0] & SNS0_CMD_REJECT)) {
                /*
                 * if the device doesn't support the SenseID
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index 2975ce888c19..cb1879a96818 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -71,6 +71,8 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)
                ccw->cda = (__u32) __pa (&cdev->private->pgid[i]);
                if (cdev->private->iretry > 0) {
                        cdev->private->iretry--;
+                        /* Reset internal retry indication. */
+                        cdev->private->flags.intretry = 0;
                        ret = cio_start (sch, cdev->private->iccws, 
                                         cdev->private->imask);
                        /* ret is 0, -EBUSY, -EACCES or -ENODEV */
@@ -122,8 +124,14 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
        sch = to_subchannel(cdev->dev.parent);
        irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC))
+        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+                /* Retry Sense PGID if requested. */
+                if (cdev->private->flags.intretry) {
+                        cdev->private->flags.intretry = 0;
+                        return -EAGAIN;
+                }
                return -ETIME;
+        }
        if (irb->esw.esw0.erw.cons &&
            (irb->ecw[0]&(SNS0_CMD_REJECT|SNS0_INTERVENTION_REQ))) {
                /*
@@ -253,6 +261,8 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
        ret = -EACCES;
        if (cdev->private->iretry > 0) {
                cdev->private->iretry--;
+                /* Reset internal retry indication. */
+                cdev->private->flags.intretry = 0;
                ret = cio_start (sch, cdev->private->iccws,
                                 cdev->private->imask);
                /* We expect an interrupt in case of success or busy
@@ -293,6 +303,8 @@ static int __ccw_device_do_nop(struct ccw_device *cdev)
        ret = -EACCES;
        if (cdev->private->iretry > 0) {
                cdev->private->iretry--;
+                /* Reset internal retry indication. */
+                cdev->private->flags.intretry = 0;
                ret = cio_start (sch, cdev->private->iccws,
                                 cdev->private->imask);
                /* We expect an interrupt in case of success or busy
@@ -321,8 +333,14 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
        sch = to_subchannel(cdev->dev.parent);
        irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC))
+        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+                /* Retry Set PGID if requested. */
+                if (cdev->private->flags.intretry) {
+                        cdev->private->flags.intretry = 0;
+                        return -EAGAIN;
+                }
                return -ETIME;
+        }
        if (irb->esw.esw0.erw.cons) {
                if (irb->ecw[0] & SNS0_CMD_REJECT)
                        return -EOPNOTSUPP;
@@ -360,8 +378,14 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
        sch = to_subchannel(cdev->dev.parent);
        irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC))
+        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+                /* Retry NOP if requested. */
+                if (cdev->private->flags.intretry) {
+                        cdev->private->flags.intretry = 0;
+                        return -EAGAIN;
+                }
                return -ETIME;
+        }
        if (irb->scsw.cc == 3) {
                CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel 0.%x.%04x,"
                              " lpm %02X, became 'not operational'\n",
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 3f7cbce4cd87..bdcf930f7beb 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -319,6 +319,9 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb)
        sch->sense_ccw.count = SENSE_MAX_COUNT;
        sch->sense_ccw.flags = CCW_FLAG_SLI;
+        /* Reset internal retry indication. */
+        cdev->private->flags.intretry = 0;
        return cio_start (sch, &sch->sense_ccw, 0xff);
 }
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 476aa1da5cbc..8d5fa1b4d11f 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -481,7 +481,7 @@ qdio_stop_polling(struct qdio_q *q)
       unsigned char state = 0;
       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
-        if (!atomic_swap(&q->polling,0)) 
+        if (!atomic_xchg(&q->polling,0))
                return 1;
        QDIO_DBF_TEXT4(0,trace,"stoppoll");
@@ -1964,8 +1964,8 @@ qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb)
                QDIO_DBF_HEX0(0,sense,irb,QDIO_DBF_SENSE_LEN);
                QDIO_PRINT_WARN("sense data available on qdio channel.\n");
-                HEXDUMP16(WARN,"irb: ",irb);
+                QDIO_HEXDUMP16(WARN,"irb: ",irb);
-                HEXDUMP16(WARN,"sense data: ",irb->ecw);
+                QDIO_HEXDUMP16(WARN,"sense data: ",irb->ecw);
        }
                
 }
@@ -3425,7 +3425,7 @@ do_qdio_handle_inbound(struct qdio_q *q, unsigned int callflags,
        
        if ((used_elements+count==QDIO_MAX_BUFFERS_PER_Q)&&
            (callflags&QDIO_FLAG_UNDER_INTERRUPT))
-                atomic_swap(&q->polling,0);
+                atomic_xchg(&q->polling,0);
        
        if (used_elements) 
                return;
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 49bb9e371c32..42927c1b7451 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -236,7 +236,7 @@ enum qdio_irq_states {
 #define QDIO_PRINT_EMERG(x...) do { } while (0)
 #endif
-#define HEXDUMP16(importance,header,ptr) \
+#define QDIO_HEXDUMP16(importance,header,ptr) \
 QDIO_PRINT_##importance(header "%02x %02x %02x %02x  " \
                        "%02x %02x %02x %02x  %02x %02x %02x %02x  " \
                        "%02x %02x %02x %02x\n",*(((char*)ptr)), \
@@ -429,8 +429,6 @@ struct qdio_perf_stats {
 };
 #endif /* QDIO_PERFORMANCE_STATS */
-#define atomic_swap(a,b) xchg((int*)a.counter,b)
 /* unlikely as the later the better */
 #define SYNC_MEMORY if (unlikely(q->siga_sync)) qdio_siga_sync_q(q)
 #define SYNC_MEMORY_ALL if (unlikely(q->siga_sync)) \