lkml.org 
[lkml]   [2009]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch/s390 25/46] cio: Try harder to disable subchannel.
    From: Cornelia Huck <cornelia.huck@de.ibm.com>

    Acting upon the assumption that cio_disable_subchannel()
    is only called when we really want to disable the subchannel
    (a) remove the check for activity (it is already done in
    ccw_device_offline(), which is the place where it matters)
    (b) collect pending status via tsch() and ignore it (it
    can't matter anymore since the subchannel will be disabled).

    Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    ---

    drivers/s390/cio/cio.c | 18 ++++++++++--------
    drivers/s390/cio/device_fsm.c | 2 +-
    2 files changed, 11 insertions(+), 9 deletions(-)

    Index: quilt-2.6/drivers/s390/cio/cio.c
    ===================================================================
    --- quilt-2.6.orig/drivers/s390/cio/cio.c
    +++ quilt-2.6/drivers/s390/cio/cio.c
    @@ -472,6 +472,7 @@ EXPORT_SYMBOL_GPL(cio_enable_subchannel)
    int cio_disable_subchannel(struct subchannel *sch)
    {
    char dbf_txt[15];
    + int retry;
    int ret;

    CIO_TRACE_EVENT (2, "dissch");
    @@ -482,16 +483,17 @@ int cio_disable_subchannel(struct subcha
    if (cio_update_schib(sch))
    return -ENODEV;

    - if (scsw_actl(&sch->schib.scsw) != 0)
    - /*
    - * the disable function must not be called while there are
    - * requests pending for completion !
    - */
    - return -EBUSY;
    -
    sch->config.ena = 0;
    - ret = cio_commit_config(sch);

    + for (retry = 0; retry < 3; retry++) {
    + ret = cio_commit_config(sch);
    + if (ret == -EBUSY) {
    + struct irb irb;
    + if (tsch(sch->schid, &irb) != 0)
    + break;
    + } else
    + break;
    + }
    sprintf (dbf_txt, "ret:%d", ret);
    CIO_TRACE_EVENT (2, dbf_txt);
    return ret;
    Index: quilt-2.6/drivers/s390/cio/device_fsm.c
    ===================================================================
    --- quilt-2.6.orig/drivers/s390/cio/device_fsm.c
    +++ quilt-2.6/drivers/s390/cio/device_fsm.c
    @@ -1052,7 +1052,7 @@ ccw_device_offline_irq(struct ccw_device
    sch = to_subchannel(cdev->dev.parent);
    /*
    * An interrupt in state offline means a previous disable was not
    - * successful. Try again.
    + * successful - should not happen, but we try to disable again.
    */
    cio_disable_subchannel(sch);
    }
    --
    blue skies,
    Martin.

    "Reality continues to ruin my life." - Calvin.



    \
     
     \ /
      Last update: 2009-02-25 16:29    [W:2.161 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site