From patchwork Tue Mar 17 11:11:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chuanxiao.Dong" X-Patchwork-Id: 6031121 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8225D9F399 for ; Tue, 17 Mar 2015 11:13:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3FD52045A for ; Tue, 17 Mar 2015 11:13:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E0BC20459 for ; Tue, 17 Mar 2015 11:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753180AbbCQLNE (ORCPT ); Tue, 17 Mar 2015 07:13:04 -0400 Received: from mga14.intel.com ([192.55.52.115]:20540 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbCQLND (ORCPT ); Tue, 17 Mar 2015 07:13:03 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 17 Mar 2015 04:07:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,416,1422950400"; d="scan'208";a="681256364" Received: from cxdong-dev.bj.intel.com (HELO intel.com) ([172.16.118.175]) by fmsmga001.fm.intel.com with ESMTP; 17 Mar 2015 04:13:03 -0700 Date: Tue, 17 Mar 2015 19:11:05 +0800 From: Chuanxiao Dong To: linux-mmc@vger.kernel.org Subject: [PATCH 2/5] mmc: host: add runtime PM for host class dev Message-ID: <20150317111105.GC17141@intel.com> Reply-To: Chuanxiao Dong MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP mmc host has a class device which is parent of the card device, also a children of the low level host device. Right now we have runtime pm for card device and low level host device, but nothing for this host class device. So it is impossible to connect the card runtime pm to low level host runtime pm together. We implement runtime pm to mmc host class device, so that when the card device doesn't want to be ignored by the low level host runtime pm, card device driver can talk to class device, so class device can talk to his parent. Signed-off-by: Chuanxiao Dong --- drivers/mmc/core/host.c | 13 +++++++++++++ drivers/mmc/host/sdhci-acpi.c | 1 - drivers/mmc/host/sdhci-pci.c | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 8be0df7..bb7b655 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -46,9 +47,15 @@ static void mmc_host_classdev_release(struct device *dev) kfree(host); } +static const struct dev_pm_ops mmc_host_class_pm_ops = { + SET_RUNTIME_PM_OPS(pm_generic_runtime_suspend, + pm_generic_runtime_resume, NULL) +}; + static struct class mmc_host_class = { .name = "mmc_host", .dev_release = mmc_host_classdev_release, + .pm = &mmc_host_class_pm_ops, }; int mmc_register_host_class(void) @@ -547,6 +554,12 @@ int mmc_add_host(struct mmc_host *host) #endif mmc_host_clk_sysfs_init(host); + /* + * ignore the children by default + */ + pm_suspend_ignore_children(&host->class_dev, true); + pm_runtime_enable(&host->class_dev); + mmc_start_host(host); register_pm_notifier(&host->pm_notify); diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 22d929f..0e40d44 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -373,7 +373,6 @@ static int sdhci_acpi_probe(struct platform_device *pdev) if (c->use_runtime_pm) { pm_runtime_set_active(dev); - pm_suspend_ignore_children(dev, 1); pm_runtime_set_autosuspend_delay(dev, 50); pm_runtime_use_autosuspend(dev); pm_runtime_enable(dev); diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 29eaff7..93e06ae9 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -1568,7 +1568,6 @@ static void sdhci_pci_runtime_pm_allow(struct device *dev) pm_runtime_allow(dev); pm_runtime_set_autosuspend_delay(dev, 50); pm_runtime_use_autosuspend(dev); - pm_suspend_ignore_children(dev, 1); } static void sdhci_pci_runtime_pm_forbid(struct device *dev)