lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 478/779] mmc: renesas_sdhi: Get the reset handle early in the probe
    Date
    From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

    [ Upstream commit 0dac1e498f8130fdacfdd5289e3a7ac87ec1b9ad ]

    In case of devm_reset_control_get_optional_exclusive() failure we returned
    directly instead of jumping to the error path to roll back initialization.

    This patch moves devm_reset_control_get_optional_exclusive() early in the
    probe so that we have the reset handle prior to initialization of the
    hardware.

    Fixes: b4d86f37eacb7 ("mmc: renesas_sdhi: do hard reset if possible")
    Reported-by: Pavel Machek <pavel@denx.de>
    Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Link: https://lore.kernel.org/r/20220624181438.4355-2-prabhakar.mahadev-lad.rj@bp.renesas.com
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/renesas_sdhi_core.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
    index ae689bf54686..791e180a0617 100644
    --- a/drivers/mmc/host/renesas_sdhi_core.c
    +++ b/drivers/mmc/host/renesas_sdhi_core.c
    @@ -925,6 +925,10 @@ int renesas_sdhi_probe(struct platform_device *pdev,
    if (IS_ERR(priv->clk_cd))
    priv->clk_cd = NULL;

    + priv->rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
    + if (IS_ERR(priv->rstc))
    + return PTR_ERR(priv->rstc);
    +
    priv->pinctrl = devm_pinctrl_get(&pdev->dev);
    if (!IS_ERR(priv->pinctrl)) {
    priv->pins_default = pinctrl_lookup_state(priv->pinctrl,
    @@ -1013,10 +1017,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,
    if (ret)
    goto efree;

    - priv->rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
    - if (IS_ERR(priv->rstc))
    - return PTR_ERR(priv->rstc);
    -
    ver = sd_ctrl_read16(host, CTL_VERSION);
    /* GEN2_SDR104 is first known SDHI to use 32bit block count */
    if (ver < SDHI_VER_GEN2_SDR104 && mmc_data->max_blk_count > U16_MAX)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:20    [W:2.203 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site