lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2/4] sdio: set the functions' block size
    -- 
    David Vrabel, Software Engineer, Drivers group Tel: +44 (0)1223 692562
    CSR plc, Churchill House, Cambridge Business Park, Cowley Road, CB4 0WZ


    .
    sdio: set the functions' block size

    During function initialization, set the functions' block size to the
    largest that's supported by both the card and the host.

    Signed-off-by: David Vrabel <david.vrabel@csr.com>
    ---
    Index: mmc/drivers/mmc/core/sdio_cis.c
    ===================================================================
    --- mmc.orig/drivers/mmc/core/sdio_cis.c 2007-08-07 00:38:33.000000000 +0100
    +++ mmc/drivers/mmc/core/sdio_cis.c 2007-08-07 00:38:33.000000000 +0100
    @@ -145,9 +145,9 @@
    printk(KERN_DEBUG "%s: TPLFE_CSA_PROPERTY = 0x%02x\n",
    sdio_func_id(func), val);
    /* TPLFE_MAX_BLK_SIZE */
    - func->blksize = buf[12] | (buf[13] << 8);
    + func->max_blksize = buf[12] | (buf[13] << 8);
    printk(KERN_DEBUG "%s: TPLFE_MAX_BLK_SIZE = %u\n",
    - sdio_func_id(func), (unsigned)func->blksize);
    + sdio_func_id(func), (unsigned)func->max_blksize);
    /* TPLFE_OCR */
    val = buf[14] | (buf[15] << 8) | (buf[16] << 16) | (buf[17] << 24);
    printk(KERN_DEBUG "%s: TPLFE_OCR = 0x%08x\n",
    Index: mmc/drivers/mmc/core/sdio_io.c
    ===================================================================
    --- mmc.orig/drivers/mmc/core/sdio_io.c 2007-08-07 00:38:31.000000000 +0100
    +++ mmc/drivers/mmc/core/sdio_io.c 2007-08-07 07:17:33.000000000 +0100
    @@ -145,6 +145,31 @@
    EXPORT_SYMBOL_GPL(sdio_disable_func);

    /**
    + * sdio_set_block_size - set the block size of an SDIO function
    + * @func: SDIO function to change
    + * @blksz: new block size
    + */
    +int sdio_set_block_size(struct sdio_func *func, unsigned blksz)
    +{
    + int ret;
    +
    + ret = mmc_io_rw_direct(func->card, 1, 0,
    + SDIO_FBR_BASE(func->num) + SDIO_FBR_BLKSIZE,
    + blksz & 0xff, NULL);
    + if (ret)
    + return ret;
    + ret = mmc_io_rw_direct(func->card, 1, 0,
    + SDIO_FBR_BASE(func->num) + SDIO_FBR_BLKSIZE + 1,
    + (blksz >> 8) & 0xff, NULL);
    + if (ret)
    + return ret;
    + func->cur_blksize = blksz;
    + return 0;
    +}
    +
    +EXPORT_SYMBOL_GPL(sdio_set_block_size);
    +
    +/**
    * sdio_readb - read a single byte from a SDIO function
    * @func: SDIO function to access
    * @addr: address to read
    Index: mmc/include/linux/mmc/sdio_func.h
    ===================================================================
    --- mmc.orig/include/linux/mmc/sdio_func.h 2007-08-07 00:38:31.000000000 +0100
    +++ mmc/include/linux/mmc/sdio_func.h 2007-08-07 07:18:10.000000000 +0100
    @@ -43,7 +43,8 @@
    unsigned short vendor; /* vendor id */
    unsigned short device; /* device id */

    - unsigned short blksize; /* maximum block size */
    + unsigned max_blksize; /* maximum block size */
    + unsigned cur_blksize; /* current block size */

    unsigned int state; /* function state */
    #define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
    @@ -109,6 +110,8 @@
    extern int sdio_enable_func(struct sdio_func *func);
    extern int sdio_disable_func(struct sdio_func *func);

    +extern int sdio_set_block_size(struct sdio_func *func, unsigned blksz);
    +
    extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler);
    extern int sdio_release_irq(struct sdio_func *func);

    Index: mmc/drivers/mmc/core/sdio.c
    ===================================================================
    --- mmc.orig/drivers/mmc/core/sdio.c 2007-08-07 00:38:33.000000000 +0100
    +++ mmc/drivers/mmc/core/sdio.c 2007-08-07 07:17:29.000000000 +0100
    @@ -53,6 +53,7 @@
    {
    int ret;
    struct sdio_func *func;
    + unsigned block_size;

    BUG_ON(fn > SDIO_MAX_FUNCS);

    @@ -70,6 +71,15 @@
    if (ret)
    goto fail;

    + /*
    + * Set the function's block size to the largest supported by
    + * both the function and the host.
    + */
    + block_size = min(func->max_blksize, func->card->host->max_blk_size);
    + ret = sdio_set_block_size(func, block_size);
    + if (ret)
    + goto fail;
    +
    card->sdio_func[fn - 1] = func;

    return 0;
    \
     
     \ /
      Last update: 2007-08-07 15:01    [W:2.395 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site