Commit 51189eb9 authored by Tony Lindgren's avatar Tony Lindgren Committed by Ulf Hansson
Browse files

mmc: sdhci-omap: Fix a lockdep warning for PM runtime init 



We need runtime PM enabled early in probe before sdhci_setup_host() for
sdhci_omap_set_capabilities(). But on the first runtime resume we must
not call sdhci_runtime_resume_host() as sdhci_setup_host() has not been
called yet. Let's check for an initialized controller like we already do
for context restore to fix a lockdep warning.

Fixes: f433e8aa ("mmc: sdhci-omap: Implement PM runtime functions")
Reported-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220622051215.34063-1-tony@atomide.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 32346491

drivers/mmc/host/sdhci-omap.c

+8 −6
Original line number Diff line number Diff line
@@ -1298,8 +1298,9 @@ static int sdhci_omap_probe(struct platform_device *pdev) 
	/*

	 * omap_device_pm_domain has callbacks to enable the main

	 * functional clock, interface clock and also configure the

	 * SYSCONFIG register of omap devices. The callback will be invoked

	 * as part of pm_runtime_get_sync.

	 * SYSCONFIG register to clear any boot loader set voltage

	 * capabilities before calling sdhci_setup_host(). The

	 * callback will be invoked as part of pm_runtime_get_sync.

	 */

	pm_runtime_use_autosuspend(dev);

	pm_runtime_set_autosuspend_delay(dev, 50);
@@ -1441,6 +1442,7 @@ static int __maybe_unused sdhci_omap_runtime_suspend(struct device *dev) 
	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);



	if (omap_host->con != -EINVAL)

		sdhci_runtime_suspend_host(host);



	sdhci_omap_context_save(omap_host);
@@ -1458,10 +1460,10 @@ static int __maybe_unused sdhci_omap_runtime_resume(struct device *dev) 


	pinctrl_pm_select_default_state(dev);



	if (omap_host->con != -EINVAL)

	if (omap_host->con != -EINVAL) {

		sdhci_omap_context_restore(omap_host);



		sdhci_runtime_resume_host(host, 0);

	}



	return 0;

}