tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

OVMF: Fix a hang after resetting when NV variables are preserved.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9242 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jljusten 2009-09-07 20:18:19 +00:00
parent 77ba993c88
commit 607ca5102e
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
View File

@ -462,6 +462,14 @@ Returns:
continue; continue;
} }
Status = PciIo->Attributes (
PciIo,
EfiPciIoAttributeOperationEnable,
EFI_PCI_DEVICE_ENABLE,
NULL
);
ASSERT_EFI_ERROR (Status);
if (!DetectVgaOnly) { if (!DetectVgaOnly) {
// //
// Here we decide whether it is LPC Bridge // Here we decide whether it is LPC Bridge
@ -472,17 +480,11 @@ Returns:
(Pci.Hdr.DeviceId == 0x7000) (Pci.Hdr.DeviceId == 0x7000)
) )
) { ) {
Status = PciIo->Attributes (
PciIo,
EfiPciIoAttributeOperationEnable,
EFI_PCI_DEVICE_ENABLE,
NULL
);
// //
// Add IsaKeyboard to ConIn, // Add IsaKeyboard to ConIn,
// add IsaSerial to ConOut, ConIn, ErrOut // 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]); PrepareLpcBridgeDevicePath (HandleBuffer[Index]);
continue; continue;
} }
@ -493,23 +495,12 @@ Returns:
// //
// Add them to ConOut, ConIn, ErrOut. // 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]); PreparePciSerialDevicePath (HandleBuffer[Index]);
continue; 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 // Here we decide which VGA device to enable in PCI bus
// //
@ -517,7 +508,7 @@ Returns:
// //
// Add them to ConOut. // 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]); PreparePciVgaDevicePath (HandleBuffer[Index]);
continue; continue;
} }