{"id":807137,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807137/?format=json","project":{"id":35,"url":"http://patchwork.ozlabs.org/api/1.0/projects/35/?format=json","name":"Linux I2C development","link_name":"linux-i2c","list_id":"linux-i2c.vger.kernel.org","list_email":"linux-i2c@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504018610-10822-3-git-send-email-ulf.hansson@linaro.org>","date":"2017-08-29T14:56:44","name":"[v3,2/8] PM / ACPI: Restore acpi_subsys_complete()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"fc5954f775e2d8bbf43089391cbc679d8fa1c914","submitter":{"id":21036,"url":"http://patchwork.ozlabs.org/api/1.0/people/21036/?format=json","name":"Ulf Hansson","email":"ulf.hansson@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-i2c/patch/1504018610-10822-3-git-send-email-ulf.hansson@linaro.org/mbox/","series":[{"id":387,"url":"http://patchwork.ozlabs.org/api/1.0/series/387/?format=json","date":"2017-08-29T14:56:42","name":"PM / ACPI / i2c: Deploy runtime PM centric path for system sleep","version":3,"mbox":"http://patchwork.ozlabs.org/series/387/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807137/checks/","tags":{},"headers":{"Return-Path":"<linux-i2c-owner@vger.kernel.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-i2c-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"ctbr+X1o\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhWvC3sLnz9sR9\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 00:57:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754673AbdH2O5I (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tTue, 29 Aug 2017 10:57:08 -0400","from mail-lf0-f50.google.com ([209.85.215.50]:37905 \"EHLO\n\tmail-lf0-f50.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754611AbdH2O5F (ORCPT\n\t<rfc822; linux-i2c@vger.kernel.org>); Tue, 29 Aug 2017 10:57:05 -0400","by mail-lf0-f50.google.com with SMTP id d202so14330127lfd.5\n\tfor <linux-i2c@vger.kernel.org>; Tue, 29 Aug 2017 07:57:04 -0700 (PDT)","from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se.\n\t[158.174.22.67]) by smtp.gmail.com with ESMTPSA id\n\ty23sm652454ljd.19.2017.08.29.07.57.01\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 29 Aug 2017 07:57:02 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=t/0EnNFHSFSy+bWjKQA9j4SLg6VF07in38lNTG8qPK0=;\n\tb=ctbr+X1oWC+TdTvFCeKHnk0j901D9J4dyc5jODfHaAmx8gbH0u3xs34PzB7J9IaUE+\n\tQkSCJeH5EwAUaXn0u+gaET6QLa328XmEmayBeapeuuA4SCn0CNogituvdqEAbO+1bZQ+\n\tmcBOSq1oMOmQ6odQWoA/QWi1lIVQ5zLtX1hC0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=t/0EnNFHSFSy+bWjKQA9j4SLg6VF07in38lNTG8qPK0=;\n\tb=KmLcW+A7mzfuxlHLlBywPoO8jbXe31iBCe/FdBBcDERsORgw2cbIRpGxYhzgG4Am1U\n\tcqnd4vx3Grd9TlRNUw8sM2iWy/Ffp2uctlEx77yxe444ZeqPA9hftQQAaL5YHG+Q8GRm\n\tgfLBrBtBzGE5MK+TccYmjVgufvmgdx7D995dAZ2oj2GJLpIipjlo8/znlz85gNyZ44pP\n\t39jU3Nb0LzOrOkQu1PcMGVIRPhHXE/TvMXvOo2aKSy8O9k7eg/f6Lw708SNIcYJCQ+29\n\tSIOKI2jdXaK4YOIt+JIiZZU9UVbdl0rHaSwyLLSKAIy7Cfso5AGObHKhHAHkAFfdcRs1\n\tfoZw==","X-Gm-Message-State":"AHYfb5hwRrIQ+iwVWS7s6gl6sf33mizArlXC+LhazILMVkajDSyvYLwV\n\tImYWkIy4/BKDtOMU","X-Received":"by 10.46.88.90 with SMTP id x26mr256631ljd.53.1504018623456;\n\tTue, 29 Aug 2017 07:57:03 -0700 (PDT)","From":"Ulf Hansson <ulf.hansson@linaro.org>","To":"Wolfram Sang <wsa@the-dreams.de>,\n\t\"Rafael J . Wysocki\" <rjw@rjwysocki.net>,\n\tLen Brown <lenb@kernel.org>, linux-acpi@vger.kernel.org,\n\tlinux-pm@vger.kernel.org","Cc":"Kevin Hilman <khilman@kernel.org>,\n\tJarkko Nikula <jarkko.nikula@linux.intel.com>,\n\tAndy Shevchenko <andriy.shevchenko@linux.intel.com>,\n\tMika Westerberg <mika.westerberg@linux.intel.com>,\n\tJisheng Zhang <jszhang@marvell.com>,\n\tJohn Stultz <john.stultz@linaro.org>, Guodong Xu <guodong.xu@linaro.org>,\n\tSumit Semwal <sumit.semwal@linaro.org>,\n\tHaojian Zhuang <haojian.zhuang@linaro.org>,\n\tJohannes Stezenbach <js@sig21.net>,\n\tlinux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,\n\tUlf Hansson <ulf.hansson@linaro.org>","Subject":"[PATCH v3 2/8] PM / ACPI: Restore acpi_subsys_complete()","Date":"Tue, 29 Aug 2017 16:56:44 +0200","Message-Id":"<1504018610-10822-3-git-send-email-ulf.hansson@linaro.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504018610-10822-1-git-send-email-ulf.hansson@linaro.org>","References":"<1504018610-10822-1-git-send-email-ulf.hansson@linaro.org>","Sender":"linux-i2c-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<linux-i2c.vger.kernel.org>","X-Mailing-List":"linux-i2c@vger.kernel.org"},"content":"The commit 58a1fbbb2ee8 (\"PM / PCI / ACPI: Kick devices that might have\nbeen reset by firmware\"), made PCI's and ACPI's ->complete() callbacks to\nbe assigned to a new API called pm_complete_with_resume_check(), which was\nintroduced in the same change.\n\nLater it turned out that using pm_complete_with_resume_check() isn't good\nenough for PCI, as it needs additional PCI specific checks, before deciding\nwhether runtime resuming the device is needed when running the ->complete()\ncallback.\n\nThis leaves ACPI being the only user of pm_complete_with_resume_check().\nTherefore let's restore ACPI's acpi_subsys_complete(), which was dropped in\ncommit 58a1fbbb2ee8 (\"PM / PCI / ACPI: Kick devices that might have been\nreset by firmware\").\n\nThis enables us to remove the pm_complete_with_resume_check() API in a\nfollowing change, but it also enables ACPI to add more ACPI specific checks\nin acpi_subsys_complete() if it turns out that is needed.\n\nSigned-off-by: Ulf Hansson <ulf.hansson@linaro.org>\n---\n\nChanges in v3:\n\t- None.\n\n---\n drivers/acpi/acpi_lpss.c |  2 +-\n drivers/acpi/device_pm.c | 19 ++++++++++++++++++-\n 2 files changed, 19 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c\nindex 032ae44..0c84d15 100644\n--- a/drivers/acpi/acpi_lpss.c\n+++ b/drivers/acpi/acpi_lpss.c\n@@ -894,7 +894,7 @@ static struct dev_pm_domain acpi_lpss_pm_domain = {\n #ifdef CONFIG_PM\n #ifdef CONFIG_PM_SLEEP\n \t\t.prepare = acpi_subsys_prepare,\n-\t\t.complete = pm_complete_with_resume_check,\n+\t\t.complete = acpi_subsys_complete,\n \t\t.suspend = acpi_subsys_suspend,\n \t\t.suspend_late = acpi_lpss_suspend_late,\n \t\t.resume_early = acpi_lpss_resume_early,\ndiff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c\nindex fbcc73f..632f214 100644\n--- a/drivers/acpi/device_pm.c\n+++ b/drivers/acpi/device_pm.c\n@@ -1020,6 +1020,23 @@ int acpi_subsys_prepare(struct device *dev)\n EXPORT_SYMBOL_GPL(acpi_subsys_prepare);\n \n /**\n+ * acpi_subsys_complete - Finalize device's resume during system resume.\n+ * @dev: Device to handle.\n+ */\n+void acpi_subsys_complete(struct device *dev)\n+{\n+\tpm_generic_complete(dev);\n+\t/*\n+\t * If the device had been runtime-suspended before the system went into\n+\t * the sleep state it is going out of and it has never been resumed till\n+\t * now, resume it in case the firmware powered it up.\n+\t */\n+\tif (dev->power.direct_complete && pm_resume_via_firmware())\n+\t\tpm_request_resume(dev);\n+}\n+EXPORT_SYMBOL_GPL(acpi_subsys_complete);\n+\n+/**\n  * acpi_subsys_suspend - Run the device driver's suspend callback.\n  * @dev: Device to handle.\n  *\n@@ -1087,7 +1104,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {\n \t\t.runtime_resume = acpi_subsys_runtime_resume,\n #ifdef CONFIG_PM_SLEEP\n \t\t.prepare = acpi_subsys_prepare,\n-\t\t.complete = pm_complete_with_resume_check,\n+\t\t.complete = acpi_subsys_complete,\n \t\t.suspend = acpi_subsys_suspend,\n \t\t.suspend_late = acpi_subsys_suspend_late,\n \t\t.resume_early = acpi_subsys_resume_early,\n","prefixes":["v3","2/8"]}