lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 006/158] mmc: sdhci-omap: Fix a lockdep warning for PM runtime init
    Date
    From: Tony Lindgren <tony@atomide.com>

    commit 51189eb9ddc88851edc42f539a0f9862fd0630c2 upstream.

    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: f433e8aac6b9 ("mmc: sdhci-omap: Implement PM runtime functions")
    Reported-by: Yegor Yefremov <yegorslists@googlemail.com>
    Suggested-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Acked-by: Adrian 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: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mmc/host/sdhci-omap.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/drivers/mmc/host/sdhci-omap.c
    +++ b/drivers/mmc/host/sdhci-omap.c
    @@ -1303,8 +1303,9 @@ static int sdhci_omap_probe(struct platf
    /*
    * 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);
    @@ -1446,7 +1447,8 @@ static int __maybe_unused sdhci_omap_run
    struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
    struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);

    - sdhci_runtime_suspend_host(host);
    + if (omap_host->con != -EINVAL)
    + sdhci_runtime_suspend_host(host);

    sdhci_omap_context_save(omap_host);

    @@ -1463,10 +1465,10 @@ static int __maybe_unused sdhci_omap_run

    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);
    + sdhci_runtime_resume_host(host, 0);
    + }

    return 0;
    }

    \
     
     \ /
      Last update: 2022-07-27 19:32    [W:2.861 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site