lkml.org 
[lkml]   [2009]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] [suspend] pci_raw_set_power_state: replace msleep by udelay in resuming procedure
Date
we can not call msleep() when resuming from STR/Standby: if the
current_state of the pci device is PCI_D3hot, means we are in the
procedure of resuming, in this procedure, we can not re-schedule,
otherwise, there will be a deadlock.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
drivers/pci/pci.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 440f4fb..3d9a4e2 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -497,8 +497,18 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)

/* Mandatory power management transition delays */
/* see PCI PM 1.1 5.6.1 table 18 */
- if (state == PCI_D3hot || dev->current_state == PCI_D3hot)
+
+ /* we can not call msleep() when resume:
+ *
+ * if the current_state is PCI_D3hot, means we are in the procedure
+ * of resuming, in this procedure, we can not re-schedule, otherwise,
+ * there will be a deadlock.
+ */
+
+ if (state == PCI_D3hot)
msleep(pci_pm_d3_delay);
+ else if (dev->current_state == PCI_D3hot)
+ udelay(pci_pm_d3_delay);
else if (state == PCI_D2 || dev->current_state == PCI_D2)
udelay(PCI_PM_D2_DELAY);

--
1.6.2.1


\
 
 \ /
  Last update: 2009-07-16 17:45    [W:0.069 / U:0.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site