From patchwork Tue Feb 4 15:58:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 316644 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 00A322C009E for ; Wed, 5 Feb 2014 03:04:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932095AbaBDP7g (ORCPT ); Tue, 4 Feb 2014 10:59:36 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:52625 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754663AbaBDP7c (ORCPT ); Tue, 4 Feb 2014 10:59:32 -0500 Received: by mail-la0-f41.google.com with SMTP id mc6so6651978lab.14 for ; Tue, 04 Feb 2014 07:59:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3o7pnPeRwtX1hSM3LDtivdH6Fs2RfEWP5EimO2a4jbg=; b=jLDmdhkYLOXHv2YX4IAGrHlpY7fH/4PUdQcFPVFPyRZu48mQ6N34OGHhlhalT2fLQQ 8lBpxAKZTm85d0dyXXIyKI/yB83TIMP9OdzCGSBEog37D77/Uy8sHyzKeD/3Z4TkEo8G SBesIAk2rZrdlJnWiXCm+0lYfDadLFBuqWbgVNoe0lWJ9nGxCIFtKvaftHD29A/UNeyg /EAiggSKIqINsdaV0TyMLRPviRPiJFpX9Ui0mCwZf/ywWLLUzz4DeyqdM2jsyC+FmpPW V9o7gwFms6TKTIP3cTS8gQS8QeTFkBqm/8u006IkFXUI9tWD+tzvuPQ8GBX/IwHc/teg q+pw== X-Gm-Message-State: ALoCoQlckKdvERC/ErZ+4lbKYdeSw2/tqh/EQsjwyEC7xMH3YSxVY6TZl7jAgdXTzu8GZYHhZKbY X-Received: by 10.112.126.164 with SMTP id mz4mr1884793lbb.52.1391529571421; Tue, 04 Feb 2014 07:59:31 -0800 (PST) Received: from localhost.localdomain (host-95-199-220-119.mobileonline.telia.com. [95.199.220.119]) by mx.google.com with ESMTPSA id dm8sm35906603lad.7.2014.02.04.07.59.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:30 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alessandro Rubini , Linus Walleij , Wolfram Sang , Chris Ball , Mark Brown , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 05/17] mmc: mmci: Put the device into low power state at system suspend Date: Tue, 4 Feb 2014 16:58:46 +0100 Message-Id: <1391529538-21685-6-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> References: <1391529538-21685-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 Due to the available runtime PM callbacks, we are now able to put our device into low power state at system suspend. Earlier we could not accomplish this without trusting a power domain for the device to take care of it. Now we are able to cope with scenarios both with and without a power domain. Cc: Russell King Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c88da1c..074e0cb 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1723,33 +1723,38 @@ static int mmci_remove(struct amba_device *dev) return 0; } -#ifdef CONFIG_SUSPEND -static int mmci_suspend(struct device *dev) +#ifdef CONFIG_PM_SLEEP +static int mmci_suspend_late(struct device *dev) { - struct amba_device *adev = to_amba_device(dev); - struct mmc_host *mmc = amba_get_drvdata(adev); + int ret = 0; - if (mmc) { - struct mmci_host *host = mmc_priv(mmc); - pm_runtime_get_sync(dev); - writel(0, host->base + MMCIMASK0); - } + if (pm_runtime_status_suspended(dev)) + return 0; - return 0; + if (dev->pm_domain && dev->pm_domain->ops.runtime_suspend) + ret = dev->pm_domain->ops.runtime_suspend(dev); + else + ret = dev->bus->pm->runtime_suspend(dev); + + if (!ret) + pm_runtime_set_suspended(dev); + + return ret; } -static int mmci_resume(struct device *dev) +static int mmci_resume_early(struct device *dev) { - struct amba_device *adev = to_amba_device(dev); - struct mmc_host *mmc = amba_get_drvdata(adev); + int ret = 0; - if (mmc) { - struct mmci_host *host = mmc_priv(mmc); - writel(MCI_IRQENABLE, host->base + MMCIMASK0); - pm_runtime_put(dev); - } + if (pm_runtime_status_suspended(dev)) + return 0; - return 0; + if (dev->pm_domain && dev->pm_domain->ops.runtime_resume) + ret = dev->pm_domain->ops.runtime_resume(dev); + else + ret = dev->bus->pm->runtime_resume(dev); + + return ret; } #endif @@ -1820,7 +1825,7 @@ static int mmci_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops mmci_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume) + SET_LATE_SYSTEM_SLEEP_PM_OPS(mmci_suspend_late, mmci_resume_early) SET_PM_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) };