diff mbox series

[v2] mmc: sdhci-msm: fix mutex while in spinlock

Message ID 20190701150125.2602-1-jorge.ramirez-ortiz@linaro.org
State Accepted
Commit 5e6b6651d22de109ebf48ca00d0373bc2c0cc080
Headers show
Series [v2] mmc: sdhci-msm: fix mutex while in spinlock | expand

Commit Message

Jorge Ramirez-Ortiz July 1, 2019, 3:01 p.m. UTC
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>

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

-- 
2.21.0

Comments

Vinod Koul July 1, 2019, 3:22 p.m. UTC | #1
On 01-07-19, 17:01, Jorge Ramirez-Ortiz wrote:
> mutexes can sleep and therefore should not be taken while holding a

> spinlock. move clk_get_rate (can sleep) outside the spinlock protected

> region.


Reviewed-by: Vinod Koul <vkoul@kernel.org>


-- 
~Vinod
Adrian Hunter July 2, 2019, 7:07 a.m. UTC | #2
On 1/07/19 6:01 PM, Jorge Ramirez-Ortiz wrote:
> 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>


Acked-by: Adrian Hunter <adrian.hunter@intel.com>


> ---

>  drivers/mmc/host/sdhci-msm.c | 9 ++++++---

>  1 file changed, 6 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c

> index 5fc76a1993d0..9cf14b359c14 100644

> --- 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_host *host)

>  	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_host *host)

>  		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);

>
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 5fc76a1993d0..9cf14b359c14 100644
--- 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_host *host)
 	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_host *host)
 		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);