[PATCH 1/1 V3] MMC: core - fix the use of hard coded timeout value. - Kernel

This is a discussion on [PATCH 1/1 V3] MMC: core - fix the use of hard coded timeout value. - Kernel ; From: Benzi Zbit This adds reading and using of enable_timeout from the CIS Signed-off-by: Benzi Zbit Signed-off-by: Tomas Winkler --- drivers/mmc/core/sdio_cis.c | 6 ++++++ drivers/mmc/core/sdio_io.c | 6 +----- include/linux/mmc/sdio_func.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH 1/1 V3] MMC: core - fix the use of hard coded timeout value.

  1. [PATCH 1/1 V3] MMC: core - fix the use of hard coded timeout value.

    From: Benzi Zbit

    This adds reading and using of enable_timeout from the CIS

    Signed-off-by: Benzi Zbit
    Signed-off-by: Tomas Winkler
    ---
    drivers/mmc/core/sdio_cis.c | 6 ++++++
    drivers/mmc/core/sdio_io.c | 6 +-----
    include/linux/mmc/sdio_func.h | 2 ++
    3 files changed, 9 insertions(+), 5 deletions(-)

    diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
    index d5e51b1..956bd76 100644
    --- a/drivers/mmc/core/sdio_cis.c
    +++ b/drivers/mmc/core/sdio_cis.c
    @@ -129,6 +129,12 @@ static int cistpl_funce_func(struct sdio_func *func,
    /* TPLFE_MAX_BLK_SIZE */
    func->max_blksize = buf[12] | (buf[13] << 8);

    + /* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */
    + if (vsn > SDIO_SDIO_REV_1_00)
    + func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10;
    + else
    + func->enable_timeout = jiffies_to_msecs(HZ);
    +
    return 0;
    }

    diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
    index 3ccf691..0888df6 100755
    --- a/drivers/mmc/core/sdio_io.c
    +++ b/drivers/mmc/core/sdio_io.c
    @@ -76,11 +76,7 @@ int sdio_enable_func(struct sdio_func *func)
    if (ret)
    goto err;

    - /*
    - * FIXME: This should timeout based on information in the CIS,
    - * but we don't have card to parse that yet.
    - */
    - timeout = jiffies + HZ;
    + timeout = jiffies + msecs_to_jiffies(func->enable_timeout);

    while (1) {
    ret = mmc_io_rw_direct(func->card, 0, 0, SDIO_CCCR_IORx, 0, &reg);
    diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
    index 28fb0a3..07bee4a 100755
    --- a/include/linux/mmc/sdio_func.h
    +++ b/include/linux/mmc/sdio_func.h
    @@ -46,6 +46,8 @@ struct sdio_func {
    unsigned max_blksize; /* maximum block size */
    unsigned cur_blksize; /* current block size */

    + unsigned enable_timeout; /* max enable timeout in msec */
    +
    unsigned int state; /* function state */
    #define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */

    --
    1.5.4.1

    ---------------------------------------------------------------------
    Intel Israel (74) Limited

    This e-mail and any attachments may contain confidential material for
    the sole use of the intended recipient(s). Any review or distribution
    by others is strictly prohibited. If you are not the intended
    recipient, please contact the sender and delete all copies.

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH 1/1 V3] MMC: core - fix the use of hard coded timeout value.

    On Thu, 10 Jul 2008 02:41:43 +0300
    Tomas Winkler wrote:

    > From: Benzi Zbit
    >
    > This adds reading and using of enable_timeout from the CIS
    >
    > Signed-off-by: Benzi Zbit
    > Signed-off-by: Tomas Winkler
    > ---


    Looks ok. Applied.

    --
    -- Pierre Ossman

    Linux kernel, MMC maintainer http://www.kernel.org
    rdesktop, core developer http://www.rdesktop.org

    WARNING: This correspondence is being monitored by the
    Swedish government. Make sure your server uses encryption
    for SMTP traffic and consider using PGP for end-to-end
    encryption.

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v2.0.9 (GNU/Linux)

    iEYEARECAAYFAkh2aT0ACgkQ7b8eESbyJLg6JACfTObc8iyGQx 1VwCCXxI8GD7f8
    DT8AoJQjNqqDS4IY6yuO/zpBntjrCqVR
    =Nq8R
    -----END PGP SIGNATURE-----


+ Reply to Thread