MdeModulePkg: Variable: Re-prioritize TCG/TCG2 protocol

TPM1.2 is obsoleted by TPM2.0. switch TCG/TCG2 protocol check to apply this
trend

Cc: Long, Qin <qin.long@intel.com>
Cc: Yao, Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
index c26616ecfe769a76263e70a2459fc1f786354f48..28aa2893c6f864bfbeffa162422ef2bba3ae1b65 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
@@ -4,7 +4,7 @@
   This module initilizes MemoryOverwriteRequestControlLock variable.\r
   This module adds Variable Hook and check MemoryOverwriteRequestControlLock.\r
 \r
   This module initilizes MemoryOverwriteRequestControlLock variable.\r
   This module adds Variable Hook and check MemoryOverwriteRequestControlLock.\r
 \r

-Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -459,14 +459,14 @@ MorLockInitAtEndOfDxe (
     // MOR implementation depends on (one of) those protocols.\r
     //\r
     TcgStatus = gBS->LocateProtocol (\r
     // MOR implementation depends on (one of) those protocols.\r
     //\r
     TcgStatus = gBS->LocateProtocol (\r

-                       &gEfiTcgProtocolGuid,\r
-                       NULL,                 // Registration\r
+                       &gEfiTcg2ProtocolGuid,\r
+                       NULL,                     // Registration\r

                        &TcgInterface\r
                        );\r
     if (EFI_ERROR (TcgStatus)) {\r
       TcgStatus = gBS->LocateProtocol (\r
                        &TcgInterface\r
                        );\r
     if (EFI_ERROR (TcgStatus)) {\r
       TcgStatus = gBS->LocateProtocol (\r

-                         &gEfiTcg2ProtocolGuid,\r
-                         NULL,                  // Registration\r
+                         &gEfiTcgProtocolGuid,\r
+                         NULL,                   // Registration\r

                          &TcgInterface\r
                          );\r
     }\r
                          &TcgInterface\r
                          );\r
     }\r