From patchwork Wed Dec 22 13:13:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Tardy X-Patchwork-Id: 427151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBMDKrKa020276 for ; Wed, 22 Dec 2010 13:20:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752413Ab0LVNUt (ORCPT ); Wed, 22 Dec 2010 08:20:49 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:42544 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863Ab0LVNUs (ORCPT ); Wed, 22 Dec 2010 08:20:48 -0500 Received: by wwa36 with SMTP id 36so5265635wwa.1 for ; Wed, 22 Dec 2010 05:20:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=KX400itJGW8mjdHMx81uVH30MxUNmK8Hyfze3bLgEog=; b=c/vyIgT8wxur0WeGHEFxNzVkrbaBCGsfZotPHSGtXNs95lHch/Va5lhVRfhXMGdbBu 8vEJJi1S7uNB0fFZb+vedggXYN3hvU7GshLbhAnkLIMRJNAMIa/RW83rf6ZcM692bARn 8w2fQMmERUmuDIWT4L3V+lszIdpJkUECRwJrc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=AFi1tmJMl6f4aukYHZf3rHhvS5hRwvheilCj5IN/L1k2G83uAbYiR1M2ihCMGXWxCO iIYCCrL94Y58Yrgf8gT6ftLtKkPcyhjQn9vuZfIllJBEt+agD/19emE2ysPg5zxkSx9Z kdx66Fo9bGx4hDwmOssKXPCNm1BIdfMJLfqDg= Received: by 10.216.24.132 with SMTP id x4mr1884660wex.81.1293024047443; Wed, 22 Dec 2010 05:20:47 -0800 (PST) Received: from localhost.localdomain (AClermont-Ferrand-552-1-42-253.w83-113.abo.wanadoo.fr [83.113.145.253]) by mx.google.com with ESMTPS id o33sm3118534wej.13.2010.12.22.05.20.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Dec 2010 05:20:46 -0800 (PST) From: Pierre Tardy To: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Pierre Tardy , Chris Ball , Andrew Morton , Alan Cox , Takashi Iwai , Maxim Levitsky , Linus Walleij , Ohad Ben-Cohen , Yunpeng Gao Subject: [RFC] sdhci: use ios->clock to know when sdhci is idle Date: Wed, 22 Dec 2010 14:13:41 +0100 Message-Id: <1293023621-3077-1-git-send-email-tardyp@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 13:20:54 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a298fb0..a648330 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1161,6 +1161,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct sdhci_host *host; unsigned long flags; + unsigned int lastclock; u8 ctrl; host = mmc_priv(mmc); @@ -1171,6 +1172,24 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) goto out; /* + * get/put runtime_pm usage counter at ios->clock transitions + * We need to do it before any other chip access, as sdhci could + * be power gated + */ + lastclock = host->iosclock; + host->iosclock = ios->clock; + if (lastclock == 0 && ios->clock != 0) { + spin_unlock_irqrestore(&host->lock, flags); + pm_runtime_get_sync(&host->parent.dev); + spin_lock_irqsave(&host->lock, flags); + } else if (lastclock != 0 && ios->clock == 0) { + spin_unlock_irqrestore(&host->lock, flags); + pm_runtime_put_autosuspend(&host->parent.dev); + spin_lock_irqsave(&host->lock, flags); + /* no need to configure the rest.. */ + goto out; + } + /* * Reset the chip on each power off. * Should clear out any weird states. */ @@ -1779,6 +1798,7 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host = mmc_priv(mmc); host->mmc = mmc; + host->iosclock = 0; return host; } diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 0d953f5..78c1528 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -114,6 +114,7 @@ struct sdhci_host { unsigned int timeout_clk; /* Timeout freq (KHz) */ unsigned int clock; /* Current clock (MHz) */ + unsigned int iosclock; /* Last clock asked via set_ios */ u8 pwr; /* Current voltage */ struct mmc_request *mrq; /* Current request */