From patchwork Wed Oct 16 11:42:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 283926 X-Patchwork-Delegate: davem@davemloft.net 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 8946F2C019B for ; Wed, 16 Oct 2013 22:43:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760646Ab3JPLnV (ORCPT ); Wed, 16 Oct 2013 07:43:21 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:32951 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760576Ab3JPLnH (ORCPT ); Wed, 16 Oct 2013 07:43:07 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r9GBh2QC011062; Wed, 16 Oct 2013 06:43:02 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9GBh2Jp028033; Wed, 16 Oct 2013 06:43:02 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Wed, 16 Oct 2013 06:43:01 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9GBgsCR025977; Wed, 16 Oct 2013 06:42:59 -0500 From: Roger Quadros To: CC: , , , , , Roger Quadros , Balaji T K Subject: [PATCH v2 2/2] ata: ahci_platform: runtime resume the device before use Date: Wed, 16 Oct 2013 14:42:53 +0300 Message-ID: <1381923773-10596-3-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1381923773-10596-1-git-send-email-rogerq@ti.com> References: <1381923773-10596-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On OMAP platforms the device needs to be runtime resumed before it can be accessed. The OMAP HWMOD framework takes care of enabling the module and its resources based on the device's runtime PM state. In this patch we runtime resume during .probe() and runtime suspend during .remove() (i.e. ahci_host_stop()). We also update the runtime PM state during .resume(). Signed-off-by: Roger Quadros Signed-off-by: Balaji T K --- drivers/ata/ahci_platform.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 5a0f1418..0da3b95 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "ahci.h" static void ahci_host_stop(struct ata_host *host); @@ -141,6 +142,9 @@ static int ahci_probe(struct platform_device *pdev) } } + pm_runtime_enable(dev); + pm_runtime_get_sync(dev); + hpriv->phy = devm_phy_get(dev, "sata-phy"); if (IS_ERR(hpriv->phy)) { dev_dbg(dev, "can't get sata-phy\n"); @@ -268,6 +272,9 @@ static void ahci_host_stop(struct ata_host *host) clk_disable_unprepare(hpriv->clk); clk_put(hpriv->clk); } + + pm_runtime_put_sync(dev); + pm_runtime_disable(dev); } #ifdef CONFIG_PM_SLEEP @@ -339,6 +346,11 @@ static int ahci_resume(struct device *dev) ata_host_resume(host); + /* We resumed so update PM runtime state */ + pm_runtime_disable(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + return 0; disable_unprepare_clk: