X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FTcg%2FTcg2Smm%2FTpm.asl;h=cf0642e10457e510642be55e4fa77c7a5b1b29b0;hp=776f43e972f91154365f88031df892a82c411c6a;hb=bf3b7aae7100b60ff8a387f0b7604dbb6ff29fc9;hpb=d967d6d96fc18d7a53d32223f5813b12cda19e8d

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
index 776f43e972..cf0642e104 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
@@ -2,7 +2,8 @@
   The TPM2 definition block in ACPI table for TCG2 physical presence  
   and MemoryClear.
 
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
+(c)Copyright 2016 HP Development Company, L.P.<BR>
 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 
@@ -29,8 +30,14 @@ DefinitionBlock (
       //
       // TCG2
       //
-      Name (_HID, "MSFT0101")
-      
+
+      //
+      //  TAG for patching TPM2.0 _HID
+      //
+      Name (_HID, "NNNN0000")
+
+      Name (_CID, "MSFT0101")
+
       //
       // Readable name of this device, don't know if this way is correct yet
       //
@@ -40,7 +47,7 @@ DefinitionBlock (
       // Return the resource consumed by TPM device
       //
       Name (_CRS, ResourceTemplate () {
-        Memory32Fixed (ReadOnly, 0xfed40000, 0x5000)
+        Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
       })
 
       //
@@ -78,7 +85,8 @@ DefinitionBlock (
         MCIN,   8,  //   Software SMI for Memory Clear Interface
         MCIP,   32, //   Used for save the Mor paramter
         MORD,   32, //   Memory Overwrite Request Data
-        MRET,   32  //   Memory Overwrite function return code
+        MRET,   32, //   Memory Overwrite function return code
+        UCRQ,   32  //   Phyical Presence request operation to Get User Confirmation Status 
       }
 
       Method (PTS, 1, Serialized)
@@ -187,7 +195,7 @@ DefinitionBlock (
             //
             // a) Get Physical Presence Interface Version
             //
-            Return ("1.3")
+            Return ("$PV")
           }
           Case (2)
           {
@@ -196,6 +204,7 @@ DefinitionBlock (
             //
                   
             Store (DerefOf (Index (Arg2, 0x00)), PPRQ)
+            Store (0, PPRM)
             Store (0x02, PPIP)
               
             //
@@ -273,7 +282,7 @@ DefinitionBlock (
             // e) Get User Confirmation Status for Operation
             //
             Store (8, PPIP)
-            Store (DerefOf (Index (Arg2, 0x00)), PPRQ)
+            Store (DerefOf (Index (Arg2, 0x00)), UCRQ)
                   
             //
             // Triggle the SMI interrupt