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

Retire TCG platform protocol, which will be replaced by PI Security Architecture protocol. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7848 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2009-03-10 07:57:15 +00:00
parent 351d6e7fcc
commit 4941d8817d
8 changed files with 2 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Core/Dxe/DxeMain.h
View File

@ -48,7 +48,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/Capsule.h>
#include <Protocol/BusSpecificDriverOverride.h>
#include <Protocol/TcgService.h>
#include <Protocol/TcgPlatform.h>
#include <Guid/MemoryTypeInformation.h>
#include <Guid/FirmwareFileSystem2.h>
#include <Guid/HobList.h>

1
MdeModulePkg/Core/Dxe/DxeMain.inf
View File

@ -130,7 +130,6 @@
gEfiDevicePathProtocolGuid ## CONSUMES
gEfiLoadedImageProtocolGuid ## PRODUCES
gEfiEbcProtocolGuid ## SOMETIMES_CONSUMES
gEfiTcgPlatformProtocolGuid ## CONSUMES
gEfiLoadedImageDevicePathProtocolGuid ## PRODUCES
[FixedPcd.common]

33
MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
View File

@ -621,37 +621,12 @@ CoreExitBootServices (
)
{
EFI_STATUS Status;
EFI_STATUS StatusTemp;
EFI_TCG_PLATFORM_PROTOCOL *TcgPlatformProtocol;
//
// Measure invocation of ExitBootServices,
// which is defined by TCG_EFI_Platform_1_20_Final Specification
//
TcgPlatformProtocol = NULL;
Status = CoreLocateProtocol (
&gEfiTcgPlatformProtocolGuid,
NULL,
(VOID **) &TcgPlatformProtocol
);
if (!EFI_ERROR (Status)) {
Status = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_INVOCATION);
ASSERT_EFI_ERROR (Status);
}
//
// Terminate memory services if the MapKey matches
//
Status = CoreTerminateMemoryMap (MapKey);
if (EFI_ERROR (Status)) {
//
// Measure failure of ExitBootServices
//
if (TcgPlatformProtocol != NULL) {
StatusTemp = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_FAILED);
ASSERT_EFI_ERROR (StatusTemp);
}
return Status;
}
@ -705,14 +680,6 @@ CoreExitBootServices (
//
gRuntime->AtRuntime = TRUE;
//
// Measure success of ExitBootServices
//
if (TcgPlatformProtocol != NULL) {
StatusTemp = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_SUCCEEDED);
ASSERT_EFI_ERROR (StatusTemp);
}
return Status;
}

24
MdeModulePkg/Core/Dxe/Image/Image.c
View File

@ -191,7 +191,6 @@ CoreLoadPeImage (
BOOLEAN DstBufAlocated;
UINTN Size;
UINTN LinkTimeBase;
EFI_TCG_PLATFORM_PROTOCOL *TcgPlatformProtocol;
IMAGE_FILE_HANDLE *FHandle;
FHandle = NULL;
@ -344,29 +343,6 @@ CoreLoadPeImage (
}
}
//
// Measure the image before applying fixup
//
Status = CoreLocateProtocol (
&gEfiTcgPlatformProtocolGuid,
NULL,
(VOID **) &TcgPlatformProtocol
);
if (!EFI_ERROR (Status)) {
FHandle = (IMAGE_FILE_HANDLE *) Image->ImageContext.Handle;
Status = TcgPlatformProtocol->MeasurePeImage (
BootPolicy,
(EFI_PHYSICAL_ADDRESS) (UINTN) FHandle->Source,
FHandle->SourceSize,
LinkTimeBase,
Image->ImageContext.ImageType,
Image->Info.DeviceHandle,
Image->Info.FilePath
);
ASSERT_EFI_ERROR (Status);
}
//
// Relocate the image in memory
//

79
MdeModulePkg/Include/Protocol/TcgPlatform.h
View File

