From patchwork Wed Jun 21 19:21:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 779074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wtF384GfKz9s1h for ; Thu, 22 Jun 2017 05:22:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WrLfgvzO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963AbdFUTW0 (ORCPT ); Wed, 21 Jun 2017 15:22:26 -0400 Received: from mail-lf0-f49.google.com ([209.85.215.49]:34453 "EHLO mail-lf0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888AbdFUTVy (ORCPT ); Wed, 21 Jun 2017 15:21:54 -0400 Received: by mail-lf0-f49.google.com with SMTP id l13so43022289lfl.1 for ; Wed, 21 Jun 2017 12:21:53 -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=QCVzUUSyFMYIjzPdmvE3ollrHFMCZblrrm/7PLOSfB4=; b=WrLfgvzOQxvP87vRcIkGWskfv9c0t/XSUojcSmwNJEKQL3xR+NMWYGOVIgZPDx9/qC 0OrLg+JDjG1uURL+F1fEgpCsg0w/mY1JsEy5cl4QGMtlAmYMFudIpht+NE7o9qagR+nP Nk9USDuJS/uQr2NH3r0ibJG5Hg0NT3LvGoEP0= 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=QCVzUUSyFMYIjzPdmvE3ollrHFMCZblrrm/7PLOSfB4=; b=b+z52MFSJuKTrRtMzYfgjIxxodoGczASAB9+cmpd1YHS/8o/3bdbo6hoIrooGKnNBT C2UY2JVcIzCM4LRf2trQ/9ExwGx8ehz1bt0ImhXMxly12qxx7jybSz2IFOC6TVG9lmBd zEEL7+fAWf0rxj0n5bl1imot3Wj+nYnH+hjHX3j4LwAcAmd/rWN5xOfjIDEN9OAJRwYv 4fLaz6wTQtwUiGr6i/TjMnKD5ufpi6rpf8egWpmqFlBjOGfO6ftWi7iVVuCLXaFsCfWG 9CGeCSvzaYijx+yIjZAmQ1fsS3u72fwabLDyNVeAGbn4g78yciJDtCKoBeN16aY8h5o5 ochw== X-Gm-Message-State: AKS2vOxCLnGCSUjSiLu3y6Ucd6Yvuns9NB0KwIUvgmQJL6uEM5l/O2VK WEH3p5c6aCFDy81z X-Received: by 10.46.71.195 with SMTP id u186mr10471288lja.16.1498072912347; Wed, 21 Jun 2017 12:21:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 12:21:51 -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 4/9] PM / ACPI: Split code validating need for runtime resume in ->prepare() Date: Wed, 21 Jun 2017 21:21:23 +0200 Message-Id: <1498072888-14782-5-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> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Move the code dealing with validation of whether runtime resuming the device is needed during system suspend. In this way it becomes more clear for what circumstances ACPI is prevented from trying the direct_complete path. Signed-off-by: Ulf Hansson --- drivers/acpi/device_pm.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index d38acbc..ee51e75 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -933,6 +933,27 @@ int acpi_dev_resume_early(struct device *dev) } EXPORT_SYMBOL_GPL(acpi_dev_resume_early); +static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev) +{ + u32 sys_target = acpi_target_system_state(); + int ret, state; + + if (device_may_wakeup(dev) != !!adev->wakeup.prepare_count) + return true; + + if (sys_target == ACPI_STATE_S0) + return false; + + if (adev->power.flags.dsw_present) + return true; + + ret = acpi_dev_pm_get_state(dev, adev, sys_target, NULL, &state); + if (ret) + return true; + + return !(state == adev->power.state); +} + /** * acpi_subsys_prepare - Prepare device for system transition to a sleep state. * @dev: Device to prepare. @@ -940,26 +961,16 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early); int acpi_subsys_prepare(struct device *dev) { struct acpi_device *adev = ACPI_COMPANION(dev); - u32 sys_target; - int ret, state; + int ret; ret = pm_generic_prepare(dev); if (ret < 0) return ret; - if (!adev || !pm_runtime_suspended(dev) - || device_may_wakeup(dev) != !!adev->wakeup.prepare_count) - return 0; - - sys_target = acpi_target_system_state(); - if (sys_target == ACPI_STATE_S0) - return 1; - - if (adev->power.flags.dsw_present) + if (!adev || !pm_runtime_suspended(dev)) return 0; - ret = acpi_dev_pm_get_state(dev, adev, sys_target, NULL, &state); - return !ret && state == adev->power.state; + return !acpi_dev_needs_resume(dev, adev); } EXPORT_SYMBOL_GPL(acpi_subsys_prepare);