From patchwork Tue Sep 7 11:29:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 178092 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 07 Sep 2010 12:29:58 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OswNB-0004Ry-Pu for chris@printf.net; Tue, 07 Sep 2010 12:29:58 +0100 Received: by mail.laptop.org (Postfix) id 42F9C2499B; Tue, 7 Sep 2010 07:29:38 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 3777724999 for ; Tue, 7 Sep 2010 07:29:38 -0400 (EDT) X-ASG-Debug-ID: 1283858992-0b74e4f60002-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id N0zDuO8yskJYiK26 for ; Tue, 07 Sep 2010 07:29:56 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755996Ab0IGL3z (ORCPT ); Tue, 7 Sep 2010 07:29:55 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:49491 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756534Ab0IGL3y (ORCPT ); Tue, 7 Sep 2010 07:29:54 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so2890806fxm.19 for ; Tue, 07 Sep 2010 04:29:51 -0700 (PDT) Received: by 10.223.120.71 with SMTP id c7mr1160176far.104.1283858991587; Tue, 07 Sep 2010 04:29:51 -0700 (PDT) Received: from localhost.localdomain (46-116-15-195.bb.netvision.net.il [46.116.15.195]) by mx.google.com with ESMTPS id r8sm2764094faq.34.2010.09.07.04.29.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Sep 2010 04:29:50 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: Luciano Coelho , , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [PATCH v1 7/8] sdio: enable Runtime PM for SDIO functions Subject: [PATCH v1 7/8] sdio: enable Runtime PM for SDIO functions Date: Tue, 7 Sep 2010 14:29:08 +0300 Message-Id: <1283858949-11073-8-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283858949-11073-1-git-send-email-ohad@wizery.com> References: <1283858949-11073-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283858992 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40182 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index a5a76a8..c4022da 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -732,6 +732,11 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr) err = sdio_init_func(host->card, i + 1); if (err) goto remove; + + /* + * Enable Runtime PM for this func + */ + pm_runtime_enable(&card->sdio_func[i]->dev); } mmc_release_host(host); diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 256a968..d55a592 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -126,15 +126,34 @@ static int sdio_bus_probe(struct device *dev) if (!id) return -ENODEV; + /* Unbound SDIO functions are always suspended. + * During probe, the function is set active and the usage count + * is incremented. If the driver supports runtime PM, + * it should call pm_runtime_put_noidle() in its probe routine and + * pm_runtime_get_noresume() in its remove routine. + */ + ret = pm_runtime_get_sync(dev); + if (ret) + goto out; + /* Set the default block size so the driver is sure it's something * sensible. */ sdio_claim_host(func); ret = sdio_set_block_size(func, 0); sdio_release_host(func); if (ret) - return ret; + goto disable_runtimepm; + + ret = drv->probe(func, id); + if (ret) + goto disable_runtimepm; + + return 0; - return drv->probe(func, id); +disable_runtimepm: + pm_runtime_put_noidle(dev); +out: + return ret; } static int sdio_bus_remove(struct device *dev) @@ -142,6 +161,8 @@ static int sdio_bus_remove(struct device *dev) struct sdio_driver *drv = to_sdio_driver(dev->driver); struct sdio_func *func = dev_to_sdio_func(dev); + pm_runtime_get_sync(dev); + drv->remove(func); if (func->irq_handler) { @@ -152,6 +173,11 @@ static int sdio_bus_remove(struct device *dev) sdio_release_host(func); } + pm_runtime_put_noidle(dev); + + /* Undo the runtime PM settings in sdio_bus_probe() */ + pm_runtime_put_noidle(dev); + return 0; }