From: Alan Cox <alan@linux.intel.com>
To: greg@kroah.com, linux-serial@vger.kernel.org
Subject: [PATCH 4/4] hsu: call PCI pm hooks in suspend/resume function
Date: Mon, 26 Jul 2010 10:18:46 +0100 [thread overview]
Message-ID: <20100726091839.21579.4983.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100726091542.21579.55123.stgit@localhost.localdomain>
From: Feng Tang <feng.tang@intel.com>
Also add check for dma controller or the uart ports.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/serial/mfd.c | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/serial/mfd.c b/drivers/serial/mfd.c
index 28cb3ac..9a7a388 100644
--- a/drivers/serial/mfd.c
+++ b/drivers/serial/mfd.c
@@ -1217,25 +1217,38 @@ static struct uart_driver serial_hsu_reg = {
#ifdef CONFIG_PM
static int serial_hsu_suspend(struct pci_dev *pdev, pm_message_t state)
{
+ void *priv = pci_get_drvdata(pdev);
struct uart_hsu_port *up;
- up = pci_get_drvdata(pdev);
- if (!up)
- return 0;
-
- uart_suspend_port(&serial_hsu_reg, &up->port);
+ /* Make sure this is not the internal dma controller */
+ if (priv && (pdev->device != 0x081E)) {
+ up = priv;
+ uart_suspend_port(&serial_hsu_reg, &up->port);
+ }
+ pci_save_state(pdev);
+ pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0;
}
static int serial_hsu_resume(struct pci_dev *pdev)
{
+ void *priv = pci_get_drvdata(pdev);
struct uart_hsu_port *up;
+ int ret;
- up = pci_get_drvdata(pdev);
- if (!up)
- return 0;
- uart_resume_port(&serial_hsu_reg, &up->port);
+ pci_set_power_state(pdev, PCI_D0);
+ pci_restore_state(pdev);
+
+ ret = pci_enable_device(pdev);
+ if (ret)
+ dev_warn(&pdev->dev,
+ "HSU: can't re-enable device, try to continue\n");
+
+ if (priv && (pdev->device != 0x081E)) {
+ up = priv;
+ uart_resume_port(&serial_hsu_reg, &up->port);
+ }
return 0;
}
#else
next prev parent reply other threads:[~2010-07-26 9:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 9:17 [PATCH 0/4] Medfield HSU serial Alan Cox
2010-07-26 9:18 ` [PATCH 1/4] hsu: driver for Medfield High Speed UART device Alan Cox
2010-07-26 9:18 ` [PATCH 2/4] hsu: add a periodic timer to check dma rx channel Alan Cox
2010-07-26 9:18 ` [PATCH 3/4] hsu: some code cleanup Alan Cox
2010-07-26 9:18 ` Alan Cox [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-27 7:20 [PATCH 0/4] Medfield HSU serial Alan Cox
2010-07-27 7:20 ` [PATCH 4/4] hsu: call PCI pm hooks in suspend/resume function Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100726091839.21579.4983.stgit@localhost.localdomain \
--to=alan@linux.intel.com \
--cc=greg@kroah.com \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).