On 05/18/17 17:14, Laszlo Ersek wrote:
> EmuVariableFvbRuntimeDxe now uses a 4KB (EFI_PAGE_SIZE) block size.
>
> Cc: Jordan Justen <jordan.l.jus...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Laszlo Ersek <ler...@redhat.com>
> Regression-tested-by: Gary Lin <g...@suse.com>
> ---
>
> Notes:
> v2:
> - no changes
> - add Gary's R-t-b
>
> OvmfPkg/PlatformPei/Platform.c | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
> index 1b4dc00b0180..3e9fda7c7ab0 100644
> --- a/OvmfPkg/PlatformPei/Platform.c
> +++ b/OvmfPkg/PlatformPei/Platform.c
> @@ -504,7 +504,6 @@ ReserveEmuVariableNvStore (
> {
> EFI_PHYSICAL_ADDRESS VariableStore;
> RETURN_STATUS PcdStatus;
> - UINT32 Alignment;
>
> //
> // Allocate storage for NV variables early on so it will be
> @@ -512,26 +511,15 @@ ReserveEmuVariableNvStore (
> // across reboots, this allows the NV variable storage to survive
> // a VM reboot.
> //
> - Alignment = PcdGet32 (PcdFlashNvStorageFtwSpareSize);
> - if ((Alignment & (Alignment - 1)) != 0) {
> - //
> - // Round up Alignment to the next power of two.
> - //
> - Alignment = GetPowerOfTwo32 (Alignment) << 1;
> - }
> -
> VariableStore =
> (EFI_PHYSICAL_ADDRESS)(UINTN)
> - AllocateAlignedRuntimePages (
> - EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)),
> - Alignment
> + AllocateRuntimePages (
> + EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))
> );
> DEBUG ((EFI_D_INFO,
> - "Reserved variable store memory: 0x%lX; size: %dkb, "
> - "alignment: 0x%x\n",
> + "Reserved variable store memory: 0x%lX; size: %dkb\n",
> VariableStore,
> - (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024,
> - Alignment
> + (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
> ));
> PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
> ASSERT_RETURN_ERROR (PcdStatus);
>
Commit c9e7907d09ea.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
