Date
1 - 4 of 4
[PATCH v1 3/6] TGC2ACPI: Uninstall the TPM2 ACPI if present
|
Subash Lakkimsetti
From: Subash Lakkimsetti <subash.lakkimsetti@...>
Bootloader supports multiple payload and TPM2 ACPI tables are updated at bootloader phase. When UEFI is used payload these will be duplicates. The tables are to be uninstalled before updating the TCG2ACPI tables to avoid duplicates. Cc: Qi Zhang <qi1.zhang@...> Cc: Rahul Kumar <rahul1.kumar@...> Signed-off-by: Subash Lakkimsetti <subash.lakkimsetti@...> --- SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c | 251 ++++++++++++++++++++++++++ SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf | 3 + 2 files changed, 254 insertions(+) diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c b/SecurityPkg/Tcg/Tcg2Acpi= /Tcg2Acpi.c index e8822cbeb0..4b35796ba7 100644 --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c @@ -39,6 +39,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Library/Tpm2CommandLib.h>=0D #include <Library/UefiLib.h>=0D #include <Library/MmUnblockMemoryLib.h>=0D +#include <IndustryStandard/Acpi.h>=0D +#include <Protocol/AcpiSystemDescriptionTable.h>=0D =0D //=0D // Physical Presence Interface Version supported by Platform=0D @@ -867,6 +869,245 @@ PublishTpm2 ( return Status;=0D }=0D =0D +/**=0D + Uninstall TPM2 SSDT ACPI table=0D +=0D + This performs uninstallation of TPM2 SSDT tables published by=0D + bootloaders.=0D +=0D + @retval EFI_SUCCESS The TPM2 ACPI table is uninstalled successfull= y if found.=0D + @retval Others Operation error.=0D +=0D +**/=0D +EFI_STATUS=0D +UnInstallTpm2SSDTAcpiTables (=0D + )=0D +{=0D + UINTN TableIndex;=0D + UINTN TableKey;=0D + EFI_ACPI_TABLE_VERSION TableVersion;=0D + VOID *TableHeader;=0D + EFI_STATUS Status;=0D + EFI_ACPI_SDT_PROTOCOL *mAcpiSdtProtocol;=0D + EFI_ACPI_TABLE_PROTOCOL *mAcpiTableProtocol;=0D + CHAR8 TableIdString[8];=0D + UINT64 TableIdSignature;=0D +=0D + //=0D + // Determine whether there is a TPM2 SSDT already in the ACPI table.=0D + //=0D + Status =3D EFI_SUCCESS;=0D + TableIndex =3D 0;=0D + TableKey =3D 0;=0D + TableHeader =3D NULL;=0D + mAcpiTableProtocol =3D NULL;=0D + mAcpiSdtProtocol =3D NULL;=0D +=0D + //=0D + // Locate the EFI_ACPI_TABLE_PROTOCOL.=0D + //=0D + Status =3D gBS->LocateProtocol (=0D + &gEfiAcpiTableProtocolGuid,=0D + NULL,=0D + (VOID **)&mAcpiTableProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "UnInstallTpm2SSDTAcpiTables: Cannot locate the EFI ACPI Table Proto= col \n "=0D + ));=0D + return Status;=0D + }=0D +=0D + //=0D + // Locate the EFI_ACPI_SDT_PROTOCOL.=0D + //=0D + Status =3D gBS->LocateProtocol (=0D + &gEfiAcpiSdtProtocolGuid,=0D + NULL,=0D + (VOID **)&mAcpiSdtProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "UnInstallTpm2SSDTAcpiTables: Cannot locate the EFI ACPI Sdt Protoco= l, "=0D + "\n"=0D + ));=0D + return Status;=0D + }=0D +=0D + while (!EFI_ERROR (Status)) {=0D + Status =3D mAcpiSdtProtocol->GetAcpiTable (=0D + TableIndex,=0D + (EFI_ACPI_SDT_HEADER **)&TableHeader,=0D + &TableVersion,=0D + &TableKey=0D + );=0D +=0D + if (!EFI_ERROR (Status)) {=0D + TableIndex++;=0D +=0D + if (((EFI_ACPI_SDT_HEADER *)TableHeader)->Signature =3D=3D SIGNATURE= _32 ('S', 'S', 'D', 'T')) {=0D + CopyMem ((VOID *)TableIdString, (VOID *)((EFI_ACPI_SDT_HEADER *)Ta= bleHeader)->OemTableId, sizeof (TableIdString));=0D +=0D + TableIdSignature =3D SIGNATURE_64 (=0D + TableIdString[0],=0D + TableIdString[1],=0D + TableIdString[2],=0D + TableIdString[3],=0D + TableIdString[4],=0D + TableIdString[5],=0D + TableIdString[6],=0D + TableIdString[7]=0D + );=0D +=0D + if (TableIdSignature =3D=3D SIGNATURE_64 ('T', 'p', 'm', '2', 'T',= 'a', 'b', 'l')) {=0D + DEBUG ((DEBUG_INFO, "Found Tpm2 SSDT Table for Physical Presence= \n"));=0D + break;=0D + }=0D + }=0D + }=0D + }=0D +=0D + if (!EFI_ERROR (Status)) {=0D + //=0D + // A TPM2 SSDT is already in the ACPI table.=0D + //=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "A TPM2 SSDT is already exist in the ACPI Table.\n"=0D + ));=0D +=0D + //=0D + // Uninstall the origin TPM2 SSDT from the ACPI table.=0D + //=0D + Status =3D mAcpiTableProtocol->UninstallAcpiTable (=0D + mAcpiTableProtocol,=0D + TableKey=0D + );=0D + ASSERT_EFI_ERROR (Status);=0D +=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((DEBUG_INFO, "UnInstall Tpm2SSDTAcpiTables failed \n "));=0D +=0D + return Status;=0D + }=0D + }=0D +=0D + return EFI_SUCCESS;=0D +}=0D +=0D +/**=0D + Uninstall TPM2 table=0D +=0D + This performs uninstallation of TPM2 tables published by=0D + bootloaders.=0D +=0D + @retval EFI_SUCCESS The TPM2 table is uninstalled successfully if = its found.=0D + @retval Others Operation error.=0D +=0D +**/=0D +EFI_STATUS=0D +UnInstallTpm2Tables (=0D + )=0D +{=0D + UINTN TableIndex;=0D + UINTN TableKey;=0D + EFI_ACPI_TABLE_VERSION TableVersion;=0D + VOID *TableHeader;=0D + EFI_STATUS Status;=0D + EFI_ACPI_SDT_PROTOCOL *mAcpiSdtProtocol;=0D + EFI_ACPI_TABLE_PROTOCOL *mAcpiTableProtocol;=0D +=0D + //=0D + // Determine whether there is a TPM2 SSDT already in the ACPI table.=0D + //=0D + Status =3D EFI_SUCCESS;=0D + TableIndex =3D 0;=0D + TableKey =3D 0;=0D + TableHeader =3D NULL;=0D + mAcpiTableProtocol =3D NULL;=0D + mAcpiSdtProtocol =3D NULL;=0D +=0D + //=0D + // Locate the EFI_ACPI_TABLE_PROTOCOL.=0D + //=0D + Status =3D gBS->LocateProtocol (=0D + &gEfiAcpiTableProtocolGuid,=0D + NULL,=0D + (VOID **)&mAcpiTableProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "UnInstallTpm2Tables: Cannot locate the EFI ACPI Table Protocol \n "= =0D + ));=0D + return Status;=0D + }=0D +=0D + //=0D + // Locate the EFI_ACPI_SDT_PROTOCOL.=0D + //=0D + Status =3D gBS->LocateProtocol (=0D + &gEfiAcpiSdtProtocolGuid,=0D + NULL,=0D + (VOID **)&mAcpiSdtProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "UnInstallTpm2Tables: Cannot locate the EFI ACPI Sdt Protocol, "=0D + "\n"=0D + ));=0D + return Status;=0D + }=0D +=0D + while (!EFI_ERROR (Status)) {=0D + Status =3D mAcpiSdtProtocol->GetAcpiTable (=0D + TableIndex,=0D + (EFI_ACPI_SDT_HEADER **)&TableHeader,=0D + &TableVersion,=0D + &TableKey=0D + );=0D +=0D + if (!EFI_ERROR (Status)) {=0D + TableIndex++;=0D +=0D + if (((EFI_ACPI_SDT_HEADER *)TableHeader)->Signature =3D=3D EFI_ACPI_= 5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE ) {=0D + DEBUG ((DEBUG_INFO, "Found Tpm2 Table ..\n"));=0D + break;=0D + }=0D + }=0D + }=0D +=0D + if (!EFI_ERROR (Status)) {=0D + //=0D + // A TPM2 SSDT is already in the ACPI table.=0D + //=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "A TPM2 table is already exist in the ACPI Table.\n"=0D + ));=0D +=0D + //=0D + // Uninstall the origin TPM2 SSDT from the ACPI table.=0D + //=0D + Status =3D mAcpiTableProtocol->UninstallAcpiTable (=0D + mAcpiTableProtocol,=0D + TableKey=0D + );=0D + ASSERT_EFI_ERROR (Status);=0D +=0D + if (EFI_ERROR (Status)) {=0D + DEBUG ((DEBUG_INFO, "UnInstall Tpm2Tables failed \n "));=0D +=0D + return Status;=0D + }=0D + }=0D +=0D + return EFI_SUCCESS;=0D +}=0D +=0D /**=0D The driver's entry point.=0D =0D @@ -894,6 +1135,16 @@ InitializeTcgAcpi ( return EFI_UNSUPPORTED;=0D }=0D =0D + //=0D + // Bootloader might pulish the TPM2 ACPT tables=0D + // Uninstall TPM tables if it exists=0D + //=0D + Status =3D UnInstallTpm2SSDTAcpiTables ();=0D + ASSERT_EFI_ERROR (Status);=0D +=0D + Status =3D UnInstallTpm2Tables ();=0D + ASSERT_EFI_ERROR (Status);=0D +=0D Status =3D PublishAcpiTable ();=0D ASSERT_EFI_ERROR (Status);=0D =0D diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf b/SecurityPkg/Tcg/Tcg2Ac= pi/Tcg2Acpi.inf index f1c6ae5b1c..7e639b0522 100644 --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf @@ -63,10 +63,13 @@ gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCE= S ## GUID # TPM device identifier=0D gTpmNvsMmGuid ## CONSUME= S=0D gEdkiiPiSmmCommunicationRegionTableGuid ## CONSUME= S=0D + gEfiAcpiTableGuid=0D =0D [Protocols]=0D gEfiAcpiTableProtocolGuid ## CONSUME= S=0D gEfiMmCommunicationProtocolGuid ## CONSUME= S=0D + gEfiAcpiSdtProtocolGuid ## CONSUMES=0D +=0D =0D [FixedPcd]=0D gEfiSecurityPkgTokenSpaceGuid.PcdSmiCommandIoPort ## CONSUME= S=0D --=20 2.39.1.windows.1 |
|
|
|
Yao, Jiewen
Question: Why not uninstall it in the universal payload package? or even not populate it?
toggle quoted message
Show quoted text
-----Original Message----- |
|
|
|
Subash Lakkimsetti
Hi Jiewen,
toggle quoted message
Show quoted text
Bootloaders as SBL, coreboot supports multiple payloads and they would have TPM acpi tables populated at bootloader phase. These tables gets populated in bootloaders well before the payload gets loaded. Its population cannot be avoided due to generic implementations. Uninstallation from universal payload package need a separate module to handle this. It is dependent on gEfiAcpiTableProtocolGuid & gEfiAcpiSdtProtocolGuid which are populated from AcpiTableDxe. We might need add a dependency in TCG2ACPI on this module. Otherwise TPM2tables published from TCG2ACPI can be installed as per the dispatch order. In order to adapt the TCG drivers for UEFI payload, TCG2ACPI has to updated to support payload. We can either follow one of the methods, * Uninstall the TPM2 ACPI tables if they get published from bootloader phase. The current patch address it. * Another method, Modify the ACPI tables updated from bootloader as per the EDK2 requirements. This also has to be done in TCG2ACPI. Regards, Subash -----Original Message-----
From: Yao, Jiewen <jiewen.yao@...> Sent: Wednesday, March 22, 2023 6:43 AM To: devel@edk2.groups.io; Lakkimsetti, Subash <subash.lakkimsetti@...> Cc: Zhang, Qi1 <qi1.zhang@...>; Kumar, Rahul R <rahul.r.kumar@...> Subject: RE: [edk2-devel] [PATCH v1 3/6] TGC2ACPI: Uninstall the TPM2 ACPI if present Question: Why not uninstall it in the universal payload package? or even not populate it? -----Original Message----- |
|
|
|
Yao, Jiewen
If there are two drivers to produce same resource, it should be a platform policy decision for which one takes precedent.
toggle quoted message
Show quoted text
Maybe a platform wants to say: The ACPI is there, I want to skip myself, instead of override. I feel uncomfortable to include such policy in TCG2 ACPI driver, to enforce the policy to override. My suggestion is to keep SecurityPkg as is. Yes, coreboot and slimboot will populate ACPI table. But it does not mean UniversalPayloadPkg must install them. I still believe that work should be done in UniversalPayloadPkg. -----Original Message----- |
|
|