From patchwork Wed Jun 21 19:21:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 106120 Delivered-To: patches@linaro.org Received: by 10.140.91.2 with SMTP id y2csp2092660qgd; Wed, 21 Jun 2017 12:21:55 -0700 (PDT) X-Received: by 10.46.0.77 with SMTP id 74mr10556901lja.109.1498072915438; Wed, 21 Jun 2017 12:21:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498072915; cv=none; d=google.com; s=arc-20160816; b=wLotHTsej6wbJ6H89x2d5gteenVh418L2nBGe1DsX2eWJx+rDdKQB2qGEn+Pl0woVt 94UIcTKudJ3J/v0S+eMsK+9PZ+ONczL2GQJqy2JG/dt0F8mTEdVwcPXWXIthuFAfx4+P /WTBwVdTywej3I/2ip6PvYDlC4sYXALHfpjoildtDnrGdCytEDXRE9NSOEpD1UKuJmhJ oPgAIVsk4lwufamjsJTrabcJHXx3sf1PbbO8uqvYataRVadwIoWfbZw0UKSUV6ewG8cZ p66tJ6dd9KuaS/sVdYh1Kgk/MtRWZs9VFKqhJvjAhYWlFyf37WT2Q/jwX6AFSxx4iqFe 2Htg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=yNZoxAcOWEEwBaVDzkOncnO5GKkzAwnoEZB40/a+44E=; b=pBsprO6D8jsF0lu60Ggj4/FmLjygBtToQrLl96icFeBS7udTcG1g2ywmqReS4kJczw lIWZbkWCZpeZvLy4/jdJ6VsJlyRZ/vDXs412JpoK5yI5iOJauhUMOAusunBzje7seQSe FDL89O1HxfL0KQMRUdhtRWXgWAEJ94wstR78SPDgj0/bbkM42kHSun7UhTs6a/CDRvAt 1KUZEsy84v1NfYy58MnVNJuGlno0UOHH7x4VNi4UQ/ezmMW6qoL7rzbJ03SbpgLaqdI9 tVkuSYJ9hr/uKJwS7c9WDABcWQIqhsuZtMi4Bh6bya55gy6NWn5/rGDL8ujxhmHXGp/x jB0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=jJeH32cK; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x22d.google.com (mail-lf0-x22d.google.com. [2a00:1450:4010:c07::22d]) by mx.google.com with ESMTPS id g95si9513108lji.68.2017.06.21.12.21.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 12:21:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22d as permitted sender) client-ip=2a00:1450:4010:c07::22d; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=jJeH32cK; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22d.google.com with SMTP id p189so102985110lfe.2 for ; Wed, 21 Jun 2017 12:21:55 -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=yNZoxAcOWEEwBaVDzkOncnO5GKkzAwnoEZB40/a+44E=; b=jJeH32cK4vDO3vmzPP+W3LxMZ+2w+zTK+qn05tJMQL4lVD5avGtMAFikUOVJkGcZ/V TjE5tVCaYB9yizw8dkdP5laiZOdMAnomCxaTf1oQlyxFSsMn9MImh9UxOnF08nTaJ6OX soNY9baBQ1ZHp0lZ+/HnsWYCmksPBJFqr/Nlk= 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=yNZoxAcOWEEwBaVDzkOncnO5GKkzAwnoEZB40/a+44E=; b=DwuB+QcmYMbHc3zqwDWDOWOk/zi0+41DC4K/DnQGDdGhhs4LpYiFKeE+pYBN5aZ2Zd r/qH42A/4pFKKK5gKd8oslrEplzrTVe10yAY6TIl8+QhL2VjNRzpNPS3sDD1SdBXDGFe zjRoVnIm0+caoXhjgsj55eoKQzr1lazVrg7H0YSTRyUu8gmBwOkwTWt3fut+gItZtDvM C8Ed4H20YGZyTXKAwtDoZzOSTXUw6wdbo4naWb+OWtCptBUWBkJ1Fb0z1SN/lORK5rQa s/oyJ/YLC8r2kyDwj7Cb5V9/zF+FKVufcWebdV/Bz2PUD0kx6ABl1ieliUfP+mJY0ZtW j7OQ== X-Gm-Message-State: AKS2vOyfJTeru4duPqsW+AlGcRCkDiSqHCSF8E0gZHKSX2YdngHiHNyH BhNWY0JRfaNuAW4Ff/c= X-Received: by 10.46.69.133 with SMTP id s127mr11625301lja.13.1498072915038; Wed, 21 Jun 2017 12:21:55 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id t24sm3920047ljd.1.2017.06.21.12.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 12:21:54 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , "Rafael J . Wysocki" , Len Brown , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: Kevin Hilman , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jisheng Zhang , John Stultz , Guodong Xu , Sumit Semwal , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, Ulf Hansson Subject: [PATCH 6/9] PM / ACPI: Provide option to disable direct_complete for ACPI devices Date: Wed, 21 Jun 2017 21:21:25 +0200 Message-Id: <1498072888-14782-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498072888-14782-1-git-send-email-ulf.hansson@linaro.org> References: <1498072888-14782-1-git-send-email-ulf.hansson@linaro.org> In some cases a driver for an ACPI device needs to be able to prevent the ACPI PM domain from using the direct_complete path during system sleep. One typical case is when the driver for the device needs its device to stay runtime enabled, during the __device_suspend phase. This isn't the case when the direct_complete path is being executed by the PM core, as it then disables runtime PM for the device in __device_suspend(). Any following attempts to runtime resume the device after that point, just fails. A workaround to this problem is to let the driver runtime resume its device from its ->prepare() callback, as that would prevent the direct_complete path from being executed. However, that may often be a waste, especially if it turned out that no one really needed the device. For this reason, invent acpi_dev_disable|enable_direct_complete(), to allow drivers to inform the ACPI PM domain to change its default behaviour during system sleep, and thus control whether it may use the direct_complete path or not. Typically a driver should call acpi_dev_disable_direct_comlete() during ->probe() and acpi_dev_enable_direct_complete() in ->remove(). Signed-off-by: Ulf Hansson --- drivers/acpi/device_pm.c | 37 ++++++++++++++++++++++++++++++++++++- include/acpi/acpi_bus.h | 1 + include/linux/acpi.h | 4 ++++ 3 files changed, 41 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index ee51e75..2393a1a 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -879,6 +879,41 @@ EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume); #ifdef CONFIG_PM_SLEEP /** + * acpi_dev_disable_direct_complete - Disable the direct_complete path for ACPI. + * @dev: Device to disable the path for. + * + * Per default the ACPI PM domain tries to use the direct_complete path for its + * devices during system sleep. This function allows a user, typically a driver + * during probe, to disable the direct_complete path from being used by ACPI. + */ +void acpi_dev_disable_direct_complete(struct device *dev) +{ + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (adev) + adev->no_direct_complete = true; +} +EXPORT_SYMBOL_GPL(acpi_dev_disable_direct_complete); + +/** + * acpi_dev_enable_direct_complete - Enable the direct_complete path for ACPI. + * @dev: Device to enable the path for. + * + * Enable the direct_complete path to be used during system suspend for the ACPI + * PM domain, which is the default option. Typically a driver that disabled the + * path during ->probe(), must call this function during ->remove() to re-enable + * the direct_complete path to be used by ACPI. + */ +void acpi_dev_enable_direct_complete(struct device *dev) +{ + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (adev) + adev->no_direct_complete = false; +} +EXPORT_SYMBOL_GPL(acpi_dev_enable_direct_complete); + +/** * acpi_dev_suspend_late - Put device into a low-power state using ACPI. * @dev: Device to put into a low-power state. * @@ -967,7 +1002,7 @@ int acpi_subsys_prepare(struct device *dev) if (ret < 0) return ret; - if (!adev || !pm_runtime_suspended(dev)) + if (!adev || adev->no_direct_complete || !pm_runtime_suspended(dev)) return 0; return !acpi_dev_needs_resume(dev, adev); diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 63a90a6..2293d24 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -380,6 +380,7 @@ struct acpi_device { struct list_head physical_node_list; struct mutex physical_node_lock; void (*remove)(struct acpi_device *); + bool no_direct_complete; }; /* Non-device subnode */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 137e4a3..a41cca5 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -859,6 +859,8 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP) +void acpi_dev_disable_direct_complete(struct device *dev); +void acpi_dev_enable_direct_complete(struct device *dev); int acpi_dev_suspend_late(struct device *dev); int acpi_dev_resume_early(struct device *dev); int acpi_subsys_prepare(struct device *dev); @@ -868,6 +870,8 @@ int acpi_subsys_resume_early(struct device *dev); int acpi_subsys_suspend(struct device *dev); int acpi_subsys_freeze(struct device *dev); #else +static inline void acpi_dev_disable_direct_complete(struct device *dev) {} +static inline void acpi_dev_enable_direct_complete(struct device *dev) {} static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } static inline int acpi_dev_resume_early(struct device *dev) { return 0; } static inline int acpi_subsys_prepare(struct device *dev) { return 0; }