On 11/14/23 21:22, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kuba...@microsoft.com>
>
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
> Cc: Corvin Köhne <corv...@freebsd.org>
> Cc: Gerd Hoffmann <kra...@redhat.com>
> Cc: Jiewen Yao <jiewen....@intel.com>
> Cc: Rebecca Cran <rebe...@bsdio.com>
> Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com>
> ---
> OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 4
> ++--
> OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c | 24
> ++++++++++----------
> OvmfPkg/PlatformPei/MemTypeInfo.c | 2
> +-
> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 6
> ++---
> 4 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> index 4fc715dc3681..c07e38966e36 100644
> --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> @@ -658,8 +658,8 @@ InitializeFvAndVariableStoreHeaders (
>
> // UINT32 Size;
> (
> - FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> - OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> + FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> + OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> ),
>
> // UINT8 Format;
> diff --git
> a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> index 3092a174bc51..0b3888194444 100644
> --- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> +++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> @@ -49,12 +49,12 @@ STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof
> (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> -
> EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // SpecificFlag
> @@ -83,12 +83,12 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR
> mMmio64Configuration = {
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mOptionRomConfiguration = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof
> (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> -
> EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // Disable option roms
> SpecificFlag
> diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c
> b/OvmfPkg/PlatformPei/MemTypeInfo.c
> index ea049b21cfc0..dfb1bc37a93d 100644
> --- a/OvmfPkg/PlatformPei/MemTypeInfo.c
> +++ b/OvmfPkg/PlatformPei/MemTypeInfo.c
> @@ -196,7 +196,7 @@ OnReadOnlyVariable2Available (
> //
> STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mReadOnlyVariable2Notify = {
> (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH |
> - EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> + EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> &gEfiPeiReadOnlyVariable2PpiGuid, // Guid
> OnReadOnlyVariable2Available // Notify
> };
> diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> index ea5ce837119a..e38f03cae046 100644
> --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> @@ -75,9 +75,9 @@ EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = {
> {
> {
> (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> - FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> + FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> + FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> + FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> }
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111264): https://edk2.groups.io/g/devel/message/111264
Mute This Topic: https://groups.io/mt/102591693/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
