X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=OvmfPkg%2FLibrary%2FPlatformBdsLib%2FBdsPlatform.c;h=e44c8253581f894b447f5e2505bdd01b29e8999f;hp=3728d40bb1db4966fb0324c70c95e591f4097050;hb=4b45b3cb201be8084cc8f3d29899b9a199372eb9;hpb=ccd4b7dadebc65acc89c5bae5ae8d8cc50831bc7

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 3728d40bb1..e44c825358 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -462,6 +462,14 @@ Returns:
       continue;
     }
 
+    Status = PciIo->Attributes (
+      PciIo,
+      EfiPciIoAttributeOperationEnable,
+      EFI_PCI_DEVICE_ENABLE,
+      NULL
+      );
+    ASSERT_EFI_ERROR (Status);
+
     if (!DetectVgaOnly) {
       //
       // Here we decide whether it is LPC Bridge
@@ -472,17 +480,11 @@ Returns:
            (Pci.Hdr.DeviceId == 0x7000)
           )
          ) {
-        Status = PciIo->Attributes (
-          PciIo,
-          EfiPciIoAttributeOperationEnable,
-          EFI_PCI_DEVICE_ENABLE,
-          NULL
-          );
         //
         // Add IsaKeyboard to ConIn,
         // add IsaSerial to ConOut, ConIn, ErrOut
         //
-        DEBUG ((EFI_D_INFO, "Find the LPC Bridge device\n"));
+        DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n"));
         PrepareLpcBridgeDevicePath (HandleBuffer[Index]);
         continue;
       }
@@ -493,23 +495,12 @@ Returns:
         //
         // Add them to ConOut, ConIn, ErrOut.
         //
-        DEBUG ((EFI_D_INFO, "Find the 16550 SERIAL device\n"));
+        DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n"));
         PreparePciSerialDevicePath (HandleBuffer[Index]);
         continue;
       }
     }
 
-    if ((Pci.Hdr.VendorId == 0x8086) &&
-        (Pci.Hdr.DeviceId == 0x7010)
-       ) {
-      Status = PciIo->Attributes (
-        PciIo,
-        EfiPciIoAttributeOperationEnable,
-        EFI_PCI_DEVICE_ENABLE,
-        NULL
-        );
-     }
-
     //
     // Here we decide which VGA device to enable in PCI bus
     //
@@ -517,7 +508,7 @@ Returns:
       //
       // Add them to ConOut.
       //
-      DEBUG ((EFI_D_INFO, "Find the VGA device\n"));
+      DEBUG ((EFI_D_INFO, "Found PCI VGA device\n"));
       PreparePciVgaDevicePath (HandleBuffer[Index]);
       continue;
     }