From be38c01da2dd949e0a6f8bceeb88d2e19c8c65f7 Mon Sep 17 00:00:00 2001
From: Mike Maslenkin <mike.maslenkin@gmail.com>
Date: Fri, 28 Jul 2023 16:34:34 +0300
Subject: OvmfPkg: refine TdTcg2Dxe

This patch removes unused references to ResetNotification code.
ACPI table generation refined by removing excessive CopyMem() call.

Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com>
---
 OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c   | 5 +----
 OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c b/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
index 5241f60..0a23bff 100644
--- a/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
+++ b/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
@@ -23,7 +23,6 @@
 #include <Protocol/VariableWrite.h>
 #include <Protocol/Tcg2Protocol.h>
 #include <Protocol/TrEEProtocol.h>
-#include <Protocol/ResetNotification.h>
 #include <Protocol/AcpiTable.h>
 
 #include <Library/DebugLib.h>
@@ -2355,7 +2354,6 @@ InstallAcpiTable (
   UINTN                    TableKey;
   EFI_STATUS               Status;
   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable;
-  UINT64                   OemTableId;
 
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)&AcpiTable);
   if (EFI_ERROR (Status)) {
@@ -2366,8 +2364,7 @@ InstallAcpiTable (
   mTdxEventlogAcpiTemplate.Laml = (UINT64)PcdGet32 (PcdCcEventlogAcpiTableLaml);
   mTdxEventlogAcpiTemplate.Lasa = PcdGet64 (PcdCcEventlogAcpiTableLasa);
   CopyMem (mTdxEventlogAcpiTemplate.Header.OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (mTdxEventlogAcpiTemplate.Header.OemId));
-  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
-  CopyMem (&mTdxEventlogAcpiTemplate.Header.OemTableId, &OemTableId, sizeof (UINT64));
+  mTdxEventlogAcpiTemplate.Header.OemTableId      = PcdGet64 (PcdAcpiDefaultOemTableId);
   mTdxEventlogAcpiTemplate.Header.OemRevision     = PcdGet32 (PcdAcpiDefaultOemRevision);
   mTdxEventlogAcpiTemplate.Header.CreatorId       = PcdGet32 (PcdAcpiDefaultCreatorId);
   mTdxEventlogAcpiTemplate.Header.CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);
diff --git a/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf b/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
index 6861a14..0f86c12 100644
--- a/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
+++ b/OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
@@ -73,7 +73,6 @@
   gEfiCcMeasurementProtocolGuid                      ## PRODUCES
   gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES
   gEfiVariableWriteArchProtocolGuid                  ## NOTIFY
-  gEfiResetNotificationProtocolGuid                  ## CONSUMES
   gEfiAcpiTableProtocolGuid                          ## NOTIFY
 
 [Pcd]
-- 
cgit v1.1