From patchwork Sun Dec 6 16:26:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Bishara X-Patchwork-Id: 40433 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.176.167]) by ozlabs.org (Postfix) with ESMTP id CDBE2B7C0E for ; Mon, 7 Dec 2009 03:26:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756228AbZLFQ0a (ORCPT ); Sun, 6 Dec 2009 11:26:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755679AbZLFQ0a (ORCPT ); Sun, 6 Dec 2009 11:26:30 -0500 Received: from dakia2.marvell.com ([65.219.4.35]:50760 "EHLO dakia2.marvell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756246AbZLFQ03 (ORCPT ); Sun, 6 Dec 2009 11:26:29 -0500 X-ASG-Debug-ID: 1260116796-2c1500060000-WJxGKN X-Barracuda-URL: http://10.68.76.222:80/cgi-bin/mark.cgi Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com (Spam & Virus Firewall) with ESMTP id 47750219F09; Sun, 6 Dec 2009 08:26:36 -0800 (PST) Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com with ESMTP id c1FimvpdOrGgycur; Sun, 06 Dec 2009 08:26:36 -0800 (PST) Received: from localhost.localdomain (unknown [10.4.50.39]) by maili.marvell.com (Postfix) with ESMTP id 507EC80E2F; Sun, 6 Dec 2009 08:26:34 -0800 (PST) From: Saeed Bishara To: linux-ide@vger.kernel.org, jeff@garzik.org Cc: liml@rtr.ca, nico@fluxnic.net, buytenh@wantstofly.org, Saeed Bishara X-ASG-Orig-Subj: [PATCH 6/6] sata_mv: add power management support for the PCI controllers. Subject: [PATCH 6/6] sata_mv: add power management support for the PCI controllers. Date: Sun, 6 Dec 2009 18:26:22 +0200 Message-Id: <1260116782-31714-6-git-send-email-saeed@marvell.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1260116782-31714-5-git-send-email-saeed@marvell.com> References: <1260116782-31714-1-git-send-email-saeed@marvell.com> <1260116782-31714-2-git-send-email-saeed@marvell.com> <1260116782-31714-3-git-send-email-saeed@marvell.com> <1260116782-31714-4-git-send-email-saeed@marvell.com> <1260116782-31714-5-git-send-email-saeed@marvell.com> X-Barracuda-Connect: maili.marvell.com[10.68.76.51] X-Barracuda-Start-Time: 1260116796 X-Barracuda-Virus-Scanned: by dakia2.marvell.com at marvell.com X-Barracuda-Spam-Score: -1002.00 X-Barracuda-Spam-Status: No, SCORE=-1002.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1000.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Signed-off-by: Saeed Bishara Reviewed-by: Grant Grundler --- drivers/ata/sata_mv.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 71ac62e..704d86f 100755 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -4161,6 +4161,9 @@ static struct platform_driver mv_platform_driver = { #ifdef CONFIG_PCI static int mv_pci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); +#ifdef CONFIG_PM +static int mv_pci_device_resume(struct pci_dev *pdev); +#endif static struct pci_driver mv_pci_driver = { @@ -4168,6 +4171,11 @@ static struct pci_driver mv_pci_driver = { .id_table = mv_pci_tbl, .probe = mv_pci_init_one, .remove = ata_pci_remove_one, +#ifdef CONFIG_PM + .suspend = ata_pci_device_suspend, + .resume = mv_pci_device_resume, +#endif + }; /* move to PCI layer or libata core? */ @@ -4324,6 +4332,27 @@ static int mv_pci_init_one(struct pci_dev *pdev, return ata_host_activate(host, pdev->irq, mv_interrupt, IRQF_SHARED, IS_GEN_I(hpriv) ? &mv5_sht : &mv6_sht); } + +#ifdef CONFIG_PM +static int mv_pci_device_resume(struct pci_dev *pdev) +{ + struct ata_host *host = dev_get_drvdata(&pdev->dev); + int rc; + + rc = ata_pci_device_do_resume(pdev); + if (rc) + return rc; + + /* initialize adapter */ + rc = mv_init_host(host); + if (rc) + return rc; + + ata_host_resume(host); + + return 0; +} +#endif #endif static int mv_platform_probe(struct platform_device *pdev);