lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[016/136] mmc_spi: fail gracefully if host or card do not support the switch command
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Wolfgang Muees <wolfgang.mues@auerswald.de>

    commit d08ebeddfb3293fa4bdfca9c610daf1e8ec8b233 upstream.

    Some time ago, I have send a patch to the mmc_spi subsystem changing the
    error codes. This was after a discussion with Pierre about using EINVAL
    only for non-recoverable errors. This patch was accepted as

    http://git.kernel.org/linus/fdd858db7113ca64132de390188d7ca00701013d

    Unfortunately, several weeks later, I realized that this patch has opened
    a little can of worms because there are SD cards on the market which

    a) claim that they support the switch command
    AND
    b) refuse to execute this command if operating in SPI mode.

    So, such a card would get unusuable in an embedded linux system in SPI
    mode, because the init sequence terminates with an error.

    This patch adds the missing error codes to the caller of the switch
    command and restores the old behaviour to fail gracefully if these
    commands can not execute.

    Signed-off-by: Wolfgang Muees <wolfgang.mues@auerswald.de>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/mmc/core/mmc.c | 10 +++++-----
    drivers/mmc/core/sd.c | 10 +++++-----
    2 files changed, 10 insertions(+), 10 deletions(-)

    --- a/drivers/mmc/core/mmc.c
    +++ b/drivers/mmc/core/mmc.c
    @@ -180,11 +180,11 @@ static int mmc_read_ext_csd(struct mmc_c

    err = mmc_send_ext_csd(card, ext_csd);
    if (err) {
    - /*
    - * We all hosts that cannot perform the command
    - * to fail more gracefully
    - */
    - if (err != -EINVAL)
    + /* If the host or the card can't do the switch,
    + * fail more gracefully. */
    + if ((err != -EINVAL)
    + && (err != -ENOSYS)
    + && (err != -EFAULT))
    goto out;

    /*
    --- a/drivers/mmc/core/sd.c
    +++ b/drivers/mmc/core/sd.c
    @@ -210,11 +210,11 @@ static int mmc_read_switch(struct mmc_ca

    err = mmc_sd_switch(card, 0, 0, 1, status);
    if (err) {
    - /*
    - * We all hosts that cannot perform the command
    - * to fail more gracefully
    - */
    - if (err != -EINVAL)
    + /* If the host or the card can't do the switch,
    + * fail more gracefully. */
    + if ((err != -EINVAL)
    + && (err != -ENOSYS)
    + && (err != -EFAULT))
    goto out;

    printk(KERN_WARNING "%s: problem reading switch "



    \
     
     \ /
      Last update: 2009-10-02 04:05    [W:4.507 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site