X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FTcg%2FTcgSmm%2FTpm.asl;h=448ffecccfd862d32140ec2b81a584efca7591d4;hp=000fc661a981e1c699dddea49e748aa8b60268fb;hb=8b7d84ca533ef7f3a794884dc738221bf1d1799e;hpb=0c18794ea4289f03fefc7117b56740414cc0536c

diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
index 000fc661a9..448ffecccf 100644
--- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
+++ b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
@@ -2,7 +2,7 @@
   The TPM definition block in ACPI table for physical presence  
   and MemoryClear.
 
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<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 
@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 DefinitionBlock (
   "Tpm.aml",
   "SSDT",
-  1,
-  "Intel_",
+  2,
+  "INTEL ",
   "TcgTable",
   0x1000
   )
@@ -64,9 +64,9 @@ DefinitionBlock (
 
       //
       // Operational region for TPM support, TPM Physical Presence and TPM Memory Clear
-      // Region Offset to be fixed at runtime
+      // Region Offset 0xFFFF0000 and Length 0xF0 will be fixed in C code.
       //
-      OperationRegion (TNVS, SystemMemory, 0xFFFF0000, 0x1E)
+      OperationRegion (TNVS, SystemMemory, 0xFFFF0000, 0xF0)
       Field (TNVS, AnyAcc, NoLock, Preserve)
       {
         PPIN,   8,  //   Software SMI for Physical Presence Interface
@@ -77,7 +77,8 @@ DefinitionBlock (
         FRET,   32, //   Physical Presence function return code
         MCIN,   8,  //   Software SMI for Memory Clear Interface
         MCIP,   32, //   Used for save the Mor paramter
-        MORD,   32  //   Memory Overwrite Request Data
+        MORD,   32, //   Memory Overwrite Request Data
+        MRET,   32  //   Memory Overwrite function return code
       }
 
       Method (PTS, 1, Serialized)
@@ -118,7 +119,7 @@ DefinitionBlock (
       //
       // TCG Hardware Information
       //
-      Method (HINF, 3, Serialized, 0, {BuffObj, PkgObj}, {IntObj, IntObj, PkgObj})
+      Method (HINF, 3, Serialized, 0, {BuffObj, PkgObj}, {UnknownObj, UnknownObj, UnknownObj}) // IntObj, IntObj, PkgObj
       {
         //
         // Switch by function index
@@ -137,7 +138,7 @@ DefinitionBlock (
             //
             // Return failure if no TPM present
             //
-            Name(TPMV, Package () {0x01, Package () {ToBCD (1), ToBCD (20)}})
+            Name(TPMV, Package () {0x01, Package () {0x1, 0x20}})
             if (LEqual (_STA (), 0x00))
             {
               Return (Package () {0x00})
@@ -167,7 +168,7 @@ DefinitionBlock (
       //
       // TCG Physical Presence Interface
       //
-      Method (TPPI, 3, Serialized, 0, {BuffObj, PkgObj, IntObj, StrObj}, {IntObj, IntObj, PkgObj})
+      Method (TPPI, 3, Serialized, 0, {BuffObj, PkgObj, IntObj, StrObj}, {UnknownObj, UnknownObj, UnknownObj}) // IntObj, IntObj, PkgObj
       {        
         //
         // Switch by function index
@@ -283,7 +284,7 @@ DefinitionBlock (
         Return (1)
       }
 
-      Method (TMCI, 3, Serialized, 0, IntObj, {IntObj, IntObj, PkgObj})
+      Method (TMCI, 3, Serialized, 0, IntObj, {UnknownObj, UnknownObj, UnknownObj}) // IntObj, IntObj, PkgObj
       {
         //
         // Switch by function index
@@ -313,7 +314,7 @@ DefinitionBlock (
             // Triggle the SMI interrupt
             //
             Store (MCIN, IOB2)
-            Return (0)
+            Return (MRET)
           }
           Default {BreakPoint}
         }