tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retire gEfiAlternateFvBlockGuid. All platform FvbRuntimeDxe drivers will not produce such protocol to signify itself support writable FVB protocol. 

FaultTolerantWrite driver and variable driver will register notification event to locate right protocol.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7865 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
eric_tian 2009-03-12 05:10:53 +00:00
parent f3fb74cdac
commit 933676058b
14 changed files with 322 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DuetPkg/FvbRuntimeService/DUETFwh.inf
View File

@ -51,7 +51,6 @@
[Guids] [Guids]
gEfiFlashMapHobGuid gEfiFlashMapHobGuid
gEfiHobListGuid gEfiHobListGuid
gEfiAlternateFvBlockGuid
[Protocols] [Protocols]
gEfiSimpleFileSystemProtocolGuid gEfiSimpleFileSystemProtocolGuid

11
DuetPkg/FvbRuntimeService/FWBlockService.c
View File

@ -1632,17 +1632,6 @@ Returns:
// //
ASSERT (FALSE); ASSERT (FALSE);
} }
//
// Install FVB Extension Protocol on the same handle
//
Status = gBS->InstallMultipleProtocolInterfaces (
&FwbHandle,
&gEfiAlternateFvBlockGuid,
NULL,
NULL
);
ASSERT_EFI_ERROR (Status);
FwhInstance = (EFI_FW_VOL_INSTANCE *) FwhInstance = (EFI_FW_VOL_INSTANCE *)
( (

2
DuetPkg/FvbRuntimeService/FwBlockService.h
View File

@ -31,7 +31,6 @@ Abstract:
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>
#include <Guid/FirmwareFileSystem2.h> #include <Guid/FirmwareFileSystem2.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Guid/AlternateFvBlock.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
#include <Protocol/SimpleFileSystem.h> #include <Protocol/SimpleFileSystem.h>
#include <Protocol/BlockIo.h> #include <Protocol/BlockIo.h>
@ -39,7 +38,6 @@ Abstract:
#include <Guid/SystemNvDataGuid.h> #include <Guid/SystemNvDataGuid.h>
#include <Guid/FlashMapHob.h> #include <Guid/FlashMapHob.h>
#include <Guid/HobList.h> #include <Guid/HobList.h>
#include <Guid/AlternateFvBlock.h>
// //
// The Library classes this module consumes // The Library classes this module consumes

28
MdeModulePkg/Include/Guid/AlternateFvBlock.h
View File

@ -1,28 +0,0 @@
/** @file
This file defines the Alternate Firmware Volume Block Guid, which is
used to specify that the full funcationality FVB protocol is installed
that support read, write and erase capability for block devices.
Copyright (c) 2006 - 2008, 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
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef __ALT_FVB_GUID_H__
#define __ALT_FVB_GUID_H__
#define EFI_ALTERNATE_FV_BLOCK_GUID \
{ \
0xf496922d, 0x172f, 0x4bbc, {0xa1, 0xeb, 0xe, 0xeb, 0x94, 0x9c, 0x34, 0x86 } \
}
extern EFI_GUID gEfiAlternateFvBlockGuid;
#endif

14
MdeModulePkg/MdeModulePkg.dec
View File

@ -30,15 +30,15 @@
[LibraryClasses.common] [LibraryClasses.common]
## @libraryclass IpIo layer upon EFI IP4 Protocol. ## @libraryclass IpIo layer upon EFI IP4 Protocol.
# Ihis library is only intended to be used by UEFI network stack modules. # This library is only intended to be used by UEFI network stack modules.
IpIoLib|Include/Library/IpIoLib.h IpIoLib|Include/Library/IpIoLib.h
## @libraryclass Basic function for UEFI network stack. ## @libraryclass Basic function for UEFI network stack.
# Ihis library is only intended to be used by UEFI network stack modules. # This library is only intended to be used by UEFI network stack modules.
NetLib|Include/Library/NetLib.h NetLib|Include/Library/NetLib.h
## @libraryclass The helper routines to access UDP service. ## @libraryclass The helper routines to access UDP service.
# Ihis library is only intended to be used by UEFI network stack modules. # This library is only intended to be used by UEFI network stack modules.
UdpIoLib|Include/Library/UdpIoLib.h UdpIoLib|Include/Library/UdpIoLib.h
## @libraryclass Defines a set of methods to reset whole system. ## @libraryclass Defines a set of methods to reset whole system.
@ -51,7 +51,7 @@
RecoveryLib|Include/Library/RecoveryLib.h RecoveryLib|Include/Library/RecoveryLib.h
## @libraryclass Basic platform driver override functions. ## @libraryclass Basic platform driver override functions.
# Ihis library is only intended to be used by Platform Driver Override Dxe Driver and Application. # This library is only intended to be used by Platform Driver Override Dxe Driver and Application.
PlatformDriverOverrideLib|Include/Library/PlatformDriverOverrideLib.h PlatformDriverOverrideLib|Include/Library/PlatformDriverOverrideLib.h
## @libraryclass Provides HII related functions. ## @libraryclass Provides HII related functions.
@ -101,11 +101,6 @@
## Include/Guid/SystemNvDataGuid.h ## Include/Guid/SystemNvDataGuid.h
gEfiSystemNvDataFvGuid = { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }} gEfiSystemNvDataFvGuid = { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}
## Alternate Firmware Volume Block Guid specify that the additional
# FVB protocol is installed into FVB handle
## Include/Guid/AlternateFvBlock.h
gEfiAlternateFvBlockGuid = { 0xF496922D, 0x172F, 0x4BBC, { 0xA1, 0xEB, 0x0E, 0xEB, 0x94, 0x9C, 0x34, 0x86 }}
## Guid specify the device is the console out device. ## Guid specify the device is the console out device.
## Include/Guid/ConsoleOutDevice.h ## Include/Guid/ConsoleOutDevice.h
gEfiConsoleOutDeviceGuid = { 0xD3B36F2C, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiConsoleOutDeviceGuid = { 0xD3B36F2C, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
@ -126,7 +121,6 @@
## Include/Guid/StandardErrorDevice.h ## Include/Guid/StandardErrorDevice.h
gEfiStandardErrorDeviceGuid = { 0xD3B36F2D, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiStandardErrorDeviceGuid = { 0xD3B36F2D, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
## Guid acted as variable store header's signature and to specify the variable list entries put in the EFI system table. ## Guid acted as variable store header's signature and to specify the variable list entries put in the EFI system table.
## Include/Guid/VariableFormat.h ## Include/Guid/VariableFormat.h
gEfiVariableGuid = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }} gEfiVariableGuid = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}

272
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
View File

@ -53,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "FaultTolerantWrite.h" #include "FaultTolerantWrite.h"
EFI_EVENT mFvbRegistration = NULL;
// //
// Fault Tolerant Write Protocol API // Fault Tolerant Write Protocol API
@ -862,72 +863,35 @@ FtwGetLastWrite (
return Status; return Status;
} }
/** VOID
This function is the entry point of the Fault Tolerant Write driver.
@param ImageHandle A handle for the image that is initializing this driver
@param SystemTable A pointer to the EFI system table
@return EFI_SUCCESS FTW has finished the initialization
@retval EFI_NOT_FOUND Locate FVB protocol error
@retval EFI_OUT_OF_RESOURCES Allocate memory error
@retval EFI_VOLUME_CORRUPTED Firmware volume is error
@retval EFI_ABORTED FTW initialization error
**/
EFI_STATUS
EFIAPI EFIAPI
InitializeFaultTolerantWrite ( FvbNotificationEvent (
IN EFI_HANDLE ImageHandle, IN EFI_EVENT Event,
IN EFI_SYSTEM_TABLE *SystemTable IN VOID *Context
) )
{ {
EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_STATUS Status;
UINTN Index;
EFI_HANDLE *HandleBuffer; EFI_HANDLE *HandleBuffer;
UINTN HandleCount; UINTN HandleCount;
UINTN Index;
EFI_PHYSICAL_ADDRESS FvbBaseAddress;
EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb;
EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader;
EFI_PHYSICAL_ADDRESS BaseAddress; EFI_FVB_ATTRIBUTES_2 Attributes;
EFI_FTW_DEVICE *FtwDevice; EFI_FTW_DEVICE *FtwDevice;
EFI_FAULT_TOLERANT_WRITE_HEADER *FtwHeader;
UINTN Length;
EFI_STATUS Status;
UINTN Offset;
EFI_FV_BLOCK_MAP_ENTRY *FvbMapEntry; EFI_FV_BLOCK_MAP_ENTRY *FvbMapEntry;
UINT32 LbaIndex; UINT32 LbaIndex;
UINTN Length;
EFI_FAULT_TOLERANT_WRITE_HEADER *FtwHeader;
UINTN Offset;
EFI_HANDLE FvbHandle; EFI_HANDLE FvbHandle;
// FtwDevice = (EFI_FTW_DEVICE *)Context;
// Allocate Private data of this driver,
// INCLUDING THE FtwWorkSpace[FTW_WORK_SPACE_SIZE].
//
FvbHandle = NULL; FvbHandle = NULL;
FtwDevice = NULL; Fvb = NULL;
FtwDevice = AllocatePool (sizeof (EFI_FTW_DEVICE) + PcdGet32 (PcdFlashNvStorageFtwWorkingSize));
if (FtwDevice == NULL) {
return EFI_OUT_OF_RESOURCES;
}
ZeroMem (FtwDevice, sizeof (EFI_FTW_DEVICE));
FtwDevice->Signature = FTW_DEVICE_SIGNATURE;
// //
// Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE. // Locate all handles of Fvb protocol
//
FtwDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);
FtwDevice->WorkSpaceLength = (UINTN) PcdGet32 (PcdFlashNvStorageFtwWorkingSize);
FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);
FtwDevice->SpareAreaLength = (UINTN) PcdGet32 (PcdFlashNvStorageFtwSpareSize);
if ((FtwDevice->WorkSpaceLength == 0) || (FtwDevice->SpareAreaLength == 0)) {
DEBUG ((EFI_D_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));
FreePool (FtwDevice);
return EFI_OUT_OF_RESOURCES;
}
//
// Locate FVB protocol by handle
// //
Status = gBS->LocateHandleBuffer ( Status = gBS->LocateHandleBuffer (
ByProtocol, ByProtocol,
@ -937,20 +901,12 @@ InitializeFaultTolerantWrite (
&HandleBuffer &HandleBuffer
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (FtwDevice); return;
return EFI_NOT_FOUND;
} }
if (HandleCount <= 0) { //
FreePool (FtwDevice); // Get the FVB to access variable store
return EFI_NOT_FOUND; //
}
Fvb = NULL;
FtwDevice->FtwFvBlock = NULL;
FtwDevice->FtwBackupFvb = NULL;
FtwDevice->FtwWorkSpaceLba = (EFI_LBA) (-1);
FtwDevice->FtwSpareLba = (EFI_LBA) (-1);
for (Index = 0; Index < HandleCount; Index += 1) { for (Index = 0; Index < HandleCount; Index += 1) {
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
HandleBuffer[Index], HandleBuffer[Index],
@ -958,19 +914,28 @@ InitializeFaultTolerantWrite (
(VOID **) &Fvb (VOID **) &Fvb
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (FtwDevice); Status = EFI_NOT_FOUND;
return Status; break;
} }
Status = Fvb->GetPhysicalAddress (Fvb, &BaseAddress); //
// Ensure this FVB protocol supported Write operation.
//
Status = Fvb->GetAttributes (Fvb, &Attributes);
if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) {
continue;
}
//
// Compare the address and select the right one
//
Status = Fvb->GetPhysicalAddress (Fvb, &FvbBaseAddress);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
continue; continue;
} }
FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) BaseAddress); FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvbBaseAddress);
if ((FtwDevice->FtwFvBlock == NULL) && (FtwDevice->WorkSpaceAddress >= FvbBaseAddress) &&
if ((FtwDevice->WorkSpaceAddress >= BaseAddress) && ((FtwDevice->WorkSpaceAddress + FtwDevice->WorkSpaceLength) <= (FvbBaseAddress + FwVolHeader->FvLength))
((FtwDevice->WorkSpaceAddress + FtwDevice->WorkSpaceLength) <= (BaseAddress + FwVolHeader->FvLength))
) { ) {
FtwDevice->FtwFvBlock = Fvb; FtwDevice->FtwFvBlock = Fvb;
// //
@ -982,22 +947,22 @@ InitializeFaultTolerantWrite (
// //
FvbMapEntry = &FwVolHeader->BlockMap[0]; FvbMapEntry = &FwVolHeader->BlockMap[0];
for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) { for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) {
if ((FtwDevice->WorkSpaceAddress >= (BaseAddress + FvbMapEntry->Length * (LbaIndex - 1))) if ((FtwDevice->WorkSpaceAddress >= (FvbBaseAddress + FvbMapEntry->Length * (LbaIndex - 1)))
&& (FtwDevice->WorkSpaceAddress < (BaseAddress + FvbMapEntry->Length * LbaIndex))) { && (FtwDevice->WorkSpaceAddress < (FvbBaseAddress + FvbMapEntry->Length * LbaIndex))) {
FtwDevice->FtwWorkSpaceLba = LbaIndex - 1; FtwDevice->FtwWorkSpaceLba = LbaIndex - 1;
// //
// Get the Work space size and Base(Offset) // Get the Work space size and Base(Offset)
// //
FtwDevice->FtwWorkSpaceSize = FtwDevice->WorkSpaceLength; FtwDevice->FtwWorkSpaceSize = FtwDevice->WorkSpaceLength;
FtwDevice->FtwWorkSpaceBase = (UINTN) (FtwDevice->WorkSpaceAddress - (BaseAddress + FvbMapEntry->Length * (LbaIndex - 1))); FtwDevice->FtwWorkSpaceBase = (UINTN) (FtwDevice->WorkSpaceAddress - (FvbBaseAddress + FvbMapEntry->Length * (LbaIndex - 1)));
break; break;
} }
} }
} }
} }
if ((FtwDevice->SpareAreaAddress >= BaseAddress) && if ((FtwDevice->FtwBackupFvb == NULL) && (FtwDevice->SpareAreaAddress >= FvbBaseAddress) &&
((FtwDevice->SpareAreaAddress + FtwDevice->SpareAreaLength) <= (BaseAddress + FwVolHeader->FvLength)) ((FtwDevice->SpareAreaAddress + FtwDevice->SpareAreaLength) <= (FvbBaseAddress + FwVolHeader->FvLength))
) { ) {
FtwDevice->FtwBackupFvb = Fvb; FtwDevice->FtwBackupFvb = Fvb;
// //
@ -1009,8 +974,8 @@ InitializeFaultTolerantWrite (
// //
FvbMapEntry = &FwVolHeader->BlockMap[0]; FvbMapEntry = &FwVolHeader->BlockMap[0];
for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) { for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) {
if ((FtwDevice->SpareAreaAddress >= (BaseAddress + FvbMapEntry->Length * (LbaIndex - 1))) if ((FtwDevice->SpareAreaAddress >= (FvbBaseAddress + FvbMapEntry->Length * (LbaIndex - 1)))
&& (FtwDevice->SpareAreaAddress < (BaseAddress + FvbMapEntry->Length * LbaIndex))) { && (FtwDevice->SpareAreaAddress < (FvbBaseAddress + FvbMapEntry->Length * LbaIndex))) {
// //
// Get the NumberOfSpareBlock and BlockSize // Get the NumberOfSpareBlock and BlockSize
// //
@ -1022,8 +987,8 @@ InitializeFaultTolerantWrite (
// //
if ((FtwDevice->FtwSpareLba + FtwDevice->NumberOfSpareBlock) > FvbMapEntry->NumBlocks) { if ((FtwDevice->FtwSpareLba + FtwDevice->NumberOfSpareBlock) > FvbMapEntry->NumBlocks) {
DEBUG ((EFI_D_ERROR, "Ftw: Spare area is out of FV range\n")); DEBUG ((EFI_D_ERROR, "Ftw: Spare area is out of FV range\n"));
FreePool (FtwDevice); ASSERT (FALSE);
return EFI_ABORTED; return;
} }
break; break;
} }
@ -1032,6 +997,12 @@ InitializeFaultTolerantWrite (
} }
} }
if ((FtwDevice->FtwBackupFvb == NULL) || (FtwDevice->FtwFvBlock == NULL) ||
(FtwDevice->FtwWorkSpaceLba == (EFI_LBA) (-1)) || (FtwDevice->FtwSpareLba == (EFI_LBA) (-1))) {
return;
}
DEBUG ((EFI_D_INFO, "Ftw: Working and spare FVB is ready\n"));
// //
// Calculate the start LBA of working block. Working block is an area which // Calculate the start LBA of working block. Working block is an area which
// contains working space in its last block and has the same size as spare // contains working space in its last block and has the same size as spare
@ -1039,21 +1010,8 @@ InitializeFaultTolerantWrite (
// working space. // working space.
// //
FtwDevice->FtwWorkBlockLba = FtwDevice->FtwWorkSpaceLba - FtwDevice->NumberOfSpareBlock + 1; FtwDevice->FtwWorkBlockLba = FtwDevice->FtwWorkSpaceLba - FtwDevice->NumberOfSpareBlock + 1;
if ((INT64) (FtwDevice->FtwWorkBlockLba) < 0) { ASSERT ((INT64) (FtwDevice->FtwWorkBlockLba) >= 0);
DEBUG ((EFI_D_ERROR, "Ftw: The spare block range is too large than the working block range!\n"));
FreePool (FtwDevice);
return EFI_ABORTED;
}
if ((FtwDevice->FtwFvBlock == NULL) ||
(FtwDevice->FtwBackupFvb == NULL) ||
(FtwDevice->FtwWorkSpaceLba == (EFI_LBA) (-1)) ||
(FtwDevice->FtwSpareLba == (EFI_LBA) (-1))
) {
DEBUG ((EFI_D_ERROR, "Ftw: Working or spare FVB not ready\n"));
FreePool (FtwDevice);
return EFI_ABORTED;
}
// //
// Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE. // Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE.
// //
@ -1067,9 +1025,7 @@ InitializeFaultTolerantWrite (
// Refresh the working space data from working block // Refresh the working space data from working block
// //
Status = WorkSpaceRefresh (FtwDevice); Status = WorkSpaceRefresh (FtwDevice);
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
// //
// If the working block workspace is not valid, try the spare block // If the working block workspace is not valid, try the spare block
// //
@ -1085,9 +1041,8 @@ InitializeFaultTolerantWrite (
&Length, &Length,
FtwDevice->FtwWorkSpace FtwDevice->FtwWorkSpace
); );
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
// //
// If spare block is valid, then replace working block content. // If spare block is valid, then replace working block content.
// //
@ -1099,9 +1054,7 @@ InitializeFaultTolerantWrite (
// Refresh work space. // Refresh work space.
// //
Status = WorkSpaceRefresh (FtwDevice); Status = WorkSpaceRefresh (FtwDevice);
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
} else { } else {
DEBUG ((EFI_D_ERROR, "Ftw: Both are invalid, init workspace\n")); DEBUG ((EFI_D_ERROR, "Ftw: Both are invalid, init workspace\n"));
// //
@ -1117,12 +1070,9 @@ InitializeFaultTolerantWrite (
// Initialize the work space // Initialize the work space
// //
Status = FtwReclaimWorkSpace (FtwDevice, FALSE); Status = FtwReclaimWorkSpace (FtwDevice, FALSE);
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
} }
} }
}
// //
// If the FtwDevice->FtwLastWriteRecord is 1st record of write header && // If the FtwDevice->FtwLastWriteRecord is 1st record of write header &&
// (! SpareComplete) THEN call Abort(). // (! SpareComplete) THEN call Abort().
@ -1155,15 +1105,11 @@ InitializeFaultTolerantWrite (
Offset += WRITE_TOTAL_SIZE (FtwHeader->NumberOfWrites, FtwHeader->PrivateDataSize); Offset += WRITE_TOTAL_SIZE (FtwHeader->NumberOfWrites, FtwHeader->PrivateDataSize);
} }
if (!IsErasedFlashBuffer ( if (!IsErasedFlashBuffer (FtwDevice->FtwWorkSpace + Offset, FtwDevice->FtwWorkSpaceSize - Offset)) {
FtwDevice->FtwWorkSpace + Offset,
FtwDevice->FtwWorkSpaceSize - Offset
)) {
Status = FtwReclaimWorkSpace (FtwDevice, TRUE); Status = FtwReclaimWorkSpace (FtwDevice, TRUE);
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
} }
// //
// Restart if it's boot block // Restart if it's boot block
// //
@ -1173,10 +1119,7 @@ InitializeFaultTolerantWrite (
if (FtwDevice->FtwLastWriteRecord->BootBlockUpdate == FTW_VALID_STATE) { if (FtwDevice->FtwLastWriteRecord->BootBlockUpdate == FTW_VALID_STATE) {
Status = FlushSpareBlockToBootBlock (FtwDevice); Status = FlushSpareBlockToBootBlock (FtwDevice);
DEBUG ((EFI_D_ERROR, "Ftw: Restart boot block update - %r\n", Status)); DEBUG ((EFI_D_ERROR, "Ftw: Restart boot block update - %r\n", Status));
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
FtwAbort (&FtwDevice->FtwInstance); FtwAbort (&FtwDevice->FtwInstance);
} else { } else {
// //
@ -1186,14 +1129,11 @@ InitializeFaultTolerantWrite (
if (FvbHandle != NULL) { if (FvbHandle != NULL) {
Status = FtwRestart (&FtwDevice->FtwInstance, FvbHandle); Status = FtwRestart (&FtwDevice->FtwInstance, FvbHandle);
DEBUG ((EFI_D_ERROR, "FtwLite: Restart last write - %r\n", Status)); DEBUG ((EFI_D_ERROR, "FtwLite: Restart last write - %r\n", Status));
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
goto Recovery;
}
} }
FtwAbort (&FtwDevice->FtwInstance); FtwAbort (&FtwDevice->FtwInstance);
} }
} }
// //
// Hook the protocol API // Hook the protocol API
// //
@ -1213,19 +1153,83 @@ InitializeFaultTolerantWrite (
EFI_NATIVE_INTERFACE, EFI_NATIVE_INTERFACE,
&FtwDevice->FtwInstance &FtwDevice->FtwInstance
); );
if (EFI_ERROR (Status)) {
goto Recovery; ASSERT_EFI_ERROR (Status);
//
// Close the notify event to avoid install FaultTolerantWriteProtocol again.
//
Status = gBS->CloseEvent (Event);
ASSERT_EFI_ERROR (Status);
return;
} }
/**
This function is the entry point of the Fault Tolerant Write driver.
@param ImageHandle A handle for the image that is initializing this driver
@param SystemTable A pointer to the EFI system table
@return EFI_SUCCESS FTW has finished the initialization
@retval EFI_NOT_FOUND Locate FVB protocol error
@retval EFI_OUT_OF_RESOURCES Allocate memory error
@retval EFI_VOLUME_CORRUPTED Firmware volume is error
@retval EFI_ABORTED FTW initialization error
**/
EFI_STATUS
EFIAPI
InitializeFaultTolerantWrite (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_FTW_DEVICE *FtwDevice;
//
// Allocate Private data of this driver,
// INCLUDING THE FtwWorkSpace[FTW_WORK_SPACE_SIZE].
//
FtwDevice = NULL;
FtwDevice = AllocateZeroPool (sizeof (EFI_FTW_DEVICE) + PcdGet32 (PcdFlashNvStorageFtwWorkingSize));
if (FtwDevice == NULL) {
return EFI_OUT_OF_RESOURCES;
}
ZeroMem (FtwDevice, sizeof (EFI_FTW_DEVICE));
FtwDevice->Signature = FTW_DEVICE_SIGNATURE;
//
// Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE.
//
FtwDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);
FtwDevice->WorkSpaceLength = (UINTN) PcdGet32 (PcdFlashNvStorageFtwWorkingSize);
FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);
FtwDevice->SpareAreaLength = (UINTN) PcdGet32 (PcdFlashNvStorageFtwSpareSize);
if ((FtwDevice->WorkSpaceLength == 0) || (FtwDevice->SpareAreaLength == 0)) {
DEBUG ((EFI_D_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));
FreePool (FtwDevice);
return EFI_OUT_OF_RESOURCES;
}
FtwDevice->FtwFvBlock = NULL;
FtwDevice->FtwBackupFvb = NULL;
FtwDevice->FtwWorkSpaceLba = (EFI_LBA) (-1);
FtwDevice->FtwSpareLba = (EFI_LBA) (-1);
//
// Register FvbNotificationEvent () notify function.
//
EfiCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeBlockProtocolGuid,
TPL_CALLBACK,
FvbNotificationEvent,
(VOID *)FtwDevice,
&mFvbRegistration
);
return EFI_SUCCESS; return EFI_SUCCESS;
Recovery:
if (FtwDevice != NULL) {
FreePool (FtwDevice);
}
DEBUG ((EFI_D_ERROR, "Ftw: Severe Error occurs, need to recovery\n"));
return EFI_VOLUME_CORRUPTED;
} }

