Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92e23f5f authored by Jorge Ramirez-Ortiz's avatar Jorge Ramirez-Ortiz Committed by Greg Kroah-Hartman
Browse files

mmc: sdhci-msm: fix mutex while in spinlock 



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: 83736352 ("mmc: sdhci-msm: Update DLL reset sequence")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarVinod Koul <vkoul@kernel.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01982f7b

drivers/mmc/host/sdhci-msm.c

+6 −3
Original line number Diff line number Diff line
@@ -582,11 +582,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);



	/*
@@ -634,10 +637,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);