BaseTools: Treat GenFds.py as a python module

[mirror_edk2.git] / OvmfPkg / SataControllerDxe / SataController.c

diff --git a/OvmfPkg/SataControllerDxe/SataController.c b/OvmfPkg/SataControllerDxe/SataController.c
index e5ee63a0ab631e192bc60ecb720dd50e806d5bf1..2a5c3ba9f1b2ee4a10e633a8503fb31f7de75b3c 100644 (file)
--- a/OvmfPkg/SataControllerDxe/SataController.c
+++ b/OvmfPkg/SataControllerDxe/SataController.c
@@ -388,6 +388,7 @@ SataControllerStart (
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
   )\r
 {\r
+  UINTN                             BailLogMask;\r
   EFI_STATUS                        Status;\r
   EFI_PCI_IO_PROTOCOL               *PciIo;\r
   UINT64                            OriginalPciAttributes;\r
@@ -398,6 +399,7 @@ SataControllerStart (
 \r
   DEBUG ((EFI_D_INFO, "SataControllerStart START\n"));\r
 \r
+  BailLogMask = DEBUG_ERROR;\r
   SataPrivateData = NULL;\r
 \r
   //\r
@@ -412,6 +414,14 @@ SataControllerStart (
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    if (Status == EFI_ALREADY_STARTED) {\r
+      //\r
+      // This is an expected condition for OpenProtocol() / BY_DRIVER, in a\r
+      // DriverBindingStart() member function; degrade the log mask to\r
+      // DEBUG_INFO.\r
+      //\r
+      BailLogMask = DEBUG_INFO;\r
+    }\r
     goto Bail;\r
   }\r
 \r
@@ -542,7 +552,8 @@ ClosePciIo:
          );\r
 \r
 Bail:\r
-  DEBUG ((EFI_D_ERROR, "SataControllerStart error return status = %r\n", Status));\r
+  DEBUG ((BailLogMask, "SataControllerStart error return status = %r\n",\r
+    Status));\r
   return Status;\r
 }\r
 \r
@@ -570,6 +581,8 @@ SataControllerStop (
   EFI_STATUS                        Status;\r
   EFI_IDE_CONTROLLER_INIT_PROTOCOL  *IdeInit;\r
   EFI_SATA_CONTROLLER_PRIVATE_DATA  *SataPrivateData;\r
+  EFI_PCI_IO_PROTOCOL               *PciIo;\r
+  UINT64                            OriginalPciAttributes;\r
 \r
   //\r
   // Open the produced protocol\r
@@ -589,6 +602,9 @@ SataControllerStop (
   SataPrivateData = SATA_CONTROLLER_PRIVATE_DATA_FROM_THIS (IdeInit);\r
   ASSERT (SataPrivateData != NULL);\r
 \r
+  PciIo                 = SataPrivateData->PciIo;\r
+  OriginalPciAttributes = SataPrivateData->OriginalPciAttributes;\r
+\r
   //\r
   // Uninstall the IDE Controller Init Protocol from this instance\r
   //\r
@@ -616,12 +632,12 @@ SataControllerStop (
   //\r
   // Restore original PCI attributes\r
   //\r
-  SataPrivateData->PciIo->Attributes (\r
-                            SataPrivateData->PciIo,\r
-                            EfiPciIoAttributeOperationSet,\r
-                            SataPrivateData->OriginalPciAttributes,\r
-                            NULL\r
-                            );\r
+  PciIo->Attributes (\r
+           PciIo,\r
+           EfiPciIoAttributeOperationSet,\r
+           OriginalPciAttributes,\r
+           NULL\r
+           );\r
 \r
   //\r
   // Close protocols opened by Sata Controller driver\r