1
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
View File

@ -26,6 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/UefiLib.h>
#include <Library/UefiDriverEntryPoint.h> #include <Library/UefiDriverEntryPoint.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>

3
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
View File

@ -44,6 +44,7 @@
BaseMemoryLib BaseMemoryLib
UefiDriverEntryPoint UefiDriverEntryPoint
DebugLib DebugLib
UefiLib
[Guids] [Guids]
gEfiSystemNvDataFvGuid ## CONSUMES ## FV Signature of Working Space Header gEfiSystemNvDataFvGuid ## CONSUMES ## FV Signature of Working Space Header
@ -63,5 +64,5 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
[Depex] [Depex]
gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid ## gEfiAlternateFvBlockGuid specifies FVB protocol with read, write/erase flash access. gEfiFirmwareVolumeBlockProtocolGuid

10
Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
View File

@ -29,7 +29,6 @@ Revision History
// //
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Guid/AlternateFvBlock.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
// //
// The Library classes this module consumes // The Library classes this module consumes
@ -1390,15 +1389,6 @@ Returns:
ASSERT (FALSE); ASSERT (FALSE);
} }
Status = gBS->InstallMultipleProtocolInterfaces (
&FwbHandle,
&gEfiAlternateFvBlockGuid,
NULL,
NULL
);
ASSERT_EFI_ERROR (Status);
FwhInstance = (EFI_FW_VOL_INSTANCE *) FwhInstance = (EFI_FW_VOL_INSTANCE *)
( (
(UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength + (UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength +

1
Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
View File

@ -32,7 +32,6 @@ Abstract:
#include <Guid/FirmwareFileSystem2.h> #include <Guid/FirmwareFileSystem2.h>
#include <Guid/SystemNvDataGuid.h> #include <Guid/SystemNvDataGuid.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Guid/AlternateFvBlock.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
// //
// The Library classes this module consumes // The Library classes this module consumes

1
Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
View File

@ -60,7 +60,6 @@
[Guids] [Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID
gEfiAlternateFvBlockGuid # ALWAYS_CONSUME
[Protocols] [Protocols]
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED

10
UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
View File

@ -22,7 +22,6 @@ Revision History
#include "PiDxe.h" #include "PiDxe.h"
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Guid/AlternateFvBlock.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
#include <Library/UefiLib.h> #include <Library/UefiLib.h>
@ -1355,15 +1354,6 @@ Returns:
ASSERT (FALSE); ASSERT (FALSE);
} }
Status = gBS->InstallMultipleProtocolInterfaces (
&FwbHandle,
&gEfiAlternateFvBlockGuid,
NULL,
NULL
);
ASSERT_EFI_ERROR (Status);
FwhInstance = (EFI_FW_VOL_INSTANCE *) FwhInstance = (EFI_FW_VOL_INSTANCE *)
( (
(UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength + (UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength +

1
UnixPkg/FvbServicesRuntimeDxe/FvbInfo.c
View File

@ -22,7 +22,6 @@ Abstract:
#include "PiDxe.h" #include "PiDxe.h"
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Guid/AlternateFvBlock.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
#include <Library/UefiLib.h> #include <Library/UefiLib.h>

2
UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
View File

@ -59,8 +59,6 @@
[Guids] [Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID
gEfiAlternateFvBlockGuid # ALWAYS_PRODUCED
[Protocols] [Protocols]
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED