\r
Internal generic functions to operate flash block.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
return EFI_ABORTED;\r
}\r
//\r
- // Write memory buffer currenet spare block. Still top block.\r
+ // Write memory buffer to current spare block. Still top block.\r
//\r
Ptr = Buffer;\r
for (Index = 0; Index < FtwDevice->NumberOfSpareBlock; Index += 1) {\r
if (Buffer == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
+ WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;\r
+\r
//\r
// To guarantee that the WorkingBlockValid is set on spare block\r
//\r
//\r
FtwUpdateFvState (\r
FtwDevice->FtwBackupFvb,\r
- FtwDevice->FtwWorkSpaceLba,\r
+ FtwDevice->FtwSpareLba + WorkSpaceLbaOffset,\r
FtwDevice->FtwWorkSpaceBase + sizeof (EFI_GUID) + sizeof (UINT32),\r
WORKING_BLOCK_VALID\r
);\r
//\r
// Clear the CRC and STATE, copy data from spare to working block.\r
//\r
- WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;\r
WorkingBlockHeader = (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *) (Buffer + (UINTN) WorkSpaceLbaOffset * FtwDevice->BlockSize + FtwDevice->FtwWorkSpaceBase);\r
InitWorkSpaceHeader (WorkingBlockHeader);\r
WorkingBlockHeader->WorkingBlockValid = FTW_ERASE_POLARITY;\r
//\r
// If Offset exceed the FTW work space boudary, return error.\r
//\r
- if (Offset > FtwWorkSpaceSize) {\r
+ if (Offset >= FtwWorkSpaceSize) {\r
*FtwWriteHeader = FtwHeader;\r
return EFI_ABORTED;\r
}\r
EFI_FAULT_TOLERANT_WRITE_HEADER *FtwHeader;\r
UINTN Offset;\r
EFI_HANDLE FvbHandle;\r
+ EFI_LBA WorkSpaceLbaOffset;\r
\r
//\r
// Find the right SMM Fvb protocol instance for FTW.\r
FtwDevice->FtwLastWriteHeader = NULL;\r
FtwDevice->FtwLastWriteRecord = NULL;\r
\r
+ InitializeLocalWorkSpaceHeader ();\r
+\r
//\r
// Refresh the working space data from working block\r
//\r
//\r
// Read from spare block\r
//\r
+ WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;\r
Length = FtwDevice->FtwWorkSpaceSize;\r
Status = FtwDevice->FtwBackupFvb->Read (\r
FtwDevice->FtwBackupFvb,\r
- FtwDevice->FtwSpareLba,\r
+ FtwDevice->FtwSpareLba + WorkSpaceLbaOffset,\r
FtwDevice->FtwWorkSpaceBase,\r
&Length,\r
FtwDevice->FtwWorkSpace\r