From patchwork Wed Jun 21 19:21:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9802799 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB27A60329 for ; Wed, 21 Jun 2017 19:36:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C657928573 for ; Wed, 21 Jun 2017 19:36:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B82EA28593; Wed, 21 Jun 2017 19:36:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D5F628573 for ; Wed, 21 Jun 2017 19:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9qK2xKg8oHGU2bnK4uKNOWDVvMgymDzz6jLKHRlrksc=; b=Z+HyltR9wz08AKdQncv0GdDFhP BqbFVC0N50fx9HgC3DtkuRLJtIoY1V2C/8u4ZpM+5rdn6dQ7JVn9g4ti7Xw2cqAy3moG2m3DURO7q gk3RQ7gKw9DAkRf/m49v20cJJvU5e7NHWcXajsJ75cPIepGCVLQMO7i0IahWnPls4fAKabYJZnFLA B/M5fzzXgB85/JWISU9pmfo8ROPocIMaLtw7HTppWj9YnHwjKYBd8DubCqGGAkKEHM99nxeaWi6Uc sGyi3VYQV9D5FKL+bxkFz87uRjB3Qo2wA9q85rPw/5QqGs7To1cyGRdtVMyJzDBtgpC7u3t3RuPie N/XhGpaA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dNlQ1-0001IY-6s; Wed, 21 Jun 2017 19:36:01 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dNlCm-0001yL-17 for linux-arm-kernel@lists.infradead.org; Wed, 21 Jun 2017 19:22:24 +0000 Received: by mail-lf0-x230.google.com with SMTP id m77so102862433lfe.0 for ; Wed, 21 Jun 2017 12:21:59 -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=CAI7eMLczbKxpADKYBOT9FpeOYlOScekjsamv5c1doA=; b=HIJlqKgSphwFvwGdoMRyLKo2/2TdIaXn7JeT1O+7xHuC0MvINd1DLgMIaLWvvl5Ouk QAheBFiu+YXi2f+jVFGtBLBRY1h0F1Y7N8SV9AOGqNX1HqJ2x7DSS4X9psl6/K2Y0csS HTQtXmAgsCYuzh8rLYnWuX1uh3zvdHdgNVJgk= 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=CAI7eMLczbKxpADKYBOT9FpeOYlOScekjsamv5c1doA=; b=uO/LN6xhSq6XilILPAUHvT0oz0UtBfpRINPF78kAMVrYUuzwgI6RzkyHSYDWQ80XTA i0JMGTCGPILO3sRU/DKdTF8/vZ85QJo5UUiKh5rfDMOcoWaTfWLsMNv2gOH+r0Mm4pdV 96RKNRHIXiBzpj5DwbCBYxMQS/UuPAy/orgKrWNEaTXwO2qbz7U/EyMWVhRsfdSAhD1c yRnEvMSsA6bCWa+fV7GEzGVzI79KdqOULTYHwDLsKMt7e9MntKKUGxASpPiUoBKVEqaS goI9GLeCep7IMRn4OvRObvl1v2uwJ4qRLODFLsDf92Rs0Dh3rnarYDE8AA+aeheBqENO TCFQ== X-Gm-Message-State: AKS2vOwvUMXaBmXAygufrSOBM/IhwvdZRgGsSYesqO/ip2XxBwQJny6I SvaOCtnKzlWw2Hcn X-Received: by 10.46.82.68 with SMTP id g65mr1552089ljb.123.1498072918074; Wed, 21 Jun 2017 12:21:58 -0700 (PDT) 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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 12:21:57 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , "Rafael J . Wysocki" , Len Brown , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 8/9] PM / ACPI: Avoid runtime resuming device in acpi_subsys_suspend|freeze() Date: Wed, 21 Jun 2017 21:21:27 +0200 Message-Id: <1498072888-14782-9-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170621_122221_026515_D5850269 X-CRM114-Status: GOOD ( 14.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jisheng Zhang , Ulf Hansson , Guodong Xu , Kevin Hilman , Jarkko Nikula , Haojian Zhuang , John Stultz , Andy Shevchenko , Mika Westerberg , Sumit Semwal , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In the case when the no_direct_complete flag is set for the ACPI device, we can under some conditions during system sleep, avoid runtime resuming the device in acpi_subsys_suspend|freeze(). This will of course improve the time it takes for the system to suspend, but also avoid wasting power. More precisely, from acpi_subsys_suspend|freeze(), let's call acpi_dev_needs_resume() when the no_direct_complete flag is set, as it tells us when runtime resume of the device is needed, thus let's avoid it if possible. Signed-off-by: Ulf Hansson --- drivers/acpi/device_pm.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index e0324ab..f3061f9 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1056,10 +1056,19 @@ EXPORT_SYMBOL_GPL(acpi_subsys_complete); * @dev: Device to handle. * * Follow PCI and resume devices suspended at run time before running their - * system suspend callbacks. + * system suspend callbacks. However, try to avoid it when no_direct_complete + * is set. */ int acpi_subsys_suspend(struct device *dev) { + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (!adev) + return 0; + + if (adev->no_direct_complete && !acpi_dev_needs_resume(dev, adev)) + return pm_generic_suspend(dev); + pm_runtime_resume(dev); return pm_generic_suspend(dev); } @@ -1117,12 +1126,22 @@ EXPORT_SYMBOL_GPL(acpi_subsys_resume_early); */ int acpi_subsys_freeze(struct device *dev) { + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (!adev) + return 0; + /* * This used to be done in acpi_subsys_prepare() for all devices and * some drivers may depend on it, so do it here. Ideally, however, * runtime-suspended devices should not be touched during freeze/thaw - * transitions. + * transitions. At least when no_direct_complete is set, let's try to + * avoid it. */ + + if (adev->no_direct_complete && !acpi_dev_needs_resume(dev, adev)) + return pm_generic_freeze(dev); + pm_runtime_resume(dev); return pm_generic_freeze(dev); }