From c30f1e09745c64bb8b4b7bb3ae4cb032b3603ce6 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 3 Jul 2013 09:26:49 +0000 Subject: OvmfPkg EmuVariableFvbRuntimeDxe: Let FaultTolerantWriteDxe to init working block header. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Jordan Justen Reviewed-by: Ruiyu Ni git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14458 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 51 +--------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) (limited to 'OvmfPkg/EmuVariableFvbRuntimeDxe') diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c index 72efba0910..c7c3fcb36f 100644 --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c @@ -2,7 +2,7 @@ Firmware Block Services to support emulating non-volatile variables by pretending that a memory buffer is storage for the NV variables. - Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -781,52 +781,6 @@ InitializeFvAndVariableStoreHeaders ( Fv->Checksum = CalculateCheckSum16 (Ptr, Fv->HeaderLength); } - -/** - Initializes the Fault Tolerant Write data structure - - This data structure is used by the Fault Tolerant Write driver. - - @param[in] Buffer - Location for the FTW data structure - -**/ -VOID -InitializeFtwState ( - IN VOID *Buffer - ) -{ - EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *Hdr; - UINT32 TempCrc; - STATIC EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER DefaultFtw = { - EFI_SYSTEM_NV_DATA_FV_GUID, // EFI_GUID Signature; - ERASED_UINT32, // UINT32 Crc; - ERASED_BIT, // UINT8 WorkingBlockValid : 1; - ERASED_BIT, // UINT8 WorkingBlockInvalid : 1; - 0, // UINT8 Reserved : 6; - { 0, 0, 0 }, // UINT8 Reserved3[3]; - FTW_WRITE_QUEUE_SIZE // UINT64 WriteQueueSize; - }; - - CopyMem (Buffer, (VOID*) &DefaultFtw, sizeof (DefaultFtw)); - - Hdr = (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER*) Buffer; - - // - // Calculate checksum. - // - // The Crc, WorkingBlockValid and WorkingBlockInvalid bits should - // be set to the erased state before computing the checksum. - // - gBS->CalculateCrc32 (Buffer, sizeof (DefaultFtw), &TempCrc); - Hdr->Crc = TempCrc; - - // - // Mark as valid. - // - Hdr->WorkingBlockValid = NOT_ERASED_BIT; -} - - /** Main entry point. @@ -908,9 +862,6 @@ FvbInitialize ( // Initialize the Fault Tolerant Write data area // SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize)); - if (Initialize) { - InitializeFtwState (SubPtr); - } PcdSet32 (PcdFlashNvStorageFtwWorkingBase, (UINT32)(UINTN) SubPtr); // -- cgit v1.2.3