From patchwork Wed Oct 16 13:16:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11193351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5F2014DB for ; Wed, 16 Oct 2019 13:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EB15218DE for ; Wed, 16 Oct 2019 13:16:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VLCC0f2j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727496AbfJPNQT (ORCPT ); Wed, 16 Oct 2019 09:16:19 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35024 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727397AbfJPNQS (ORCPT ); Wed, 16 Oct 2019 09:16:18 -0400 Received: by mail-lj1-f193.google.com with SMTP id m7so23987147lji.2 for ; Wed, 16 Oct 2019 06:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t/IdaCvXraOwlJZTUOq6plCE0lZnjdA61GIv6muLp1Q=; b=VLCC0f2jo6csOzQNOAyaHJmjTKt6NC1Cuj782X7mRCJ5HwMnGpia1SOy5aQFzRAmbX 6VF45SZ1bMcN702DI3Pl3OZGkvnTejl52/kfLwkqYZC3OG9JsKUZLKNVUNBW6ocQPW/f uOIefwzS9K9mHHbOaTeh2nJpSV5ubaXqVR2k6PAj62Z0LvMFfgY/qIbn/wkGCONUaaIN VF5dAZhTaJrtlI5xS4Q72xykG393Yf0Eij/3qaNS7Tx7T7VrY29b1eBlsjrTG/W84tYK KA33BxztW85EgaQXb/1lp41lV2jhE/4Ma0aLpYjinRvS1hassm/TlYLqCX7hjxF0J564 Wc8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t/IdaCvXraOwlJZTUOq6plCE0lZnjdA61GIv6muLp1Q=; b=V9lwLo9aVcbmBLO0MsC5gHDG1s5WsLvpUHDIfORpSOhnQDwliIQIOW5gj0lZXlIzcb dNRs+L/FQFk2Aa457rYZoQJRoVhltTxOZ7wgmydOtpNrw6O7DfrB2narr59Km04Q66OC ldokq9jrUubt8Q24YpMSOGwM1OWG+ee3sA0OkWZfDI4HwCB53kJww1fn8d/xi3ozX1Cg IYHOjsz6U++fT6+wCWBnog0y+k3qkBXJOsLqDExxhD+3zgL2eRipYk2TZcP9x+r8jvea PEVSDj2tz2rf151O/dVrLScORhu7MO9ic5jeOtUiuqV0H7gWMvzfvl+nLDPnAeVbkYvy DDog== X-Gm-Message-State: APjAAAXS1dXr4GudEJdMJdAc2cx9oIrljqTgMsCHb05/IaHT1itKAd+/ ybMkISrRkA2OkpE/flWFE34mnQ== X-Google-Smtp-Source: APXvYqxHpO8/K1SzA/rbXfA8GoR1yQqr6YxgbM2Sg4Pj74RmTLT7iIM9oDjo8SJ4Tqufb8+dDZ73ng== X-Received: by 2002:a2e:a211:: with SMTP id h17mr25768660ljm.251.1571231775888; Wed, 16 Oct 2019 06:16:15 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c26sm7022530ljj.45.2019.10.16.06.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 06:16:15 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Geert Uytterhoeven , Wolfram Sang , Niklas Soderlund , Ulf Hansson , Kevin Hilman Subject: [PATCH 1/3] PM / Domains: Introduce dev_pm_domain_start() Date: Wed, 16 Oct 2019 15:16:03 +0200 Message-Id: <20191016131603.15784-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <../../misc/pm_patches/submitted_patches/pm_domain_start/0002-PM-Domains-Implement-the-start-callback-for-genpd.patch> References: <../../misc/pm_patches/submitted_patches/pm_domain_start/0002-PM-Domains-Implement-the-start-callback-for-genpd.patch> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org For a subsystem/driver that either doesn't support runtime PM or makes use of pm_runtime_set_active() during ->probe(), may try to access its device when probing, even if it may not be fully powered on from the PM domain's point of view. This may be the case when the used PM domain is a genpd provider, that implements genpd's ->start|stop() device callbacks. There are cases where the subsystem/driver managed to avoid the above problem, simply by calling pm_runtime_enable() and pm_runtime_get_sync() during ->probe(). However, this approach comes with a drawback, especially if the subsystem/driver implements a ->runtime_resume() callback. More precisely, the subsystem/driver then needs to use a device flag, which is checked in its ->runtime_resume() callback, as to avoid powering on its resources the first time the callback is invoked. This is needed because the subsystem/driver has already powered on the resources for the device, during ->probe() and before it called pm_runtime_get_sync(). In a way to avoid this boilerplate code and the inefficient check for "if (first_time_suspend)" in the ->runtime_resume() callback for these subsystems/drivers, let's introduce and export a dev_pm_domain_start() function, that may be called during ->probe() instead. Moreover, let the dev_pm_domain_start() invoke an optional ->start() callback, added to the struct dev_pm_domain, as to allow a PM domain specific implementation. Signed-off-by: Ulf Hansson --- drivers/base/power/common.c | 20 ++++++++++++++++++++ include/linux/pm.h | 2 ++ include/linux/pm_domain.h | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index 8db98a1f83dc..bbddb267c2e6 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -187,6 +187,26 @@ void dev_pm_domain_detach(struct device *dev, bool power_off) } EXPORT_SYMBOL_GPL(dev_pm_domain_detach); +/** + * dev_pm_domain_start - Start the device through its PM domain. + * @dev: Device to start. + * + * This function should typically be called during probe by a subsystem/driver, + * when it needs to start its device from the PM domain's perspective. Note + * that, it's assumed that the PM domain is already powered on when this + * function is called. + * + * Returns 0 on success and negative error values on failures. + */ +int dev_pm_domain_start(struct device *dev) +{ + if (dev->pm_domain && dev->pm_domain->start) + return dev->pm_domain->start(dev); + + return 0; +} +EXPORT_SYMBOL_GPL(dev_pm_domain_start); + /** * dev_pm_domain_set - Set PM domain of a device. * @dev: Device whose PM domain is to be set. diff --git a/include/linux/pm.h b/include/linux/pm.h index 4c441be03079..e057d1fa2469 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -637,6 +637,7 @@ extern void dev_pm_put_subsys_data(struct device *dev); * struct dev_pm_domain - power management domain representation. * * @ops: Power management operations associated with this domain. + * @start: Called when a user needs to start the device via the domain. * @detach: Called when removing a device from the domain. * @activate: Called before executing probe routines for bus types and drivers. * @sync: Called after successful driver probe. @@ -648,6 +649,7 @@ extern void dev_pm_put_subsys_data(struct device *dev); */ struct dev_pm_domain { struct dev_pm_ops ops; + int (*start)(struct device *dev); void (*detach)(struct device *dev, bool power_off); int (*activate)(struct device *dev); void (*sync)(struct device *dev); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index baf02ff91a31..5a31c711b896 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -366,6 +366,7 @@ struct device *dev_pm_domain_attach_by_id(struct device *dev, struct device *dev_pm_domain_attach_by_name(struct device *dev, const char *name); void dev_pm_domain_detach(struct device *dev, bool power_off); +int dev_pm_domain_start(struct device *dev); void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd); #else static inline int dev_pm_domain_attach(struct device *dev, bool power_on) @@ -383,6 +384,10 @@ static inline struct device *dev_pm_domain_attach_by_name(struct device *dev, return NULL; } static inline void dev_pm_domain_detach(struct device *dev, bool power_off) {} +static inline int dev_pm_domain_start(struct device *dev) +{ + return 0; +} static inline void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd) {} #endif From patchwork Wed Oct 16 13:16:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11193353 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1F5114DB for ; Wed, 16 Oct 2019 13:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 924FD2067B for ; Wed, 16 Oct 2019 13:16:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Dvr+4U2i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727501AbfJPNQa (ORCPT ); Wed, 16 Oct 2019 09:16:30 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:40216 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727397AbfJPNQa (ORCPT ); Wed, 16 Oct 2019 09:16:30 -0400 Received: by mail-lj1-f193.google.com with SMTP id 7so23985688ljw.7 for ; Wed, 16 Oct 2019 06:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=zwcPtwWQF6liVN+zYzdJWAttHhAVvs66PzaVZNVn+cw=; b=Dvr+4U2iGye8PwQvS9auZPByIhigKBPwgqTMaVL25rrzhMnxujo74IWXzkz9PvOnrT kvZST1KOBOXRVVvfcdQfLqr4zgVA0OGd397GOX6LE93ttKv7Y8TCpf70xk7yCpMUaLOB tyUFO6tUmWi9i1drghLKs2arwRbpV6HjcZdKmiq1v0zn2h/sB9RLnC5B/SH8Vr0SYG9V p2ziDUB0e3n+wReOMDubHRKJlLSMPz6HZWVaP1Y6UEDLbTKpj45/OkT7GTby3zlilY2j I2lGoV5HOVaH+EioMIxr5e5saj2W1f1kPMl566SBDeUCbu44Cel69n1pIdUOJVBOfY/x Sl/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zwcPtwWQF6liVN+zYzdJWAttHhAVvs66PzaVZNVn+cw=; b=YKctAJb4tXkSLj2Yu5BkA4+nzjXioEVnR4wn07TlQdw3uaUlery8KF4qoqNfNX5Be+ adE0PnYO7NcZ7snlrvQcDuGFGfN98MYV83Onla4jIJZc1BNv/tT7aEsc4n/fkvkMvCtq Yhbl/vguBfCsBAGzbZT996bh8+0Prifx+6dc/vf/nnwl7khanQAaMfKCw5H8vusTd0XT P/2xjBbtKdXJe9adLYFdvE9ltze8xP3nU8Ul70DnMOZEroyfXwyAsGeKHr1hgX1oc86Z 6c0FWjfSLFhUzxe3OBd+CsPGbLhUXXnwwT+Y3pxn8sEyKGd1EX8DhuFZm4W/UwPTYz6m grqQ== X-Gm-Message-State: APjAAAVk0zYJ4RME+Ys5XKbd1eDP7mKOjYzdEs2dE6/nwMP/FLO4Qojs kxWnAsm7evehWyaTUVm6zP/JnQ== X-Google-Smtp-Source: APXvYqyoH9MQbW8BVPPDIOi4iBgbLqiYtqm6XR1J9gGq8SXdHH51QB1ilbfdS+SKrh56ecUB0gzTKw== X-Received: by 2002:a2e:9ec2:: with SMTP id h2mr22570726ljk.85.1571231787847; Wed, 16 Oct 2019 06:16:27 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id q19sm10215746lfj.9.2019.10.16.06.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 06:16:27 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Geert Uytterhoeven , Wolfram Sang , Niklas Soderlund , Ulf Hansson , Kevin Hilman Subject: [PATCH 2/3] PM / Domains: Implement the ->start() callback for genpd Date: Wed, 16 Oct 2019 15:16:24 +0200 Message-Id: <20191016131624.15832-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org To allow a subsystem/driver to explicitly start its device from genpd's point view, let's implement the ->start() callback in the struct dev_pm_domain that corresponds to the genpd. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index cc85e87eaf05..2adf0661fa3e 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -634,6 +634,13 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth) return ret; } +static int genpd_dev_pm_start(struct device *dev) +{ + struct generic_pm_domain *genpd = dev_to_genpd(dev); + + return genpd_start_dev(genpd, dev); +} + static int genpd_dev_pm_qos_notifier(struct notifier_block *nb, unsigned long val, void *ptr) { @@ -1805,6 +1812,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, genpd->domain.ops.poweroff_noirq = genpd_poweroff_noirq; genpd->domain.ops.restore_noirq = genpd_restore_noirq; genpd->domain.ops.complete = genpd_complete; + genpd->domain.start = genpd_dev_pm_start; if (genpd->flags & GENPD_FLAG_PM_CLK) { genpd->dev_ops.stop = pm_clk_suspend; From patchwork Wed Oct 16 13:16:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11193355 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E05814DB for ; Wed, 16 Oct 2019 13:16:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E9DC21D7A for ; Wed, 16 Oct 2019 13:16:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pJBfryhn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393496AbfJPNQk (ORCPT ); Wed, 16 Oct 2019 09:16:40 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:34705 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727397AbfJPNQk (ORCPT ); Wed, 16 Oct 2019 09:16:40 -0400 Received: by mail-lf1-f65.google.com with SMTP id r22so17489965lfm.1 for ; Wed, 16 Oct 2019 06:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=8we2EpM0rjQuTwVatnTr1F948OBhtLCctpwujUnCJVM=; b=pJBfryhnKfTGvUXCpWb3vmCki72rWDgutvYQXZnfk3eOjMW2CFbW03pxcnkfug+2CP ORQNEmsxeCfx2aE4oKtvpa7NHMDioVAc3RyB+q4ugBabIibwgUkPEo6bx+4P8UcdAKRC Apam9W8X0hB5jNv3Apdm0WsQn54+Q/xCagrQHevdV/DsAP+W6exfTsXMT9BvynwnuYzL 3fVDQiO+xKRC5yMgsghf467iEBOqKYRwexehdQ0fdqyszBgB5UrScMguSUVSPVX3zTdn UnVVRtyORs1Ic8T2Jqh4HK9fR4EWatygNZgrpv849qJ8dOTJSDSIQ8pFSJPp0tV9y5bc sPpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8we2EpM0rjQuTwVatnTr1F948OBhtLCctpwujUnCJVM=; b=nOZjLog8wX1YJahPxsZLheSnZe9v8qt3LJz69Vvo26bO4yCtEzFghZEL7R/g0ESXRm KVILEhUEd5nuVDRP507zXJ0+900BzVU2E5fKc3GvwpwjC2F8c995LNdLhRSUWKCYrfjX p5m29pd8hfIAHfFhtp7gzGKObv8D90iAKJgfLrD7AhfWRGXlQHc5jHGJ1Gyq8IotJEEU Vo+KCPJZM89gPel7iJNHHsSyk0ZISMhptDg9ZJF3BMJjrCXi5hY10r6o8gdzJ6wtk4y3 172jnqOzEd+M+AmQtbCwGso0ofzbVRjKZQOIcFNOqj1zU8d+p3As28cIOHwdHgvtcrF0 mQ+A== X-Gm-Message-State: APjAAAWZrdotNbIp7DW9BYw3sg2+rGvdlrdajC5sa+RNZ3CSVHZUTZ9v jbCZ3h/hhyxLhu7bDX11P0UAyg== X-Google-Smtp-Source: APXvYqz+eigY33Bwc9nKZAvdwkxNqFh2HT/skQhZ4tcXvDcDSziBF8sO2BGnhugFqk0IY2gfwd8qkQ== X-Received: by 2002:a19:4f0e:: with SMTP id d14mr24211346lfb.177.1571231798276; Wed, 16 Oct 2019 06:16:38 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id i6sm6044417lfo.83.2019.10.16.06.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 06:16:37 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Geert Uytterhoeven , Wolfram Sang , Niklas Soderlund , Ulf Hansson , Kevin Hilman Subject: [PATCH 3/3] mmc: tmio: Avoid boilerplate code in ->runtime_suspend() Date: Wed, 16 Oct 2019 15:16:34 +0200 Message-Id: <20191016131634.15881-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Rather than checking the 'runtime_synced' flag each time the ->runtime_suspend() callback is invoked, let's convert into using dev_pm_domain_start() during ->probe() and drop the corresponding boilerplate code. Signed-off-by: Ulf Hansson --- drivers/mmc/host/tmio_mmc.h | 1 - drivers/mmc/host/tmio_mmc_core.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 2f0b092d6dcc..c5ba13fae399 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -163,7 +163,6 @@ struct tmio_mmc_host { unsigned long last_req_ts; struct mutex ios_lock; /* protect set_ios() context */ bool native_hotplug; - bool runtime_synced; bool sdio_irq_enabled; /* Mandatory callback */ diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 9b6e1001e77c..86b591100f16 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1248,10 +1249,12 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) /* See if we also get DMA */ tmio_mmc_request_dma(_host, pdata); + dev_pm_domain_start(&pdev->dev); + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, 50); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); - pm_runtime_get_sync(&pdev->dev); ret = mmc_add_host(mmc); if (ret) @@ -1333,11 +1336,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev) { struct tmio_mmc_host *host = dev_get_drvdata(dev); - if (!host->runtime_synced) { - host->runtime_synced = true; - return 0; - } - tmio_mmc_clk_enable(host); tmio_mmc_hw_reset(host->mmc);