MdeModulePkg PciBusDxe and DuetPkg PciBusNoEnumerationDxe: Update ResetPowerManagemen...

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciPowerManagement.c

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
index d9fbaf7e1275f3d39dc3c3b36bf205278e585609..ab655e76573504882ddd40006b650e44b0e73297 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
@@ -1,7 +1,7 @@
 /** @file\r
   Power management support fucntions implementation for PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -50,19 +50,39 @@ ResetPowerManagementFeature (
   //\r
   // Turn off the PWE assertion and put the device into D0 State\r
   //\r
-  PowerManagementCSR = 0x8000;\r
 \r
   //\r
-  // Write PMCSR\r
+  // Read PMCSR\r
   //\r
-  PciIoDevice->PciIo.Pci.Write (\r
-                           &PciIoDevice->PciIo,\r
-                           EfiPciIoWidthUint16,\r
-                           PowerManagementRegBlock + 4,\r
-                           1,\r
-                           &PowerManagementCSR\r
-                           );\r
-\r
-  return EFI_SUCCESS;\r
+  Status = PciIoDevice->PciIo.Pci.Read (\r
+                                    &PciIoDevice->PciIo,\r
+                                    EfiPciIoWidthUint16,\r
+                                    PowerManagementRegBlock + 4,\r
+                                    1,\r
+                                    &PowerManagementCSR\r
+                                    );\r
+\r
+  if (!EFI_ERROR (Status)) {\r
+    //\r
+    // Clear PME_Status bit\r
+    //\r
+    PowerManagementCSR |= BIT15;\r
+    //\r
+    // Clear PME_En bit. PowerState = D0.\r
+    //\r
+    PowerManagementCSR &= ~(BIT8 | BIT1 | BIT0);\r
+\r
+    //\r
+    // Write PMCSR\r
+    //\r
+    Status = PciIoDevice->PciIo.Pci.Write (\r
+                                      &PciIoDevice->PciIo,\r
+                                      EfiPciIoWidthUint16,\r
+                                      PowerManagementRegBlock + 4,\r
+                                      1,\r
+                                      &PowerManagementCSR\r
+                                      );\r
+  }\r
+  return Status;\r
 }\r
 \r