[edk2-devel] [PATCH v3 2/8] OvmfPkg: Check for TPM 2 early to leave function early

[Stefan Berger]

TPM 1.2 and TPM 2 share QEMU's PPI memory/device and for the TPM 2 code
not to initilize over the TPM 1.2 initilization, leave the init function
early without touching that memory.

Cc: Gerd Hoffmann <kra...@redhat.com>
Cc: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Stefan Berger <stef...@linux.ibm.com>
---
 .../DxeTcg2PhysicalPresenceLib.c              | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git 
a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c 
b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
index 33a470f6d8..f46a047235 100644
--- a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
+++ b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
@@ -94,7 +94,6 @@ QemuTpmInitPPI (
   QEMU_FWCFG_TPM_CONFIG           Config;

   EFI_PHYSICAL_ADDRESS            PpiAddress64;

   EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;

-  UINTN                           Idx;

 

   if (mPpi != NULL) {

     return EFI_SUCCESS;

@@ -105,6 +104,11 @@ QemuTpmInitPPI (
     return Status;

   }

 

+  if (Config.TpmVersion != QEMU_TPM_VERSION_2) {

+    DEBUG ((DEBUG_ERROR, "[TPM2PP] Not setting up PPI. This is not a TPM 
2.\n"));

+    return EFI_PROTOCOL_ERROR;

+  }

+

   mPpi = (QEMU_TPM_PPI *)(UINTN)Config.PpiAddress;

   if (mPpi == NULL) {

     return EFI_PROTOCOL_ERROR;

@@ -131,21 +135,18 @@ QemuTpmInitPPI (
     goto InvalidPpiAddress;

   }

 

-  for (Idx = 0; Idx < ARRAY_SIZE (mPpi->Func); Idx++) {

-    mPpi->Func[Idx] = 0;

-  }

-  if (Config.TpmVersion == QEMU_TPM_VERSION_2) {

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_NO_ACTION] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CLEAR] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CHANGE_EPS] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID] = TPM_PPI_FLAGS;

-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID] = TPM_PPI_FLAGS;

-  }

+  ZeroMem ((void *)mPpi->Func, sizeof(mPpi->Func));

+

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_NO_ACTION] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_CLEAR] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_CHANGE_EPS] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID] = TPM_PPI_FLAGS;

+  mPpi->Func[TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID] = TPM_PPI_FLAGS;

 

   if (mPpi->In == 0) {

     mPpi->In = 1;

@@ -833,10 +834,11 @@ Tcg2PhysicalPresenceLibProcessRequest (
 

   Status = QemuTpmInitPPI ();

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_INFO, "[TPM2PP] no PPI\n"));

     return ;

   }

 

+  DEBUG ((DEBUG_INFO, "[TPM2PP] Detected a TPM 2\n"));

+

   //

   // Check S4 resume

   //

-- 
2.31.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84231): https://edk2.groups.io/g/devel/message/84231
Mute This Topic: https://groups.io/mt/87436459/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-