lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 395/413] mmc: sdhci-msm: fix mutex while in spinlock
    Date
    From: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>

    commit 5e6b6651d22de109ebf48ca00d0373bc2c0cc080 upstream.

    mutexes can sleep and therefore should not be taken while holding a
    spinlock. move clk_get_rate (can sleep) outside the spinlock protected
    region.

    Fixes: 83736352e0ca ("mmc: sdhci-msm: Update DLL reset sequence")
    Cc: stable@vger.kernel.org
    Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Reviewed-by: Vinod Koul <vkoul@kernel.org>
    Acked-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-msm.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/mmc/host/sdhci-msm.c
    +++ b/drivers/mmc/host/sdhci-msm.c
    @@ -575,11 +575,14 @@ static int msm_init_cm_dll(struct sdhci_
    struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
    struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
    int wait_cnt = 50;
    - unsigned long flags;
    + unsigned long flags, xo_clk = 0;
    u32 config;
    const struct sdhci_msm_offset *msm_offset =
    msm_host->offset;

    + if (msm_host->use_14lpp_dll_reset && !IS_ERR_OR_NULL(msm_host->xo_clk))
    + xo_clk = clk_get_rate(msm_host->xo_clk);
    +
    spin_lock_irqsave(&host->lock, flags);

    /*
    @@ -627,10 +630,10 @@ static int msm_init_cm_dll(struct sdhci_
    config &= CORE_FLL_CYCLE_CNT;
    if (config)
    mclk_freq = DIV_ROUND_CLOSEST_ULL((host->clock * 8),
    - clk_get_rate(msm_host->xo_clk));
    + xo_clk);
    else
    mclk_freq = DIV_ROUND_CLOSEST_ULL((host->clock * 4),
    - clk_get_rate(msm_host->xo_clk));
    + xo_clk);

    config = readl_relaxed(host->ioaddr +
    msm_offset->core_dll_config_2);

    \
     
     \ /
      Last update: 2019-07-24 22:25    [W:2.080 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site