lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 288/305] mmc: core: Reset HPI enabled state during re-init and in case of errors
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ulf Hansson <ulf.hansson@linaro.org>

    commit a0741ba40a009f97c019ae7541dc61c1fdf41efb upstream.

    During a re-initialization of the eMMC card, we may fail to re-enable HPI.
    In these cases, that isn't properly reflected in the card->ext_csd.hpi_en
    bit, as it keeps being set. This may cause following attempts to use HPI,
    even if's not enabled. Let's fix this!

    Fixes: eb0d8f135b67 ("mmc: core: support HPI send command")
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/mmc/core/mmc.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/mmc/core/mmc.c
    +++ b/drivers/mmc/core/mmc.c
    @@ -1418,9 +1418,11 @@ static int mmc_init_card(struct mmc_host
    if (err) {
    pr_warning("%s: Enabling HPI failed\n",
    mmc_hostname(card->host));
    + card->ext_csd.hpi_en = 0;
    err = 0;
    - } else
    + } else {
    card->ext_csd.hpi_en = 1;
    + }
    }

    /*
    \
     
     \ /
      Last update: 2019-02-03 15:24    [W:3.638 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site