From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753834AbcI2ExV (ORCPT ); Thu, 29 Sep 2016 00:53:21 -0400 Received: from mga11.intel.com ([192.55.52.93]:24830 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbcI2ExL (ORCPT ); Thu, 29 Sep 2016 00:53:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,413,1470726000"; d="scan'208";a="884947069" From: Chen Yu To: linux-pm@vger.kernel.org Cc: Pavel Machek , Len Brown , linux-kernel@vger.kernel.org, Chen Yu , Andy Shevchenko , Mika Westerberg , "Rafael J . Wysocki" , Lee Jones Subject: [PATCH][v3] mfd: intel-lpss: Avoid resuming runtime-suspended lpss unnecessarily Date: Thu, 29 Sep 2016 13:01:26 +0800 Message-Id: <1475125286-12167-1-git-send-email-yu.c.chen@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have report that the intel_lpss_prepare() takes too much time during suspend, and this is because we first resume the devices from runtime suspend by resume_lpss_device(), to make sure they are in proper state before system suspend, which takes 100ms for each LPSS devices(PCI power state from D3_cold to D0). And since resume_lpss_device() resumes the devices synchronously, we might get huge latency if we have many LPSS devices. So first try is to use pm_request_resume() instead, to make the runtime resume process asynchronously. Unfortunately the asynchronous runtime resume relies on pm_wq, which is freezed at early stage. So we choose another method, that is to avoid resuming runtime-suspended devices, if they are already runtime suspended. This is safe because for LPSS driver, the runtime suspend and system suspend are of the same hook - i.e., intel_lpss_suspend(). And moreover, this device is neither runtime wakeup source nor system wakeup source. Suggested-by: Rafael J. Wysocki Acked-by: Mika Westerberg Reviewed-by: Andy Shevchenko Cc: Andy Shevchenko Cc: Mika Westerberg Cc: Rafael J. Wysocki Cc: Lee Jones Signed-off-by: Chen Yu --- drivers/mfd/intel-lpss.c | 9 +++++++++ include/linux/pm.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 41b1138..2583db8 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -485,6 +485,15 @@ static int resume_lpss_device(struct device *dev, void *data) int intel_lpss_prepare(struct device *dev) { /* + * This is safe because: + * 1. The runtime suspend and system suspend + * are of the same hook. + * 2. This device is neither runtime wakeup source + * nor system wakeup source. + */ + if (pm_runtime_status_suspended(dev)) + return DPM_DIRECT_COMPLETE; + /* * Resume both child devices before entering system sleep. This * ensures that they are in proper state before they get suspended. */ diff --git a/include/linux/pm.h b/include/linux/pm.h index 06eb353..4a788b4 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -786,4 +786,11 @@ enum dpm_order { DPM_ORDER_DEV_LAST, }; +/* + * Return this from system suspend/hibernation ->prepare() callback to + * request the core to leave the device runtime-suspended during system + * suspend if possible. + */ +#define DPM_DIRECT_COMPLETE 1 + #endif /* _LINUX_PM_H */ -- 2.7.4