Index: root/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.asl
===================================================================
--- root.orig/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.asl
+++ root/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.asl
@@ -513,7 +513,15 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, 
                         IO (Decode16, 0x0378, 0x0378, 0x08, 0x08)
                         IRQNoFlags () {7}
                     })
-                } 
+                }
+
+                Device (TPM) {
+                    Name (_HID, EisaId ("PNP0C31"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        Memory32Fixed (ReadWrite, 0xFED40000, 0x5000,)
+                    })
+                }
             }
         }
     }
Index: root/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.c
===================================================================
--- root.orig/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.c
+++ root/xen-unstable.hg/tools/firmware/acpi/acpi_dsdt.c
@@ -1,22 +1,22 @@
 /*
  * 
  * Intel ACPI Component Architecture
- * ASL Optimizing Compiler / AML Disassembler version 20050513 [Oct 12 2006]
- * Copyright (C) 2000 - 2005 Intel Corporation
- * Supports ACPI Specification Revision 3.0
+ * ASL Optimizing Compiler version 20060707 [Sep 11 2006]
+ * Copyright (C) 2000 - 2006 Intel Corporation
+ * Supports ACPI Specification Revision 3.0a
  * 
- * Compilation of "acpi_dsdt.asl" - Thu Oct 12 14:08:49 2006
+ * Compilation of "acpi_dsdt.asl" - Thu Oct 12 13:02:24 2006
  * 
  * C source code output
  *
  */
-unsigned char AmlCode[] = 
+unsigned char AmlCode[] =
 {
-    0x44,0x53,0x44,0x54,0xDA,0x08,0x00,0x00,  /* 00000000    "DSDT...." */
-    0x01,0x26,0x49,0x4E,0x54,0x45,0x4C,0x00,  /* 00000008    ".&INTEL." */
+    0x44,0x53,0x44,0x54,0x02,0x09,0x00,0x00,  /* 00000000    "DSDT...." */
+    0x01,0x5A,0x49,0x4E,0x54,0x45,0x4C,0x00,  /* 00000008    ".ZINTEL." */
     0x69,0x6E,0x74,0x2D,0x78,0x65,0x6E,0x00,  /* 00000010    "int-xen." */
     0xD6,0x07,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x13,0x05,0x05,0x20,0x08,0x50,0x4D,0x42,  /* 00000020    "... .PMB" */
+    0x07,0x07,0x06,0x20,0x08,0x50,0x4D,0x42,  /* 00000020    "... .PMB" */
     0x53,0x0B,0x00,0x0C,0x08,0x50,0x4D,0x4C,  /* 00000028    "S....PML" */
     0x4E,0x0A,0x08,0x08,0x49,0x4F,0x42,0x31,  /* 00000030    "N...IOB1" */
     0x00,0x08,0x49,0x4F,0x4C,0x31,0x00,0x08,  /* 00000038    "..IOL1.." */
@@ -34,7 +34,7 @@ unsigned char AmlCode[] = 
     0x12,0x08,0x04,0x0A,0x07,0x0A,0x07,0x00,  /* 00000098    "........" */
     0x00,0x08,0x50,0x49,0x43,0x44,0x00,0x14,  /* 000000A0    "..PICD.." */
     0x0C,0x5F,0x50,0x49,0x43,0x01,0x70,0x68,  /* 000000A8    "._PIC.ph" */
-    0x50,0x49,0x43,0x44,0x10,0x45,0x82,0x5F,  /* 000000B0    "PICD.E._" */
+    0x50,0x49,0x43,0x44,0x10,0x4D,0x84,0x5F,  /* 000000B0    "PICD.M._" */
     0x53,0x42,0x5F,0x5B,0x82,0x49,0x04,0x4D,  /* 000000B8    "SB_[.I.M" */
     0x45,0x4D,0x30,0x08,0x5F,0x48,0x49,0x44,  /* 000000C0    "EM0._HID" */
     0x0C,0x41,0xD0,0x0C,0x02,0x08,0x5F,0x43,  /* 000000C8    ".A...._C" */
@@ -45,7 +45,7 @@ unsigned char AmlCode[] = 
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000F0    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x00,  /* 000000F8    "........" */
     0x00,0x00,0x00,0x00,0x79,0x00,0x5B,0x82,  /* 00000100    "....y.[." */
-    0x42,0x7D,0x50,0x43,0x49,0x30,0x08,0x5F,  /* 00000108    "B}PCI0._" */
+    0x4A,0x7F,0x50,0x43,0x49,0x30,0x08,0x5F,  /* 00000108    "J.PCI0._" */
     0x48,0x49,0x44,0x0C,0x41,0xD0,0x0A,0x03,  /* 00000110    "HID.A..." */
     0x08,0x5F,0x55,0x49,0x44,0x00,0x08,0x5F,  /* 00000118    "._UID.._" */
     0x41,0x44,0x52,0x00,0x08,0x5F,0x42,0x42,  /* 00000120    "ADR.._BB" */
@@ -196,7 +196,7 @@ unsigned char AmlCode[] = 
     0x12,0x0B,0x04,0x0C,0xFF,0xFF,0x03,0x00,  /* 000005A8    "........" */
     0x00,0x00,0x0A,0x0A,0x12,0x0B,0x04,0x0C,  /* 000005B0    "........" */
     0xFF,0xFF,0x04,0x00,0x00,0x00,0x0A,0x0B,  /* 000005B8    "........" */
-    0x5B,0x82,0x48,0x31,0x49,0x53,0x41,0x5F,  /* 000005C0    "[.H1ISA_" */
+    0x5B,0x82,0x40,0x34,0x49,0x53,0x41,0x5F,  /* 000005C0    "[.@4ISA_" */
     0x08,0x5F,0x41,0x44,0x52,0x00,0x5B,0x80,  /* 000005C8    "._ADR.[." */
     0x50,0x49,0x52,0x51,0x02,0x0A,0x60,0x0A,  /* 000005D0    "PIRQ..`." */
     0x04,0x10,0x2E,0x5C,0x00,0x5B,0x81,0x29,  /* 000005D8    "...\.[.)" */
@@ -295,6 +295,11 @@ unsigned char AmlCode[] = 
     0x00,0xA4,0x0A,0x0F,0x08,0x5F,0x43,0x52,  /* 000008C0    "....._CR" */
     0x53,0x11,0x10,0x0A,0x0D,0x47,0x01,0x78,  /* 000008C8    "S....G.x" */
     0x03,0x78,0x03,0x08,0x08,0x22,0x80,0x00,  /* 000008D0    ".x...".." */
+    0x79,0x00,0x5B,0x82,0x26,0x54,0x50,0x4D,  /* 000008D8    "y.[.&TPM" */
+    0x5F,0x08,0x5F,0x48,0x49,0x44,0x0C,0x41,  /* 000008E0    "_._HID.A" */
+    0xD0,0x0C,0x31,0x08,0x5F,0x43,0x52,0x53,  /* 000008E8    "..1._CRS" */
+    0x11,0x11,0x0A,0x0E,0x86,0x09,0x00,0x01,  /* 000008F0    "........" */
+    0x00,0x00,0xD4,0xFE,0x00,0x50,0x00,0x00,  /* 000008F8    ".....P.." */
     0x79,0x00,
 };
 int DsdtLen=sizeof(AmlCode);