@ -1,79 +0,0 @@
/** @file
Tcg addtional services to measure PeImage and ActionString
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 _TCG_PLATFORM_PROTOCOL_H_
#define _TCG_PLATFORM_PROTOCOL_H_
#define EFI_TCG_PLATFORM_PROTOCOL_GUID \
{ 0x8c4c9a41, 0xbf56, 0x4627, { 0x9e, 0xa, 0xc8, 0x38, 0x6d, 0x66, 0x11, 0x5c } }
typedef struct tdEFI_TCG_PLATFORM_PROTOCOL EFI_TCG_PLATFORM_PROTOCOL;
//
// EFI TCG Platform Protocol
//
/**
Measure PE/COFF Image File prior to the application of any fix-ups or relocations.
@param BootPolicy If TRUE, indicates that the request originates from the boot manager,
and that the boot manager is attempting to load FilePath as a boot selection.
@param ImageAddress The memory address to PE/COFF image.
@param ImageSize The size of PE/COFF image.
@param LinkTimeBase The image base address in the original PeImage.
@param ImageType The subsystem type of the PeImage.
@param DeviceHandle The handle to device matched the file path.
@param FilePath The specific file path from which the image is loaded.
@retval EFI_SUCCESS Measure successfully.
@retval EFI_UNSUPPORTED The loaded PeImage is not supported.
@retval EFI_OUT_OF_RESOURCES The resource of memory is not enough.
**/
typedef
EFI_STATUS
(EFIAPI *EFI_TCG_MEASURE_PE_IMAGE)(
IN BOOLEAN BootPolicy,
IN EFI_PHYSICAL_ADDRESS ImageAddress,
IN UINTN ImageSize,
IN UINTN LinkTimeBase,
IN UINT16 ImageType,
IN EFI_HANDLE DeviceHandle,
IN EFI_DEVICE_PATH_PROTOCOL *FilePath
);
/**
Measure efi action string.
@param ActionString Pointer to action string.
@retval EFI_SUCCESS Measure action string successfully.
**/
typedef
EFI_STATUS
(EFIAPI *EFI_TCG_MEASURE_ACTION)(
IN CHAR8 *ActionString
);
struct tdEFI_TCG_PLATFORM_PROTOCOL {
EFI_TCG_MEASURE_PE_IMAGE MeasurePeImage;
EFI_TCG_MEASURE_ACTION MeasureAction;
};
extern EFI_GUID gEfiTcgPlatformProtocolGuid;
#endif

4
MdeModulePkg/MdeModulePkg.dec
View File

@ -178,10 +178,6 @@
## Include/Protocol/Dpc.h
gEfiDpcProtocolGuid = {0x480f8ae9, 0xc46, 0x4aa9, { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}
## Tcg addtional services to measure PeImage and ActionString.
## Include/Protocol/TcgPlatform.h
gEfiTcgPlatformProtocolGuid = { 0x8c4c9a41, 0xbf56, 0x4627, { 0x9e, 0xa, 0xc8, 0x38, 0x6d, 0x66, 0x11, 0x5c }}
## Fault Tolerant Write protocol provides boot-time service to do fault tolerant write capability for block devices.
# Include/Protocol/FaultTolerantWrite.h
gEfiFaultTolerantWriteProtocolGuid = { 0x3EBD9E82, 0x2C78, 0x4DE6, { 0x97, 0x86, 0x8D, 0x4B, 0xFC, 0xB7, 0xC8, 0x81 }}

1
MdeModulePkg/MdeModulePkg.dsc
View File

@ -75,7 +75,6 @@
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
PlatformDriverOverrideLib|MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf
OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
BaseMemoryTestLib|MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf

4
MdeModulePkg/Universal/PCD/Pei/Pcd.inf
View File

@ -54,10 +54,10 @@
gEfiPeiReadOnlyVariable2PpiGuid ## CONSUMES
gPcdPpiGuid ## PRODUCES
[FeaturePcd.common]
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable
[FixedPcd.common]
[FixedPcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable