* [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
@ 2023-05-05 5:17 Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 1/4] OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware Gerd Hoffmann
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 5:17 UTC (permalink / raw)
To: devel
Cc: Jordan Justen, Stefan Berger, Gerd Hoffmann, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski
An attempt to reduce code duplication a bit. PlatformBootManagerLibGrub
is an (outdated) copy of PlatformBootManagerLib with some policy
changes. Add a PCD to enable this policy and add support for that to
PlatformBootManagerLib, which in turn allows to remove
PlatformBootManagerLibGrub.
v2:
- rebase to latest master
- add patch to disable NvVarsFileLib (James)
- pick up acks
Gerd Hoffmann (4):
OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware
OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is
set
OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub
OvmfPkg: drop PlatformBootManagerLibGrub
OvmfPkg/OvmfPkg.dec | 3 +
OvmfPkg/AmdSev/AmdSevX64.dsc | 10 +-
.../Library/NvVarsFileLib/NvVarsFileLib.inf | 1 +
.../PlatformBootManagerLib.inf | 2 +
.../PlatformBootManagerLibGrub.inf | 73 -
.../PlatformBootManagerLibGrub/BdsPlatform.h | 185 --
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c | 3 +-
.../PlatformBootManagerLib/BdsPlatform.c | 70 +-
.../PlatformBootManagerLibGrub/BdsPlatform.c | 1604 -----------------
.../PlatformBootManagerLibGrub/PlatformData.c | 212 ---
.../PlatformBootManagerLibGrub/QemuKernel.c | 55 -
11 files changed, 82 insertions(+), 2136 deletions(-)
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
--
2.40.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/4] OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
@ 2023-05-05 5:17 ` Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 2/4] OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is set Gerd Hoffmann
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 5:17 UTC (permalink / raw)
To: devel
Cc: Jordan Justen, Stefan Berger, Gerd Hoffmann, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski,
Jiewen Yao, Ard Biesheuvel
Add new PCD PcdBootRestrictToFirmware. When set to TRUE restrict
boot options to EFI applications embedded into the firmware image.
Behavior should be identical to the PlatformBootManagerLibGrub
library variant.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
---
OvmfPkg/OvmfPkg.dec | 3 +
.../PlatformBootManagerLib.inf | 2 +
.../PlatformBootManagerLib/BdsPlatform.c | 70 +++++++++++++++++--
3 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 03ae29e7b034..cc5a4ceead25 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -422,6 +422,9 @@ [PcdsFixedAtBuild]
# check to decide whether to abort dispatch of the driver it is linked into.
gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|""|VOID*|0x68
+ ## Restrict boot to EFI applications in firmware volumes.
+ gUefiOvmfPkgTokenSpaceGuid.PcdBootRestrictToFirmware|FALSE|BOOLEAN|0x6c
+
[PcdsDynamic, PcdsDynamicEx]
gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable|FALSE|BOOLEAN|0x10
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index c249a3cf1e35..6b396eac7daf 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -61,6 +61,7 @@ [Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
+ gUefiOvmfPkgTokenSpaceGuid.PcdBootRestrictToFirmware
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## CONSUMES
@@ -84,3 +85,4 @@ [Guids]
gEfiGlobalVariableGuid
gRootBridgesConnectedEventGroupGuid
gUefiShellFileGuid
+ gGrubFileGuid
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 3b7dc53e9f86..8dc2bbf97371 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -290,6 +290,46 @@ RemoveStaleFvFileOptions (
EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
}
+VOID
+RestrictBootOptionsToFirmware (
+ VOID
+ )
+{
+ EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
+ UINTN BootOptionCount;
+ UINTN Index;
+
+ BootOptions = EfiBootManagerGetLoadOptions (
+ &BootOptionCount,
+ LoadOptionTypeBoot
+ );
+
+ for (Index = 0; Index < BootOptionCount; ++Index) {
+ EFI_DEVICE_PATH_PROTOCOL *Node1;
+
+ //
+ // If the device path starts with Fv(...),
+ // then keep the boot option.
+ //
+ Node1 = BootOptions[Index].FilePath;
+ if (((DevicePathType (Node1) == MEDIA_DEVICE_PATH) &&
+ (DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)))
+ {
+ continue;
+ }
+
+ //
+ // Delete the boot option.
+ //
+ EfiBootManagerDeleteLoadOptionVariable (
+ BootOptions[Index].OptionNumber,
+ LoadOptionTypeBoot
+ );
+ }
+
+ EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
+}
+
VOID
PlatformRegisterOptionsAndKeys (
VOID
@@ -485,7 +525,9 @@ PlatformBootManagerBeforeConsole (
Status
));
- PlatformRegisterOptionsAndKeys ();
+ if (!FeaturePcdGet (PcdBootRestrictToFirmware)) {
+ PlatformRegisterOptionsAndKeys ();
+ }
//
// Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL
@@ -1754,9 +1796,12 @@ PlatformBootManagerAfterConsole (
//
// Perform some platform specific connect sequence
//
- PlatformBdsConnectSequence ();
-
- EfiBootManagerRefreshAllBootOption ();
+ if (FeaturePcdGet (PcdBootRestrictToFirmware)) {
+ RestrictBootOptionsToFirmware ();
+ } else {
+ PlatformBdsConnectSequence ();
+ EfiBootManagerRefreshAllBootOption ();
+ }
//
// Register UEFI Shell
@@ -1767,6 +1812,15 @@ PlatformBootManagerAfterConsole (
LOAD_OPTION_ACTIVE
);
+ //
+ // Register Grub
+ //
+ PlatformRegisterFvBootOption (
+ &gGrubFileGuid,
+ L"Grub Bootloader",
+ LOAD_OPTION_ACTIVE
+ );
+
RemoveStaleFvFileOptions ();
SetBootOrderFromQemu ();
@@ -1935,6 +1989,14 @@ PlatformBootManagerUnableToBoot (
EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu;
UINTN Index;
+ if (FeaturePcdGet (PcdBootRestrictToFirmware)) {
+ AsciiPrint (
+ "%a: No bootable option was found.\n",
+ gEfiCallerBaseName
+ );
+ CpuDeadLoop ();
+ }
+
//
// BootManagerMenu doesn't contain the correct information when return status
// is EFI_NOT_FOUND.
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/4] OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is set
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 1/4] OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware Gerd Hoffmann
@ 2023-05-05 5:17 ` Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 3/4] OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub Gerd Hoffmann
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 5:17 UTC (permalink / raw)
To: devel
Cc: Jordan Justen, Stefan Berger, Gerd Hoffmann, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski
In case PcdBootRestrictToFirmware is set disable
loading EFI variables from NvVars file.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf | 1 +
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
index f152c5504661..9ae40ffe4373 100644
--- a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
+++ b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
@@ -49,6 +49,7 @@ [Protocols]
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported
+ gUefiOvmfPkgTokenSpaceGuid.PcdBootRestrictToFirmware
[Guids]
gEfiFileInfoGuid
diff --git a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c
index d4139b911528..8fc54e58a789 100644
--- a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c
+++ b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c
@@ -30,7 +30,8 @@ ConnectNvVarsToFileSystem (
{
EFI_STATUS Status;
- if (FeaturePcdGet (PcdSecureBootSupported)) {
+ if (FeaturePcdGet (PcdSecureBootSupported) ||
+ FeaturePcdGet (PcdBootRestrictToFirmware)) {
return EFI_UNSUPPORTED;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/4] OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 1/4] OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 2/4] OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is set Gerd Hoffmann
@ 2023-05-05 5:17 ` Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 4/4] OvmfPkg: drop PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-10 7:12 ` [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Ard Biesheuvel
4 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 5:17 UTC (permalink / raw)
To: devel
Cc: Jordan Justen, Stefan Berger, Gerd Hoffmann, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski,
Jiewen Yao, Ard Biesheuvel
Use PlatformBootManagerLib with PcdBootRestrictToFirmware
set to TRUE instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
---
OvmfPkg/AmdSev/AmdSevX64.dsc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 943c4eed9831..b32049194d39 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -153,6 +153,7 @@ [LibraryClasses]
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
+ NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
@@ -339,7 +340,7 @@ [LibraryClasses.common.DXE_DRIVER]
!else
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
!endif
- PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
+ PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
@@ -464,6 +465,8 @@ [PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand|TRUE
+ gUefiOvmfPkgTokenSpaceGuid.PcdBootRestrictToFirmware|TRUE
+
################################################################################
#
# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
@@ -619,7 +622,10 @@ [Components]
MdeModulePkg/Universal/Metronome/Metronome.inf
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
- MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+ MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
+ <LibraryClasses>
+ XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf
+ }
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf {
<LibraryClasses>
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 4/4] OvmfPkg: drop PlatformBootManagerLibGrub
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
` (2 preceding siblings ...)
2023-05-05 5:17 ` [PATCH v2 3/4] OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub Gerd Hoffmann
@ 2023-05-05 5:17 ` Gerd Hoffmann
2023-05-10 7:12 ` [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Ard Biesheuvel
4 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 5:17 UTC (permalink / raw)
To: devel
Cc: Jordan Justen, Stefan Berger, Gerd Hoffmann, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski,
Jiewen Yao, Ard Biesheuvel
Not used any more, remove.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
---
.../PlatformBootManagerLibGrub.inf | 73 -
.../PlatformBootManagerLibGrub/BdsPlatform.h | 185 --
.../PlatformBootManagerLibGrub/BdsPlatform.c | 1604 -----------------
.../PlatformBootManagerLibGrub/PlatformData.c | 212 ---
.../PlatformBootManagerLibGrub/QemuKernel.c | 55 -
5 files changed, 2129 deletions(-)
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf b/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
deleted file mode 100644
index 5f6f73d18470..000000000000
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
+++ /dev/null
@@ -1,73 +0,0 @@
-## @file
-# Platform BDS customizations library.
-#
-# Copyright (C) 2020 James Bottomley, IBM Corporation.
-# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PlatformBootManagerLibGrub
- FILE_GUID = 3a8f8431-f0c9-4c95-8a1d-04445c582d4e
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- LIBRARY_CLASS = PlatformBootManagerLib|DXE_DRIVER
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = X64
-#
-
-[Sources]
- BdsPlatform.c
- QemuKernel.c
- PlatformData.c
- BdsPlatform.h
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- SourceLevelDebugPkg/SourceLevelDebugPkg.dec
- OvmfPkg/OvmfPkg.dec
- SecurityPkg/SecurityPkg.dec
- ShellPkg/ShellPkg.dec
-
-[LibraryClasses]
- BaseLib
- MemoryAllocationLib
- UefiBootServicesTableLib
- UefiRuntimeServicesTableLib
- BaseMemoryLib
- DebugLib
- PcdLib
- UefiBootManagerLib
- BootLogoLib
- DevicePathLib
- PciLib
- QemuLoadImageLib
- UefiLib
- PlatformBmPrintScLib
- Tcg2PhysicalPresenceLib
-
-[Pcd]
- gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## CONSUMES
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits ## CONSUMES
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity ## CONSUMES
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits ## CONSUMES
-
-[Protocols]
- gEfiPciRootBridgeIoProtocolGuid
- gEfiDxeSmmReadyToLockProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
- gEfiLoadedImageProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
- gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
-
-[Guids]
- gEfiEndOfDxeEventGroupGuid
- gEfiGlobalVariableGuid
- gRootBridgesConnectedEventGroupGuid
- gUefiShellFileGuid
- gGrubFileGuid
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
deleted file mode 100644
index 0593a5104625..000000000000
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/** @file
- Platform BDS customizations include file.
-
- Copyright (C) 2020 James Bottomley, IBM Corporation.
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-Module Name:
-
- BdsPlatform.h
-
-Abstract:
-
- Head file for BDS Platform specific code
-
-**/
-
-#ifndef _PLATFORM_SPECIFIC_BDS_PLATFORM_H_
-#define _PLATFORM_SPECIFIC_BDS_PLATFORM_H_
-
-#include <PiDxe.h>
-
-#include <IndustryStandard/Pci.h>
-#include <IndustryStandard/Acpi.h>
-#include <IndustryStandard/SmBios.h>
-#include <IndustryStandard/PeImage.h>
-#include <IndustryStandard/Virtio095.h>
-
-#include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseLib.h>
-#include <Library/PcdLib.h>
-#include <Library/PciLib.h>
-#include <Library/UefiBootManagerLib.h>
-#include <Library/BootLogoLib.h>
-#include <Library/HobLib.h>
-#include <Library/UefiLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/IoLib.h>
-
-#include <Protocol/Decompress.h>
-#include <Protocol/PciIo.h>
-#include <Protocol/FirmwareVolume2.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/PciRootBridgeIo.h>
-#include <Protocol/DxeSmmReadyToLock.h>
-#include <Protocol/LoadedImage.h>
-
-#include <Guid/Acpi.h>
-#include <Guid/SmBios.h>
-#include <Guid/HobList.h>
-#include <Guid/GlobalVariable.h>
-#include <Guid/EventGroup.h>
-#include <Guid/DebugAgentGuid.h>
-
-#include <OvmfPlatforms.h>
-
-extern EFI_DEVICE_PATH_PROTOCOL *gPlatformConnectSequence[];
-extern ACPI_HID_DEVICE_PATH gPnpPs2KeyboardDeviceNode;
-extern ACPI_HID_DEVICE_PATH gPnp16550ComPortDeviceNode;
-extern UART_DEVICE_PATH gUartDeviceNode;
-extern VENDOR_DEVICE_PATH gTerminalTypeDeviceNode;
-
-#define PCI_DEVICE_PATH_NODE(Func, Dev) \
- { \
- { \
- HARDWARE_DEVICE_PATH, \
- HW_PCI_DP, \
- { \
- (UINT8) (sizeof (PCI_DEVICE_PATH)), \
- (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) \
- } \
- }, \
- (Func), \
- (Dev) \
- }
-
-#define PNPID_DEVICE_PATH_NODE(PnpId) \
- { \
- { \
- ACPI_DEVICE_PATH, \
- ACPI_DP, \
- { \
- (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \
- (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) \
- }, \
- }, \
- EISA_PNP_ID((PnpId)), \
- 0 \
- }
-
-#define gPciIsaBridge \
- PCI_DEVICE_PATH_NODE(0, 0x1f)
-
-#define gP2PBridge \
- PCI_DEVICE_PATH_NODE(0, 0x1e)
-
-#define gPnpPs2Keyboard \
- PNPID_DEVICE_PATH_NODE(0x0303)
-
-#define gPnp16550ComPort \
- PNPID_DEVICE_PATH_NODE(0x0501)
-
-#define gUart \
- { \
- { \
- MESSAGING_DEVICE_PATH, \
- MSG_UART_DP, \
- { \
- (UINT8) (sizeof (UART_DEVICE_PATH)), \
- (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8) \
- } \
- }, \
- 0, \
- 115200, \
- 8, \
- 1, \
- 1 \
- }
-
-#define gPcAnsiTerminal \
- { \
- { \
- MESSAGING_DEVICE_PATH, \
- MSG_VENDOR_DP, \
- { \
- (UINT8) (sizeof (VENDOR_DEVICE_PATH)), \
- (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \
- } \
- }, \
- DEVICE_PATH_MESSAGING_PC_ANSI \
- }
-
-#define gEndEntire \
- { \
- END_DEVICE_PATH_TYPE, \
- END_ENTIRE_DEVICE_PATH_SUBTYPE, \
- { \
- END_DEVICE_PATH_LENGTH, \
- 0 \
- } \
- }
-
-#define PCI_CLASS_SCC 0x07
-#define PCI_SUBCLASS_SERIAL 0x00
-#define PCI_IF_16550 0x02
-#define IS_PCI_16550SERIAL(_p) IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)
-#define IS_PCI_ISA_PDECODE(_p) IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)
-
-typedef struct {
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- UINTN ConnectType;
-} PLATFORM_CONSOLE_CONNECT_ENTRY;
-
-#define CONSOLE_OUT BIT0
-#define CONSOLE_IN BIT1
-#define STD_ERROR BIT2
-extern PLATFORM_CONSOLE_CONNECT_ENTRY gPlatformConsole[];
-extern PLATFORM_CONSOLE_CONNECT_ENTRY gXenPlatformConsole[];
-
-//
-// Platform BDS Functions
-//
-
-VOID
-PlatformInitializeConsole (
- IN PLATFORM_CONSOLE_CONNECT_ENTRY *PlatformConsole
- );
-
-/**
- Loads and boots UEFI Linux via the FwCfg interface.
-
- @retval EFI_NOT_FOUND - The Linux kernel was not found
-
-**/
-EFI_STATUS
-TryRunningQemuKernel (
- VOID
- );
-
-#endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
deleted file mode 100644
index df8e2fe15786..000000000000
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
+++ /dev/null
@@ -1,1604 +0,0 @@
-/** @file
- Platform BDS customizations.
-
- Copyright (C) 2020 James Bottomley, IBM Corporation.
- Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include "BdsPlatform.h"
-#include <Guid/RootBridgesConnectedEventGroup.h>
-#include <Protocol/FirmwareVolume2.h>
-#include <Library/PlatformBmPrintScLib.h>
-#include <Library/Tcg2PhysicalPresenceLib.h>
-
-//
-// Global data
-//
-
-VOID *mEfiDevPathNotifyReg;
-EFI_EVENT mEfiDevPathEvent;
-UINT16 mHostBridgeDevId;
-
-//
-// Table of host IRQs matching PCI IRQs A-D
-// (for configuring PCI Interrupt Line register)
-//
-CONST UINT8 PciHostIrqs[] = {
- 0x0a, 0x0a, 0x0b, 0x0b
-};
-
-//
-// Type definitions
-//
-
-typedef
-EFI_STATUS
-(EFIAPI *PROTOCOL_INSTANCE_CALLBACK)(
- IN EFI_HANDLE Handle,
- IN VOID *Instance,
- IN VOID *Context
- );
-
-/**
- @param[in] Handle - Handle of PCI device instance
- @param[in] PciIo - PCI IO protocol instance
- @param[in] Pci - PCI Header register block
-**/
-typedef
-EFI_STATUS
-(EFIAPI *VISIT_PCI_INSTANCE_CALLBACK)(
- IN EFI_HANDLE Handle,
- IN EFI_PCI_IO_PROTOCOL *PciIo,
- IN PCI_TYPE00 *Pci
- );
-
-//
-// Function prototypes
-//
-
-EFI_STATUS
-VisitAllInstancesOfProtocol (
- IN EFI_GUID *Id,
- IN PROTOCOL_INSTANCE_CALLBACK CallBackFunction,
- IN VOID *Context
- );
-
-EFI_STATUS
-VisitAllPciInstancesOfProtocol (
- IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction
- );
-
-VOID
-InstallDevicePathCallback (
- VOID
- );
-
-VOID
-PlatformRegisterFvBootOption (
- EFI_GUID *FileGuid,
- CHAR16 *Description,
- UINT32 Attributes
- )
-{
- EFI_STATUS Status;
- INTN OptionIndex;
- EFI_BOOT_MANAGER_LOAD_OPTION NewOption;
- EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
- UINTN BootOptionCount;
- MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
- EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
-
- Status = gBS->HandleProtocol (
- gImageHandle,
- &gEfiLoadedImageProtocolGuid,
- (VOID **)&LoadedImage
- );
- ASSERT_EFI_ERROR (Status);
-
- EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
- DevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
- ASSERT (DevicePath != NULL);
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&FileNode
- );
- ASSERT (DevicePath != NULL);
-
- Status = EfiBootManagerInitializeLoadOption (
- &NewOption,
- LoadOptionNumberUnassigned,
- LoadOptionTypeBoot,
- Attributes,
- Description,
- DevicePath,
- NULL,
- 0
- );
- ASSERT_EFI_ERROR (Status);
- FreePool (DevicePath);
-
- BootOptions = EfiBootManagerGetLoadOptions (
- &BootOptionCount,
- LoadOptionTypeBoot
- );
-
- OptionIndex = EfiBootManagerFindLoadOption (
- &NewOption,
- BootOptions,
- BootOptionCount
- );
-
- if (OptionIndex == -1) {
- Status = EfiBootManagerAddLoadOptionVariable (&NewOption, MAX_UINTN);
- ASSERT_EFI_ERROR (Status);
- }
-
- EfiBootManagerFreeLoadOption (&NewOption);
- EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
-}
-
-/**
- Remove all MemoryMapped(...)/FvFile(...) and Fv(...)/FvFile(...) boot options
- whose device paths do not resolve exactly to an FvFile in the system.
-
- Also strip out every boot option that is not an FvFile, meaning the system
- can only boot either the Grub or (if built) the shell.
-
- This removes any boot options that point to binaries built into the firmware
- and have become stale due to any of the following:
- - DXEFV's base address or size changed (historical),
- - DXEFV's FvNameGuid changed,
- - the FILE_GUID of the pointed-to binary changed,
- - the referenced binary is no longer built into the firmware.
-
- EfiBootManagerFindLoadOption() used in PlatformRegisterFvBootOption() only
- avoids exact duplicates.
-**/
-VOID
-RemoveStaleFvFileOptions (
- VOID
- )
-{
- EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
- UINTN BootOptionCount;
- UINTN Index;
-
- BootOptions = EfiBootManagerGetLoadOptions (
- &BootOptionCount,
- LoadOptionTypeBoot
- );
-
- for (Index = 0; Index < BootOptionCount; ++Index) {
- EFI_DEVICE_PATH_PROTOCOL *Node1, *Node2, *SearchNode;
- EFI_STATUS Status;
- EFI_HANDLE FvHandle;
-
- //
- // If the device path starts with neither MemoryMapped(...) nor Fv(...),
- // then delete the boot option.
- //
- Node1 = BootOptions[Index].FilePath;
- if (!((DevicePathType (Node1) == HARDWARE_DEVICE_PATH) &&
- (DevicePathSubType (Node1) == HW_MEMMAP_DP)) &&
- !((DevicePathType (Node1) == MEDIA_DEVICE_PATH) &&
- (DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)))
- {
- EfiBootManagerDeleteLoadOptionVariable (
- BootOptions[Index].OptionNumber,
- LoadOptionTypeBoot
- );
- continue;
- }
-
- //
- // If the second device path node is not FvFile(...), then delete the boot
- // option.
- //
- Node2 = NextDevicePathNode (Node1);
- if ((DevicePathType (Node2) != MEDIA_DEVICE_PATH) ||
- (DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP))
- {
- EfiBootManagerDeleteLoadOptionVariable (
- BootOptions[Index].OptionNumber,
- LoadOptionTypeBoot
- );
- continue;
- }
-
- //
- // Locate the Firmware Volume2 protocol instance that is denoted by the
- // boot option. If this lookup fails (i.e., the boot option references a
- // firmware volume that doesn't exist), then we'll proceed to delete the
- // boot option.
- //
- SearchNode = Node1;
- Status = gBS->LocateDevicePath (
- &gEfiFirmwareVolume2ProtocolGuid,
- &SearchNode,
- &FvHandle
- );
-
- if (!EFI_ERROR (Status)) {
- //
- // The firmware volume was found; now let's see if it contains the FvFile
- // identified by GUID.
- //
- EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol;
- MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileNode;
- UINTN BufferSize;
- EFI_FV_FILETYPE FoundType;
- EFI_FV_FILE_ATTRIBUTES FileAttributes;
- UINT32 AuthenticationStatus;
-
- Status = gBS->HandleProtocol (
- FvHandle,
- &gEfiFirmwareVolume2ProtocolGuid,
- (VOID **)&FvProtocol
- );
- ASSERT_EFI_ERROR (Status);
-
- FvFileNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node2;
- //
- // Buffer==NULL means we request metadata only: BufferSize, FoundType,
- // FileAttributes.
- //
- Status = FvProtocol->ReadFile (
- FvProtocol,
- &FvFileNode->FvFileName, // NameGuid
- NULL, // Buffer
- &BufferSize,
- &FoundType,
- &FileAttributes,
- &AuthenticationStatus
- );
- if (!EFI_ERROR (Status)) {
- //
- // The FvFile was found. Keep the boot option.
- //
- continue;
- }
- }
-
- //
- // Delete the boot option.
- //
- Status = EfiBootManagerDeleteLoadOptionVariable (
- BootOptions[Index].OptionNumber,
- LoadOptionTypeBoot
- );
- DEBUG_CODE_BEGIN ();
- CHAR16 *DevicePathString;
-
- DevicePathString = ConvertDevicePathToText (
- BootOptions[Index].FilePath,
- FALSE,
- FALSE
- );
- DEBUG ((
- EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
- "%a: removing stale Boot#%04x %s: %r\n",
- __func__,
- (UINT32)BootOptions[Index].OptionNumber,
- DevicePathString == NULL ? L"<unavailable>" : DevicePathString,
- Status
- ));
- if (DevicePathString != NULL) {
- FreePool (DevicePathString);
- }
-
- DEBUG_CODE_END ();
- }
-
- EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
-}
-
-EFI_STATUS
-EFIAPI
-ConnectRootBridge (
- IN EFI_HANDLE RootBridgeHandle,
- IN VOID *Instance,
- IN VOID *Context
- );
-
-STATIC
-EFI_STATUS
-EFIAPI
-ConnectVirtioPciRng (
- IN EFI_HANDLE Handle,
- IN VOID *Instance,
- IN VOID *Context
- );
-
-//
-// BDS Platform Functions
-//
-
-/**
- Do the platform init, can be customized by OEM/IBV
-
- Possible things that can be done in PlatformBootManagerBeforeConsole:
-
- > Update console variable: 1. include hot-plug devices;
- > 2. Clear ConIn and add SOL for AMT
- > Register new Driver#### or Boot####
- > Register new Key####: e.g.: F12
- > Signal ReadyToLock event
- > Authentication action: 1. connect Auth devices;
- > 2. Identify auto logon user.
-**/
-VOID
-EFIAPI
-PlatformBootManagerBeforeConsole (
- VOID
- )
-{
- EFI_HANDLE Handle;
- EFI_STATUS Status;
- UINT16 FrontPageTimeout;
-
- FrontPageTimeout = 0;
-
- DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));
- InstallDevicePathCallback ();
-
- VisitAllInstancesOfProtocol (
- &gEfiPciRootBridgeIoProtocolGuid,
- ConnectRootBridge,
- NULL
- );
-
- //
- // Signal the ACPI platform driver that it can download QEMU ACPI tables.
- //
- EfiEventGroupSignal (&gRootBridgesConnectedEventGroupGuid);
-
- //
- // We can't signal End-of-Dxe earlier than this. Namely, End-of-Dxe triggers
- // the preparation of S3 system information. That logic has a hard dependency
- // on the presence of the FACS ACPI table. Since our ACPI tables are only
- // installed after PCI enumeration completes, we must not trigger the S3 save
- // earlier, hence we can't signal End-of-Dxe earlier.
- //
- EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid);
-
- // We need to connect all trusted consoles for TCG PP. Here we treat all
- // consoles in OVMF to be trusted consoles.
- PlatformInitializeConsole (gPlatformConsole);
-
- //
- // Process TPM PPI request
- //
- Tcg2PhysicalPresenceLibProcessRequest (NULL);
-
- //
- // Prevent further changes to LockBoxes or SMRAM.
- // Any TPM 2 Physical Presence Interface opcode must be handled before.
- //
- Handle = NULL;
- Status = gBS->InstallProtocolInterface (
- &Handle,
- &gEfiDxeSmmReadyToLockProtocolGuid,
- EFI_NATIVE_INTERFACE,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
-
- //
- // Dispatch deferred images after EndOfDxe event and ReadyToLock
- // installation.
- //
- EfiBootManagerDispatchDeferredImages ();
-
- //
- // GPU passthrough only allows Console enablement after ROM image load
- //
- PlatformInitializeConsole (gPlatformConsole);
-
- Status = gRT->SetVariable (
- EFI_TIME_OUT_VARIABLE_NAME,
- &gEfiGlobalVariableGuid,
- (EFI_VARIABLE_NON_VOLATILE |
- EFI_VARIABLE_BOOTSERVICE_ACCESS |
- EFI_VARIABLE_RUNTIME_ACCESS),
- sizeof FrontPageTimeout,
- &FrontPageTimeout
- );
- //
- // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL
- // instances on Virtio PCI RNG devices.
- //
- VisitAllInstancesOfProtocol (
- &gEfiPciIoProtocolGuid,
- ConnectVirtioPciRng,
- NULL
- );
-}
-
-EFI_STATUS
-EFIAPI
-ConnectRootBridge (
- IN EFI_HANDLE RootBridgeHandle,
- IN VOID *Instance,
- IN VOID *Context
- )
-{
- EFI_STATUS Status;
-
- //
- // Make the PCI bus driver connect the root bridge, non-recursively. This
- // will produce a number of child handles with PciIo on them.
- //
- Status = gBS->ConnectController (
- RootBridgeHandle, // ControllerHandle
- NULL, // DriverImageHandle
- NULL, // RemainingDevicePath -- produce all
- // children
- FALSE // Recursive
- );
- return Status;
-}
-
-STATIC
-EFI_STATUS
-EFIAPI
-ConnectVirtioPciRng (
- IN EFI_HANDLE Handle,
- IN VOID *Instance,
- IN VOID *Context
- )
-{
- EFI_PCI_IO_PROTOCOL *PciIo;
- EFI_STATUS Status;
- UINT16 VendorId;
- UINT16 DeviceId;
- UINT8 RevisionId;
- BOOLEAN Virtio10;
- UINT16 SubsystemId;
-
- PciIo = Instance;
-
- //
- // Read and check VendorId.
- //
- Status = PciIo->Pci.Read (
- PciIo,
- EfiPciIoWidthUint16,
- PCI_VENDOR_ID_OFFSET,
- 1,
- &VendorId
- );
- if (EFI_ERROR (Status)) {
- goto Error;
- }
-
- if (VendorId != VIRTIO_VENDOR_ID) {
- return EFI_SUCCESS;
- }
-
- //
- // Read DeviceId and RevisionId.
- //
- Status = PciIo->Pci.Read (
- PciIo,
- EfiPciIoWidthUint16,
- PCI_DEVICE_ID_OFFSET,
- 1,
- &DeviceId
- );
- if (EFI_ERROR (Status)) {
- goto Error;
- }
-
- Status = PciIo->Pci.Read (
- PciIo,
- EfiPciIoWidthUint8,
- PCI_REVISION_ID_OFFSET,
- 1,
- &RevisionId
- );
- if (EFI_ERROR (Status)) {
- goto Error;
- }
-
- //
- // From DeviceId and RevisionId, determine whether the device is a
- // modern-only Virtio 1.0 device. In case of Virtio 1.0, DeviceId can
- // immediately be restricted to VIRTIO_SUBSYSTEM_ENTROPY_SOURCE, and
- // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can
- // only be sanity-checked, and SubsystemId will decide.
- //
- if ((DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE) &&
- (RevisionId >= 0x01))
- {
- Virtio10 = TRUE;
- } else if ((DeviceId >= 0x1000) && (DeviceId <= 0x103F) && (RevisionId == 0x00)) {
- Virtio10 = FALSE;
- } else {
- return EFI_SUCCESS;
- }
-
- //
- // Read and check SubsystemId as dictated by Virtio10.
- //
- Status = PciIo->Pci.Read (
- PciIo,
- EfiPciIoWidthUint16,
- PCI_SUBSYSTEM_ID_OFFSET,
- 1,
- &SubsystemId
- );
- if (EFI_ERROR (Status)) {
- goto Error;
- }
-
- if ((Virtio10 && (SubsystemId >= 0x40)) ||
- (!Virtio10 && (SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)))
- {
- Status = gBS->ConnectController (
- Handle, // ControllerHandle
- NULL, // DriverImageHandle -- connect all drivers
- NULL, // RemainingDevicePath -- produce all child handles
- FALSE // Recursive -- don't follow child handles
- );
- if (EFI_ERROR (Status)) {
- goto Error;
- }
- }
-
- return EFI_SUCCESS;
-
-Error:
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, Status));
- return Status;
-}
-
-/**
- Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.
-
- @param[in] DeviceHandle Handle of the LPC Bridge device.
-
- @retval EFI_SUCCESS Console devices on the LPC bridge have been added to
- ConOut, ConIn, and ErrOut.
-
- @return Error codes, due to EFI_DEVICE_PATH_PROTOCOL missing
- from DeviceHandle.
-**/
-EFI_STATUS
-PrepareLpcBridgeDevicePath (
- IN EFI_HANDLE DeviceHandle
- )
-{
- EFI_STATUS Status;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;
- CHAR16 *DevPathStr;
-
- DevicePath = NULL;
- Status = gBS->HandleProtocol (
- DeviceHandle,
- &gEfiDevicePathProtocolGuid,
- (VOID *)&DevicePath
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- TempDevicePath = DevicePath;
-
- //
- // Register Keyboard
- //
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode
- );
-
- EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
-
- //
- // Register COM1
- //
- DevicePath = TempDevicePath;
- gPnp16550ComPortDeviceNode.UID = 0;
-
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode
- );
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode
- );
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode
- );
-
- //
- // Print Device Path
- //
- DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);
- if (DevPathStr != NULL) {
- DEBUG ((
- DEBUG_INFO,
- "BdsPlatform.c+%d: COM%d DevPath: %s\n",
- DEBUG_LINE_NUMBER,
- gPnp16550ComPortDeviceNode.UID + 1,
- DevPathStr
- ));
- FreePool (DevPathStr);
- }
-
- EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
-
- //
- // Register COM2
- //
- DevicePath = TempDevicePath;
- gPnp16550ComPortDeviceNode.UID = 1;
-
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode
- );
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode
- );
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode
- );
-
- //
- // Print Device Path
- //
- DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);
- if (DevPathStr != NULL) {
- DEBUG ((
- DEBUG_INFO,
- "BdsPlatform.c+%d: COM%d DevPath: %s\n",
- DEBUG_LINE_NUMBER,
- gPnp16550ComPortDeviceNode.UID + 1,
- DevPathStr
- ));
- FreePool (DevPathStr);
- }
-
- EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-GetGopDevicePath (
- IN EFI_DEVICE_PATH_PROTOCOL *PciDevicePath,
- OUT EFI_DEVICE_PATH_PROTOCOL **GopDevicePath
- )
-{
- UINTN Index;
- EFI_STATUS Status;
- EFI_HANDLE PciDeviceHandle;
- EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;
- EFI_DEVICE_PATH_PROTOCOL *TempPciDevicePath;
- UINTN GopHandleCount;
- EFI_HANDLE *GopHandleBuffer;
-
- if ((PciDevicePath == NULL) || (GopDevicePath == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Initialize the GopDevicePath to be PciDevicePath
- //
- *GopDevicePath = PciDevicePath;
- TempPciDevicePath = PciDevicePath;
-
- Status = gBS->LocateDevicePath (
- &gEfiDevicePathProtocolGuid,
- &TempPciDevicePath,
- &PciDeviceHandle
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- //
- // Try to connect this handle, so that GOP driver could start on this
- // device and create child handles with GraphicsOutput Protocol installed
- // on them, then we get device paths of these child handles and select
- // them as possible console device.
- //
- gBS->ConnectController (PciDeviceHandle, NULL, NULL, FALSE);
-
- Status = gBS->LocateHandleBuffer (
- ByProtocol,
- &gEfiGraphicsOutputProtocolGuid,
- NULL,
- &GopHandleCount,
- &GopHandleBuffer
- );
- if (!EFI_ERROR (Status)) {
- //
- // Add all the child handles as possible Console Device
- //
- for (Index = 0; Index < GopHandleCount; Index++) {
- Status = gBS->HandleProtocol (
- GopHandleBuffer[Index],
- &gEfiDevicePathProtocolGuid,
- (VOID *)&TempDevicePath
- );
- if (EFI_ERROR (Status)) {
- continue;
- }
-
- if (CompareMem (
- PciDevicePath,
- TempDevicePath,
- GetDevicePathSize (PciDevicePath) - END_DEVICE_PATH_LENGTH
- ) == 0)
- {
- //
- // In current implementation, we only enable one of the child handles
- // as console device, i.e. sotre one of the child handle's device
- // path to variable "ConOut"
- // In future, we could select all child handles to be console device
- //
-
- *GopDevicePath = TempDevicePath;
-
- //
- // Delete the PCI device's path that added by
- // GetPlugInPciVgaDevicePath(). Add the integrity GOP device path.
- //
- EfiBootManagerUpdateConsoleVariable (ConOutDev, NULL, PciDevicePath);
- EfiBootManagerUpdateConsoleVariable (ConOutDev, TempDevicePath, NULL);
- }
- }
-
- gBS->FreePool (GopHandleBuffer);
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Add PCI display to ConOut.
-
- @param[in] DeviceHandle Handle of the PCI display device.
-
- @retval EFI_SUCCESS The PCI display device has been added to ConOut.
-
- @return Error codes, due to EFI_DEVICE_PATH_PROTOCOL missing
- from DeviceHandle.
-**/
-EFI_STATUS
-PreparePciDisplayDevicePath (
- IN EFI_HANDLE DeviceHandle
- )
-{
- EFI_STATUS Status;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- EFI_DEVICE_PATH_PROTOCOL *GopDevicePath;
-
- DevicePath = NULL;
- GopDevicePath = NULL;
- Status = gBS->HandleProtocol (
- DeviceHandle,
- &gEfiDevicePathProtocolGuid,
- (VOID *)&DevicePath
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- GetGopDevicePath (DevicePath, &GopDevicePath);
- DevicePath = GopDevicePath;
-
- EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
-
- return EFI_SUCCESS;
-}
-
-/**
- Add PCI Serial to ConOut, ConIn, ErrOut.
-
- @param[in] DeviceHandle Handle of the PCI serial device.
-
- @retval EFI_SUCCESS The PCI serial device has been added to ConOut, ConIn,
- ErrOut.
-
- @return Error codes, due to EFI_DEVICE_PATH_PROTOCOL missing
- from DeviceHandle.
-**/
-EFI_STATUS
-PreparePciSerialDevicePath (
- IN EFI_HANDLE DeviceHandle
- )
-{
- EFI_STATUS Status;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
-
- DevicePath = NULL;
- Status = gBS->HandleProtocol (
- DeviceHandle,
- &gEfiDevicePathProtocolGuid,
- (VOID *)&DevicePath
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode
- );
- DevicePath = AppendDevicePathNode (
- DevicePath,
- (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode
- );
-
- EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
- EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-VisitAllInstancesOfProtocol (
- IN EFI_GUID *Id,
- IN PROTOCOL_INSTANCE_CALLBACK CallBackFunction,
- IN VOID *Context
- )
-{
- EFI_STATUS Status;
- UINTN HandleCount;
- EFI_HANDLE *HandleBuffer;
- UINTN Index;
- VOID *Instance;
-
- //
- // Start to check all the PciIo to find all possible device
- //
- HandleCount = 0;
- HandleBuffer = NULL;
- Status = gBS->LocateHandleBuffer (
- ByProtocol,
- Id,
- NULL,
- &HandleCount,
- &HandleBuffer
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- for (Index = 0; Index < HandleCount; Index++) {
- Status = gBS->HandleProtocol (HandleBuffer[Index], Id, &Instance);
- if (EFI_ERROR (Status)) {
- continue;
- }
-
- Status = (*CallBackFunction)(
- HandleBuffer[Index],
- Instance,
- Context
- );
- }
-
- gBS->FreePool (HandleBuffer);
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EFIAPI
-VisitingAPciInstance (
- IN EFI_HANDLE Handle,
- IN VOID *Instance,
- IN VOID *Context
- )
-{
- EFI_STATUS Status;
- EFI_PCI_IO_PROTOCOL *PciIo;
- PCI_TYPE00 Pci;
-
- PciIo = (EFI_PCI_IO_PROTOCOL *)Instance;
-
- //
- // Check for all PCI device
- //
- Status = PciIo->Pci.Read (
- PciIo,
- EfiPciIoWidthUint32,
- 0,
- sizeof (Pci) / sizeof (UINT32),
- &Pci
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN)Context)(
- Handle,
- PciIo,
- &Pci
- );
-}
-
-EFI_STATUS
-VisitAllPciInstances (
- IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction
- )
-{
- return VisitAllInstancesOfProtocol (
- &gEfiPciIoProtocolGuid,
- VisitingAPciInstance,
- (VOID *)(UINTN)CallBackFunction
- );
-}
-
-/**
- Do platform specific PCI Device check and add them to
- ConOut, ConIn, ErrOut.
-
- @param[in] Handle - Handle of PCI device instance
- @param[in] PciIo - PCI IO protocol instance
- @param[in] Pci - PCI Header register block
-
- @retval EFI_SUCCESS - PCI Device check and Console variable update
- successfully.
- @retval EFI_STATUS - PCI Device check or Console variable update fail.
-
-**/
-EFI_STATUS
-EFIAPI
-DetectAndPreparePlatformPciDevicePath (
- IN EFI_HANDLE Handle,
- IN EFI_PCI_IO_PROTOCOL *PciIo,
- IN PCI_TYPE00 *Pci
- )
-{
- EFI_STATUS Status;
-
- Status = PciIo->Attributes (
- PciIo,
- EfiPciIoAttributeOperationEnable,
- EFI_PCI_DEVICE_ENABLE,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
-
- //
- // Here we decide whether it is LPC Bridge
- //
- if ((IS_PCI_LPC (Pci)) ||
- ((IS_PCI_ISA_PDECODE (Pci)) &&
- (Pci->Hdr.VendorId == 0x8086) &&
- (Pci->Hdr.DeviceId == 0x7000)
- )
- )
- {
- //
- // Add IsaKeyboard to ConIn,
- // add IsaSerial to ConOut, ConIn, ErrOut
- //
- DEBUG ((DEBUG_INFO, "Found LPC Bridge device\n"));
- PrepareLpcBridgeDevicePath (Handle);
- return EFI_SUCCESS;
- }
-
- //
- // Here we decide which Serial device to enable in PCI bus
- //
- if (IS_PCI_16550SERIAL (Pci)) {
- //
- // Add them to ConOut, ConIn, ErrOut.
- //
- DEBUG ((DEBUG_INFO, "Found PCI 16550 SERIAL device\n"));
- PreparePciSerialDevicePath (Handle);
- return EFI_SUCCESS;
- }
-
- //
- // Here we decide which display device to enable in PCI bus
- //
- if (IS_PCI_DISPLAY (Pci)) {
- //
- // Add them to ConOut.
- //
- DEBUG ((DEBUG_INFO, "Found PCI display device\n"));
- PreparePciDisplayDevicePath (Handle);
- return EFI_SUCCESS;
- }
-
- return Status;
-}
-
-/**
- Connect the predefined platform default console device.
-
- Always try to find and enable PCI display devices.
-
- @param[in] PlatformConsole Predefined platform default console device array.
-**/
-VOID
-PlatformInitializeConsole (
- IN PLATFORM_CONSOLE_CONNECT_ENTRY *PlatformConsole
- )
-{
- UINTN Index;
-
- //
- // Do platform specific PCI Device check and add them to ConOut, ConIn,
- // ErrOut
- //
- VisitAllPciInstances (DetectAndPreparePlatformPciDevicePath);
-
- //
- // Have chance to connect the platform default console,
- // the platform default console is the minimum device group
- // the platform should support
- //
- for (Index = 0; PlatformConsole[Index].DevicePath != NULL; ++Index) {
- //
- // Update the console variable with the connect type
- //
- if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {
- EfiBootManagerUpdateConsoleVariable (
- ConIn,
- PlatformConsole[Index].DevicePath,
- NULL
- );
- }
-
- if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {
- EfiBootManagerUpdateConsoleVariable (
- ConOut,
- PlatformConsole[Index].DevicePath,
- NULL
- );
- }
-
- if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {
- EfiBootManagerUpdateConsoleVariable (
- ErrOut,
- PlatformConsole[Index].DevicePath,
- NULL
- );
- }
- }
-}
-
-/**
- Configure PCI Interrupt Line register for applicable devices
- Ported from SeaBIOS, src/fw/pciinit.c, *_pci_slot_get_irq()
-
- @param[in] Handle - Handle of PCI device instance
- @param[in] PciIo - PCI IO protocol instance
- @param[in] PciHdr - PCI Header register block
-
- @retval EFI_SUCCESS - PCI Interrupt Line register configured successfully.
-
-**/
-EFI_STATUS
-EFIAPI
-SetPciIntLine (
- IN EFI_HANDLE Handle,
- IN EFI_PCI_IO_PROTOCOL *PciIo,
- IN PCI_TYPE00 *PciHdr
- )
-{
- EFI_DEVICE_PATH_PROTOCOL *DevPathNode;
- EFI_DEVICE_PATH_PROTOCOL *DevPath;
- UINTN RootSlot;
- UINTN Idx;
- UINT8 IrqLine;
- EFI_STATUS Status;
- UINT32 RootBusNumber;
-
- Status = EFI_SUCCESS;
-
- if (PciHdr->Device.InterruptPin != 0) {
- DevPathNode = DevicePathFromHandle (Handle);
- ASSERT (DevPathNode != NULL);
- DevPath = DevPathNode;
-
- RootBusNumber = 0;
- if ((DevicePathType (DevPathNode) == ACPI_DEVICE_PATH) &&
- (DevicePathSubType (DevPathNode) == ACPI_DP) &&
- (((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID (0x0A03)))
- {
- RootBusNumber = ((ACPI_HID_DEVICE_PATH *)DevPathNode)->UID;
- }
-
- //
- // Compute index into PciHostIrqs[] table by walking
- // the device path and adding up all device numbers
- //
- Status = EFI_NOT_FOUND;
- RootSlot = 0;
- Idx = PciHdr->Device.InterruptPin - 1;
- while (!IsDevicePathEnd (DevPathNode)) {
- if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&
- (DevicePathSubType (DevPathNode) == HW_PCI_DP))
- {
- Idx += ((PCI_DEVICE_PATH *)DevPathNode)->Device;
-
- //
- // Unlike SeaBIOS, which starts climbing from the leaf device
- // up toward the root, we traverse the device path starting at
- // the root moving toward the leaf node.
- // The slot number of the top-level parent bridge is needed for
- // Q35 cases with more than 24 slots on the root bus.
- //
- if (Status != EFI_SUCCESS) {
- Status = EFI_SUCCESS;
- RootSlot = ((PCI_DEVICE_PATH *)DevPathNode)->Device;
- }
- }
-
- DevPathNode = NextDevicePathNode (DevPathNode);
- }
-
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- if ((RootBusNumber == 0) && (RootSlot == 0)) {
- DEBUG ((
- DEBUG_ERROR,
- "%a: PCI host bridge (00:00.0) should have no interrupts!\n",
- __func__
- ));
- ASSERT (FALSE);
- }
-
- //
- // Final PciHostIrqs[] index calculation depends on the platform
- // and should match SeaBIOS src/fw/pciinit.c *_pci_slot_get_irq()
- //
- switch (mHostBridgeDevId) {
- case INTEL_82441_DEVICE_ID:
- Idx -= 1;
- break;
- case INTEL_Q35_MCH_DEVICE_ID:
- //
- // SeaBIOS contains the following comment:
- // "Slots 0-24 rotate slot:pin mapping similar to piix above, but
- // with a different starting index - see q35-acpi-dsdt.dsl.
- //
- // Slots 25-31 all use LNKA mapping (or LNKE, but A:D = E:H)"
- //
- if (RootSlot > 24) {
- //
- // in this case, subtract back out RootSlot from Idx
- // (SeaBIOS never adds it to begin with, but that would make our
- // device path traversal loop above too awkward)
- //
- Idx -= RootSlot;
- }
-
- break;
- default:
- ASSERT (FALSE); // should never get here
- }
-
- Idx %= ARRAY_SIZE (PciHostIrqs);
- IrqLine = PciHostIrqs[Idx];
-
- DEBUG_CODE_BEGIN ();
- {
- CHAR16 *DevPathString;
- STATIC CHAR16 Fallback[] = L"<failed to convert>";
- UINTN Segment, Bus, Device, Function;
-
- DevPathString = ConvertDevicePathToText (DevPath, FALSE, FALSE);
- if (DevPathString == NULL) {
- DevPathString = Fallback;
- }
-
- Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);
- ASSERT_EFI_ERROR (Status);
-
- DEBUG ((
- DEBUG_VERBOSE,
- "%a: [%02x:%02x.%x] %s -> 0x%02x\n",
- __func__,
- (UINT32)Bus,
- (UINT32)Device,
- (UINT32)Function,
- DevPathString,
- IrqLine
- ));
-
- if (DevPathString != Fallback) {
- FreePool (DevPathString);
- }
- }
- DEBUG_CODE_END ();
-
- //
- // Set PCI Interrupt Line register for this device to PciHostIrqs[Idx]
- //
- Status = PciIo->Pci.Write (
- PciIo,
- EfiPciIoWidthUint8,
- PCI_INT_LINE_OFFSET,
- 1,
- &IrqLine
- );
- }
-
- return Status;
-}
-
-VOID
-PciAcpiInitialization (
- )
-{
- UINTN Pmba;
-
- //
- // Query Host Bridge DID to determine platform type
- //
- mHostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);
- switch (mHostBridgeDevId) {
- case INTEL_82441_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);
- //
- // 00:01.0 ISA Bridge (PIIX4) LNK routing targets
- //
- PciWrite8 (PCI_LIB_ADDRESS (0, 1, 0, 0x60), 0x0b); // A
- PciWrite8 (PCI_LIB_ADDRESS (0, 1, 0, 0x61), 0x0b); // B
- PciWrite8 (PCI_LIB_ADDRESS (0, 1, 0, 0x62), 0x0a); // C
- PciWrite8 (PCI_LIB_ADDRESS (0, 1, 0, 0x63), 0x0a); // D
- break;
- case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
- //
- // 00:1f.0 LPC Bridge (Q35) LNK routing targets
- //
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x60), 0x0a); // A
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x61), 0x0a); // B
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x62), 0x0b); // C
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x63), 0x0b); // D
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x68), 0x0a); // E
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x69), 0x0a); // F
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x6a), 0x0b); // G
- PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x6b), 0x0b); // H
- break;
- default:
- DEBUG ((
- DEBUG_ERROR,
- "%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __func__,
- mHostBridgeDevId
- ));
- ASSERT (FALSE);
- return;
- }
-
- //
- // Initialize PCI_INTERRUPT_LINE for applicable present PCI devices
- //
- VisitAllPciInstances (SetPciIntLine);
-
- //
- // Set ACPI SCI_EN bit in PMCNTRL
- //
- IoOr16 ((PciRead32 (Pmba) & ~BIT0) + 4, BIT0);
-}
-
-EFI_STATUS
-EFIAPI
-ConnectRecursivelyIfPciMassStorage (
- IN EFI_HANDLE Handle,
- IN EFI_PCI_IO_PROTOCOL *Instance,
- IN PCI_TYPE00 *PciHeader
- )
-{
- EFI_STATUS Status;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- CHAR16 *DevPathStr;
-
- //
- // Recognize PCI Mass Storage
- //
- if (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE)) {
- DevicePath = NULL;
- Status = gBS->HandleProtocol (
- Handle,
- &gEfiDevicePathProtocolGuid,
- (VOID *)&DevicePath
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- //
- // Print Device Path
- //
- DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);
- if (DevPathStr != NULL) {
- DEBUG ((
- DEBUG_INFO,
- "Found Mass Storage device: %s\n",
- DevPathStr
- ));
- FreePool (DevPathStr);
- }
-
- Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);
- if (EFI_ERROR (Status)) {
- return Status;
- }
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Connect with predefined platform connect sequence.
-
- The OEM/IBV can customize with their own connect sequence.
-**/
-VOID
-PlatformBdsConnectSequence (
- VOID
- )
-{
- UINTN Index;
-
- DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));
-
- Index = 0;
-
- //
- // Here we can get the customized platform connect sequence
- // Notes: we can connect with new variable which record the
- // last time boots connect device path sequence
- //
- while (gPlatformConnectSequence[Index] != NULL) {
- //
- // Build the platform boot option
- //
- EfiBootManagerConnectDevicePath (gPlatformConnectSequence[Index], NULL);
- Index++;
- }
-
- EfiBootManagerConnectAll ();
-}
-
-/**
- Do the platform specific action after the console is ready
-
- Possible things that can be done in PlatformBootManagerAfterConsole:
-
- > Console post action:
- > Dynamically switch output mode from 100x31 to 80x25 for certain senarino
- > Signal console ready platform customized event
- > Run diagnostics like memory testing
- > Connect certain devices
- > Dispatch aditional option roms
- > Special boot: e.g.: USB boot, enter UI
-**/
-VOID
-EFIAPI
-PlatformBootManagerAfterConsole (
- VOID
- )
-{
- EFI_BOOT_MODE BootMode;
-
- DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));
-
- //
- // Get current Boot Mode
- //
- BootMode = GetBootModeHob ();
- DEBUG ((DEBUG_INFO, "Boot Mode:%x\n", BootMode));
-
- //
- // Go the different platform policy with different boot mode
- // Notes: this part code can be change with the table policy
- //
- ASSERT (BootMode == BOOT_WITH_FULL_CONFIGURATION);
-
- //
- // Logo show
- //
- BootLogoEnableLogo ();
-
- //
- // Set PCI Interrupt Line registers and ACPI SCI_EN
- //
- PciAcpiInitialization ();
-
- //
- // Process QEMU's -kernel command line option
- //
- TryRunningQemuKernel ();
-
- //
- // Perform some platform specific connect sequence
- //
- PlatformBdsConnectSequence ();
-
- EfiBootManagerRefreshAllBootOption ();
-
- //
- // Register UEFI Shell (Will be removed if the Shell isn't built
- // which is the default)
- //
- PlatformRegisterFvBootOption (
- &gUefiShellFileGuid,
- L"EFI Internal Shell",
- LOAD_OPTION_ACTIVE
- );
-
- //
- // Register Grub
- //
- PlatformRegisterFvBootOption (
- &gGrubFileGuid,
- L"Grub Bootloader",
- LOAD_OPTION_ACTIVE
- );
-
- RemoveStaleFvFileOptions ();
-
- PlatformBmPrintScRegisterHandler ();
-}
-
-/**
- This notification function is invoked when an instance of the
- EFI_DEVICE_PATH_PROTOCOL is produced.
-
- @param Event The event that occurred
- @param Context For EFI compatibility. Not used.
-
-**/
-VOID
-EFIAPI
-NotifyDevPath (
- IN EFI_EVENT Event,
- IN VOID *Context
- )
-{
- EFI_HANDLE Handle;
- EFI_STATUS Status;
- UINTN BufferSize;
- EFI_DEVICE_PATH_PROTOCOL *DevPathNode;
- ATAPI_DEVICE_PATH *Atapi;
-
- //
- // Examine all new handles
- //
- for ( ; ;) {
- //
- // Get the next handle
- //
- BufferSize = sizeof (Handle);
- Status = gBS->LocateHandle (
- ByRegisterNotify,
- NULL,
- mEfiDevPathNotifyReg,
- &BufferSize,
- &Handle
- );
-
- //
- // If not found, we're done
- //
- if (EFI_NOT_FOUND == Status) {
- break;
- }
-
- if (EFI_ERROR (Status)) {
- continue;
- }
-
- //
- // Get the DevicePath protocol on that handle
- //
- Status = gBS->HandleProtocol (
- Handle,
- &gEfiDevicePathProtocolGuid,
- (VOID **)&DevPathNode
- );
- ASSERT_EFI_ERROR (Status);
-
- while (!IsDevicePathEnd (DevPathNode)) {
- //
- // Find the handler to dump this device path node
- //
- if (
- (DevicePathType (DevPathNode) == MESSAGING_DEVICE_PATH) &&
- (DevicePathSubType (DevPathNode) == MSG_ATAPI_DP)
- )
- {
- Atapi = (ATAPI_DEVICE_PATH *)DevPathNode;
- PciOr16 (
- PCI_LIB_ADDRESS (
- 0,
- 1,
- 1,
- (Atapi->PrimarySecondary == 1) ? 0x42 : 0x40
- ),
- BIT15
- );
- }
-
- //
- // Next device path node
- //
- DevPathNode = NextDevicePathNode (DevPathNode);
- }
- }
-
- return;
-}
-
-VOID
-InstallDevicePathCallback (
- VOID
- )
-{
- DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));
- mEfiDevPathEvent = EfiCreateProtocolNotifyEvent (
- &gEfiDevicePathProtocolGuid,
- TPL_CALLBACK,
- NotifyDevPath,
- NULL,
- &mEfiDevPathNotifyReg
- );
-}
-
-/**
- This function is called each second during the boot manager waits the
- timeout.
-
- @param TimeoutRemain The remaining timeout.
-**/
-VOID
-EFIAPI
-PlatformBootManagerWaitCallback (
- UINT16 TimeoutRemain
- )
-{
- //
- // Since the timeout should be forced to zero we should never
- // Get here
- //
- ASSERT (FALSE);
-}
-
-/**
- The function is called when no boot option could be launched,
- including platform recovery options and options pointing to applications
- built into firmware volumes.
-
- If this function returns, BDS attempts to enter an infinite loop.
-**/
-VOID
-EFIAPI
-PlatformBootManagerUnableToBoot (
- VOID
- )
-{
- //
- // If we get here something failed about the grub boot but since
- // We're privy to the secret we must panic and not retry or loop
- //
- ASSERT (FALSE);
- CpuDeadLoop ();
-}
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
deleted file mode 100644
index 5e2b7510c5dd..000000000000
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/** @file
- Defined the platform specific device path which will be used by
- platform Bbd to perform the platform policy connect.
-
- Copyright (C) 2020 James Bottomley, IBM Corporation.
- Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include "BdsPlatform.h"
-#include <Guid/QemuRamfb.h>
-#include <Guid/SerialPortLibVendor.h>
-
-//
-// Vendor UART Device Path structure
-//
-#pragma pack (1)
-typedef struct {
- VENDOR_DEVICE_PATH VendorHardware;
- UART_DEVICE_PATH Uart;
- VENDOR_DEVICE_PATH TerminalType;
- EFI_DEVICE_PATH_PROTOCOL End;
-} VENDOR_UART_DEVICE_PATH;
-#pragma pack ()
-
-//
-// USB Keyboard Device Path structure
-//
-#pragma pack (1)
-typedef struct {
- USB_CLASS_DEVICE_PATH Keyboard;
- EFI_DEVICE_PATH_PROTOCOL End;
-} USB_KEYBOARD_DEVICE_PATH;
-#pragma pack ()
-
-//
-// QemuRamfb Device Path structure
-//
-#pragma pack (1)
-typedef struct {
- VENDOR_DEVICE_PATH Vendor;
- ACPI_ADR_DEVICE_PATH AcpiAdr;
- EFI_DEVICE_PATH_PROTOCOL End;
-} VENDOR_RAMFB_DEVICE_PATH;
-#pragma pack ()
-
-ACPI_HID_DEVICE_PATH gPnpPs2KeyboardDeviceNode = gPnpPs2Keyboard;
-ACPI_HID_DEVICE_PATH gPnp16550ComPortDeviceNode = gPnp16550ComPort;
-UART_DEVICE_PATH gUartDeviceNode = gUart;
-VENDOR_DEVICE_PATH gTerminalTypeDeviceNode = gPcAnsiTerminal;
-
-//
-// Platform specific keyboard device path
-//
-
-//
-// Debug Agent UART Device Path
-//
-VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
- {
- {
- HARDWARE_DEVICE_PATH,
- HW_VENDOR_DP,
- {
- (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
- (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
- }
- },
- EFI_DEBUG_AGENT_GUID,
- },
- {
- {
- MESSAGING_DEVICE_PATH,
- MSG_UART_DP,
- {
- (UINT8)(sizeof (UART_DEVICE_PATH)),
- (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)
- }
- },
- 0, // Reserved
- 0, // BaudRate - Default
- 0, // DataBits - Default
- 0, // Parity - Default
- 0, // StopBits - Default
- },
- gPcAnsiTerminal,
- gEndEntire
-};
-
-STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {
- {
- {
- MESSAGING_DEVICE_PATH,
- MSG_USB_CLASS_DP,
- {
- (UINT8)sizeof (USB_CLASS_DEVICE_PATH),
- (UINT8)(sizeof (USB_CLASS_DEVICE_PATH) >> 8)
- }
- },
- 0xFFFF, // VendorId: any
- 0xFFFF, // ProductId: any
- 3, // DeviceClass: HID
- 1, // DeviceSubClass: boot
- 1 // DeviceProtocol: keyboard
- },
- gEndEntire
-};
-
-STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
- {
- {
- HARDWARE_DEVICE_PATH,
- HW_VENDOR_DP,
- {
- (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
- (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
- }
- },
- QEMU_RAMFB_GUID,
- },
- {
- {
- ACPI_DEVICE_PATH,
- ACPI_ADR_DP,
- {
- (UINT8)(sizeof (ACPI_ADR_DEVICE_PATH)),
- (UINT8)((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)
- }
- },
- ACPI_DISPLAY_ADR (
- 1, // DeviceIdScheme
- 0, // HeadId
- 0, // NonVgaOutput
- 1, // BiosCanDetect
- 0, // VendorInfo
- ACPI_ADR_DISPLAY_TYPE_EXTERNAL_DIGITAL, // Type
- 0, // Port
- 0 // Index
- ),
- },
- gEndEntire
-};
-
-STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {
- {
- {
- HARDWARE_DEVICE_PATH,
- HW_VENDOR_DP,
- {
- (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
- (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
- }
- },
- EDKII_SERIAL_PORT_LIB_VENDOR_GUID
- },
- {
- {
- MESSAGING_DEVICE_PATH,
- MSG_UART_DP,
- {
- (UINT8)(sizeof (UART_DEVICE_PATH)),
- (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)
- }
- },
- 0,
- FixedPcdGet64 (PcdUartDefaultBaudRate),
- FixedPcdGet8 (PcdUartDefaultDataBits),
- FixedPcdGet8 (PcdUartDefaultParity),
- FixedPcdGet8 (PcdUartDefaultStopBits),
- },
- gPcAnsiTerminal,
- gEndEntire
-};
-
-//
-// Predefined platform default console device path
-//
-PLATFORM_CONSOLE_CONNECT_ENTRY gPlatformConsole[] = {
- {
- (EFI_DEVICE_PATH_PROTOCOL *)&gDebugAgentUartDevicePath,
- (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)
- },
- {
- (EFI_DEVICE_PATH_PROTOCOL *)&gUsbKeyboardDevicePath,
- CONSOLE_IN
- },
- {
- (EFI_DEVICE_PATH_PROTOCOL *)&gQemuRamfbDevicePath,
- CONSOLE_OUT
- },
- {
- NULL,
- 0
- }
-};
-
-PLATFORM_CONSOLE_CONNECT_ENTRY gXenPlatformConsole[] = {
- {
- (EFI_DEVICE_PATH_PROTOCOL *)&gXenConsoleDevicePath,
- (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)
- },
- {
- NULL,
- 0
- }
-};
-
-//
-// Predefined platform connect sequence
-//
-EFI_DEVICE_PATH_PROTOCOL *gPlatformConnectSequence[] = { NULL };
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
deleted file mode 100644
index 84b25db52159..000000000000
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/** @file
-
- Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include <Uefi.h>
-
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-#include <Library/QemuLoadImageLib.h>
-#include <Library/ReportStatusCodeLib.h>
-#include <Library/UefiLib.h>
-
-EFI_STATUS
-TryRunningQemuKernel (
- VOID
- )
-{
- EFI_STATUS Status;
- EFI_HANDLE KernelImageHandle;
-
- Status = QemuLoadKernelImage (&KernelImageHandle);
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- //
- // Signal the EVT_SIGNAL_READY_TO_BOOT event
- //
- EfiSignalEventReadyToBoot ();
-
- REPORT_STATUS_CODE (
- EFI_PROGRESS_CODE,
- (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT)
- );
-
- //
- // Start the image.
- //
- Status = QemuStartKernelImage (&KernelImageHandle);
- if (EFI_ERROR (Status)) {
- DEBUG ((
- DEBUG_ERROR,
- "%a: QemuStartKernelImage(): %r\n",
- __func__,
- Status
- ));
- }
-
- QemuUnloadKernelImage (KernelImageHandle);
-
- return Status;
-}
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
` (3 preceding siblings ...)
2023-05-05 5:17 ` [PATCH v2 4/4] OvmfPkg: drop PlatformBootManagerLibGrub Gerd Hoffmann
@ 2023-05-10 7:12 ` Ard Biesheuvel
2023-05-10 7:41 ` 回复: " gaoliming
4 siblings, 1 reply; 10+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 7:12 UTC (permalink / raw)
To: Gerd Hoffmann, Liming Gao (Byosoft address)
Cc: devel, Jordan Justen, Stefan Berger, Tom Lendacky, Jiewen Yao,
Anthony Perard, Marc-André Lureau, Ard Biesheuvel,
Erdem Aktas, Oliver Steffen, Min Xu, James Bottomley,
Julien Grall, Michael Roth, Pawel Polawski
(cc Liming)
I'd like to merge this series before the stable tag - any objections?
On Fri, 5 May 2023 at 07:28, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> An attempt to reduce code duplication a bit. PlatformBootManagerLibGrub
> is an (outdated) copy of PlatformBootManagerLib with some policy
> changes. Add a PCD to enable this policy and add support for that to
> PlatformBootManagerLib, which in turn allows to remove
> PlatformBootManagerLibGrub.
>
> v2:
> - rebase to latest master
> - add patch to disable NvVarsFileLib (James)
> - pick up acks
>
> Gerd Hoffmann (4):
> OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware
> OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is
> set
> OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub
> OvmfPkg: drop PlatformBootManagerLibGrub
>
> OvmfPkg/OvmfPkg.dec | 3 +
> OvmfPkg/AmdSev/AmdSevX64.dsc | 10 +-
> .../Library/NvVarsFileLib/NvVarsFileLib.inf | 1 +
> .../PlatformBootManagerLib.inf | 2 +
> .../PlatformBootManagerLibGrub.inf | 73 -
> .../PlatformBootManagerLibGrub/BdsPlatform.h | 185 --
> OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c | 3 +-
> .../PlatformBootManagerLib/BdsPlatform.c | 70 +-
> .../PlatformBootManagerLibGrub/BdsPlatform.c | 1604 -----------------
> .../PlatformBootManagerLibGrub/PlatformData.c | 212 ---
> .../PlatformBootManagerLibGrub/QemuKernel.c | 55 -
> 11 files changed, 82 insertions(+), 2136 deletions(-)
> delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGrub.inf
> delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
> delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
> delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
> delete mode 100644 OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
>
> --
> 2.40.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* 回复: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
2023-05-10 7:12 ` [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Ard Biesheuvel
@ 2023-05-10 7:41 ` gaoliming
2023-05-10 12:33 ` [edk2-devel] " Ard Biesheuvel
0 siblings, 1 reply; 10+ messages in thread
From: gaoliming @ 2023-05-10 7:41 UTC (permalink / raw)
To: 'Ard Biesheuvel', 'Gerd Hoffmann'
Cc: devel, 'Jordan Justen', 'Stefan Berger',
'Tom Lendacky', 'Jiewen Yao',
'Anthony Perard', 'Marc-André Lureau',
'Ard Biesheuvel', 'Erdem Aktas',
'Oliver Steffen', 'Min Xu',
'James Bottomley', 'Julien Grall',
'Michael Roth', 'Pawel Polawski'
Ard:
Seemly, this patch set passed code review before the soft feature freeze. So, I am OK to merge it for this stable tag.
Thanks
Liming
> -----邮件原件-----
> 发件人: Ard Biesheuvel <ardb@kernel.org>
> 发送时间: 2023年5月10日 15:13
> 收件人: Gerd Hoffmann <kraxel@redhat.com>; Liming Gao (Byosoft address)
> <gaoliming@byosoft.com.cn>
> 抄送: devel@edk2.groups.io; Jordan Justen <jordan.l.justen@intel.com>;
> Stefan Berger <stefanb@linux.ibm.com>; Tom Lendacky
> <thomas.lendacky@amd.com>; Jiewen Yao <jiewen.yao@intel.com>;
> Anthony Perard <anthony.perard@citrix.com>; Marc-André Lureau
> <marcandre.lureau@redhat.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Erdem Aktas <erdemaktas@google.com>;
> Oliver Steffen <osteffen@redhat.com>; Min Xu <min.m.xu@intel.com>;
> James Bottomley <jejb@linux.ibm.com>; Julien Grall <julien@xen.org>;
> Michael Roth <michael.roth@amd.com>; Pawel Polawski
> <ppolawsk@redhat.com>
> 主题: Re: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
>
> (cc Liming)
>
> I'd like to merge this series before the stable tag - any objections?
>
> On Fri, 5 May 2023 at 07:28, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > An attempt to reduce code duplication a bit.
> PlatformBootManagerLibGrub
> > is an (outdated) copy of PlatformBootManagerLib with some policy
> > changes. Add a PCD to enable this policy and add support for that to
> > PlatformBootManagerLib, which in turn allows to remove
> > PlatformBootManagerLibGrub.
> >
> > v2:
> > - rebase to latest master
> > - add patch to disable NvVarsFileLib (James)
> > - pick up acks
> >
> > Gerd Hoffmann (4):
> > OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware
> > OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is
> > set
> > OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub
> > OvmfPkg: drop PlatformBootManagerLibGrub
> >
> > OvmfPkg/OvmfPkg.dec | 3 +
> > OvmfPkg/AmdSev/AmdSevX64.dsc | 10 +-
> > .../Library/NvVarsFileLib/NvVarsFileLib.inf | 1 +
> > .../PlatformBootManagerLib.inf | 2 +
> > .../PlatformBootManagerLibGrub.inf | 73 -
> > .../PlatformBootManagerLibGrub/BdsPlatform.h | 185 --
> > OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c | 3 +-
> > .../PlatformBootManagerLib/BdsPlatform.c | 70 +-
> > .../PlatformBootManagerLibGrub/BdsPlatform.c | 1604 -----------------
> > .../PlatformBootManagerLibGrub/PlatformData.c | 212 ---
> > .../PlatformBootManagerLibGrub/QemuKernel.c | 55 -
> > 11 files changed, 82 insertions(+), 2136 deletions(-)
> > delete mode 100644
> OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformBootManagerLibGru
> b.inf
> > delete mode 100644
> OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
> > delete mode 100644
> OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
> > delete mode 100644
> OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
> > delete mode 100644
> OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
> >
> > --
> > 2.40.1
> >
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [edk2-devel] 回复: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
2023-05-10 7:41 ` 回复: " gaoliming
@ 2023-05-10 12:33 ` Ard Biesheuvel
2023-05-10 12:43 ` Ard Biesheuvel
0 siblings, 1 reply; 10+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 12:33 UTC (permalink / raw)
To: devel, gaoliming
Cc: Gerd Hoffmann, Jordan Justen, Stefan Berger, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski
On Wed, 10 May 2023 at 09:41, gaoliming via groups.io
<gaoliming=byosoft.com.cn@groups.io> wrote:
>
> Ard:
> Seemly, this patch set passed code review before the soft feature freeze. So, I am OK to merge it for this stable tag.
>
Thanks
Gerd,
Could you run this through the CI please? I am getting errors.
https://github.com/tianocore/edk2/pull/4382
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [edk2-devel] 回复: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
2023-05-10 12:33 ` [edk2-devel] " Ard Biesheuvel
@ 2023-05-10 12:43 ` Ard Biesheuvel
2023-05-10 15:07 ` Ard Biesheuvel
0 siblings, 1 reply; 10+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 12:43 UTC (permalink / raw)
To: devel, gaoliming
Cc: Gerd Hoffmann, Jordan Justen, Stefan Berger, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski
On Wed, 10 May 2023 at 14:33, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Wed, 10 May 2023 at 09:41, gaoliming via groups.io
> <gaoliming=byosoft.com.cn@groups.io> wrote:
> >
> > Ard:
> > Seemly, this patch set passed code review before the soft feature freeze. So, I am OK to merge it for this stable tag.
> >
>
> Thanks
>
> Gerd,
>
> Could you run this through the CI please? I am getting errors.
>
> https://github.com/tianocore/edk2/pull/4382
Actually, it seems to be a trivial uncrustify fix - i'll just fix that
up locally.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [edk2-devel] 回复: [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub
2023-05-10 12:43 ` Ard Biesheuvel
@ 2023-05-10 15:07 ` Ard Biesheuvel
0 siblings, 0 replies; 10+ messages in thread
From: Ard Biesheuvel @ 2023-05-10 15:07 UTC (permalink / raw)
To: devel, gaoliming
Cc: Gerd Hoffmann, Jordan Justen, Stefan Berger, Tom Lendacky,
Jiewen Yao, Anthony Perard, Marc-André Lureau,
Ard Biesheuvel, Erdem Aktas, Oliver Steffen, Min Xu,
James Bottomley, Julien Grall, Michael Roth, Pawel Polawski
On Wed, 10 May 2023 at 14:43, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Wed, 10 May 2023 at 14:33, Ard Biesheuvel <ardb@kernel.org> wrote:
> >
> > On Wed, 10 May 2023 at 09:41, gaoliming via groups.io
> > <gaoliming=byosoft.com.cn@groups.io> wrote:
> > >
> > > Ard:
> > > Seemly, this patch set passed code review before the soft feature freeze. So, I am OK to merge it for this stable tag.
> > >
> >
> > Thanks
> >
> > Gerd,
> >
> > Could you run this through the CI please? I am getting errors.
> >
> > https://github.com/tianocore/edk2/pull/4382
>
> Actually, it seems to be a trivial uncrustify fix - i'll just fix that
> up locally.
Merged. Thanks all.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-05-10 15:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-05 5:17 [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 1/4] OvmfPkg/PlatformBootManagerLib: add PcdBootRestrictToFirmware Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 2/4] OvmfPkg/NvVarsFileLib: disable in case PcdBootRestrictToFirmware is set Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 3/4] OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-05 5:17 ` [PATCH v2 4/4] OvmfPkg: drop PlatformBootManagerLibGrub Gerd Hoffmann
2023-05-10 7:12 ` [PATCH v2 0/4] OvmfPkg: remove PlatformBootManagerLibGrub Ard Biesheuvel
2023-05-10 7:41 ` 回复: " gaoliming
2023-05-10 12:33 ` [edk2-devel] " Ard Biesheuvel
2023-05-10 12:43 ` Ard Biesheuvel
2023-05-10 15:07 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox