sb,soc/intel,mb: Drop leftover comments and TODOs in ASL

Change-Id: I74f943e9b616458a16aa13c29706cf1551fcbbb2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70366
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

26 files changed, 0 insertions, 408 deletions

diff --git a/src/mainboard/apple/macbook21/acpi/platform.asl b/src/mainboard/apple/macbook21/acpi/platform.asl
index e1e33a2b3b..23356f18b9 100644
--- a/src/mainboard/apple/macbook21/acpi/platform.asl
+++ b/src/mainboard/apple/macbook21/acpi/platform.asl
@@ -4,23 +4,6 @@
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
 
@@ -33,16 +16,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/getac/p470/acpi/platform.asl b/src/mainboard/getac/p470/acpi/platform.asl
index b9835d1f87..2a2412e33d 100644
--- a/src/mainboard/getac/p470/acpi/platform.asl
+++ b/src/mainboard/getac/p470/acpi/platform.asl
@@ -122,9 +122,6 @@ Scope(\_SB)
 			TRAP(0x3d)
 		}
 
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43)
-
 		/* OS Init */
 		TRAP(0x32)
 	}
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi/platform.asl b/src/mainboard/gigabyte/ga-945gcm-s2l/acpi/platform.asl
index cf73fc1d6a..bbee0a2787 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi/platform.asl
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/acpi/platform.asl
@@ -6,30 +6,11 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
diff --git a/src/mainboard/ibase/mb899/acpi/platform.asl b/src/mainboard/ibase/mb899/acpi/platform.asl
index cf73fc1d6a..bbee0a2787 100644
--- a/src/mainboard/ibase/mb899/acpi/platform.asl
+++ b/src/mainboard/ibase/mb899/acpi/platform.asl
@@ -6,30 +6,11 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
diff --git a/src/mainboard/intel/d945gclf/acpi/platform.asl b/src/mainboard/intel/d945gclf/acpi/platform.asl
index cf73fc1d6a..bbee0a2787 100644
--- a/src/mainboard/intel/d945gclf/acpi/platform.asl
+++ b/src/mainboard/intel/d945gclf/acpi/platform.asl
@@ -6,30 +6,11 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
diff --git a/src/mainboard/kontron/986lcd-m/acpi/platform.asl b/src/mainboard/kontron/986lcd-m/acpi/platform.asl
index cf73fc1d6a..bbee0a2787 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/platform.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/platform.asl
@@ -6,30 +6,11 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
diff --git a/src/mainboard/lenovo/t400/acpi/platform.asl b/src/mainboard/lenovo/t400/acpi/platform.asl
index 3d2805d19f..08ea6aef2b 100644
--- a/src/mainboard/lenovo/t400/acpi/platform.asl
+++ b/src/mainboard/lenovo/t400/acpi/platform.asl
@@ -6,8 +6,6 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 	\_SB.PCI0.LPCB.EC.MUTE(1)
 	\_SB.PCI0.LPCB.EC.USBP(0)
 	\_SB.PCI0.LPCB.EC.RADI(0)
@@ -20,26 +18,6 @@ Method(_WAK,1)
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (LEqual(Arg0, 3)) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (LEqual(Arg0, 4)) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
-	// TODO: Return Arg0 as second value if S-Arg0 was entered
-	// before.
-
 	Return(Package(){0,0})
 }
 
@@ -52,16 +30,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/lenovo/t60/acpi/platform.asl b/src/mainboard/lenovo/t60/acpi/platform.asl
index 50da033b2d..08ea6aef2b 100644
--- a/src/mainboard/lenovo/t60/acpi/platform.asl
+++ b/src/mainboard/lenovo/t60/acpi/platform.asl
@@ -18,23 +18,6 @@ Method(_WAK,1)
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
 
@@ -47,16 +30,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/lenovo/x200/acpi/platform.asl b/src/mainboard/lenovo/x200/acpi/platform.asl
index aa29248704..08ea6aef2b 100644
--- a/src/mainboard/lenovo/x200/acpi/platform.asl
+++ b/src/mainboard/lenovo/x200/acpi/platform.asl
@@ -6,8 +6,6 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 	\_SB.PCI0.LPCB.EC.MUTE(1)
 	\_SB.PCI0.LPCB.EC.USBP(0)
 	\_SB.PCI0.LPCB.EC.RADI(0)
@@ -20,26 +18,6 @@ Method(_WAK,1)
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
-	// TODO: Return Arg0 as second value if S-Arg0 was entered
-	// before.
-
 	Return(Package(){0,0})
 }
 
@@ -52,16 +30,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index 44b06c6a05..f17adafc88 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -35,13 +35,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		/* TRAP(71) */ /* TODO */
-
 		/* Determine the Operating System and save the value in OSYS.
 		 * We have to do this in order to be able to work around
 		 * certain windows bugs.
diff --git a/src/mainboard/lenovo/x60/acpi/platform.asl b/src/mainboard/lenovo/x60/acpi/platform.asl
index 50da033b2d..08ea6aef2b 100644
--- a/src/mainboard/lenovo/x60/acpi/platform.asl
+++ b/src/mainboard/lenovo/x60/acpi/platform.asl
@@ -18,23 +18,6 @@ Method(_WAK,1)
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
 
@@ -47,16 +30,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/ocp/deltalake/acpi/platform.asl b/src/mainboard/ocp/deltalake/acpi/platform.asl
index 5a15b29920..2b0775d37a 100644
--- a/src/mainboard/ocp/deltalake/acpi/platform.asl
+++ b/src/mainboard/ocp/deltalake/acpi/platform.asl
@@ -23,16 +23,6 @@ Field (APMP, ByteAcc, NoLock, Preserve)
 
 #include <arch/x86/acpi/post.asl>
 
-/* IO-Trap at 0x800.
- * This is the ACPI->SMI communication interface.
- */
-OperationRegion (IO_T, SystemIO, 0x800, 0x10)
-Field (IO_T, ByteAcc, NoLock, Preserve)
-{
-	Offset (0x8),
-	TRP0, 8		/* IO-Trap at 0x808 */
-}
-
 OperationRegion (PSYS, SystemMemory, 0x6D081000, 0x0400)
 Field (PSYS, ByteAcc, NoLock, Preserve)
 {
@@ -320,14 +310,6 @@ Field (PSYS, ByteAcc, NoLock, Preserve)
 	FKB7,   8
 }
 
-/* SMI I/O Trap */
-Method (TRAP, 1, Serialized)
-{
-	SMIF = Arg0	// SMI Function
-	TRP0 = 0	// Generate trap
-	Return (SMIF)	// Return value of SMI handler
-}
-
 /*
  * The _PTS method (Prepare To Sleep) is called before the OS is
  * entering a sleep state. The sleep state number is passed in Arg0
diff --git a/src/mainboard/ocp/tiogapass/acpi/platform.asl b/src/mainboard/ocp/tiogapass/acpi/platform.asl
index 782d2cd26f..1899de1a18 100644
--- a/src/mainboard/ocp/tiogapass/acpi/platform.asl
+++ b/src/mainboard/ocp/tiogapass/acpi/platform.asl
@@ -23,16 +23,6 @@ Field (APMP, ByteAcc, NoLock, Preserve)
 
 #include <arch/x86/acpi/post.asl>
 
-/* IO-Trap at 0x800.
- * This is the ACPI->SMI communication interface.
- */
-OperationRegion (IO_T, SystemIO, 0x800, 0x10)
-Field (IO_T, ByteAcc, NoLock, Preserve)
-{
-	Offset (0x8),
-	TRP0, 8		/* IO-Trap at 0x808 */
-}
-
 OperationRegion (PSYS, SystemMemory, 0x6D081000, 0x0400)
 Field (PSYS, ByteAcc, NoLock, Preserve)
 {
@@ -320,14 +310,6 @@ Field (PSYS, ByteAcc, NoLock, Preserve)
 	FKB7,   8
 }
 
-/* SMI I/O Trap */
-Method (TRAP, 1, Serialized)
-{
-	SMIF = Arg0	// SMI Function
-	TRP0 = 0	// Generate trap
-	Return (SMIF)	// Return value of SMI handler
-}
-
 /*
  * The _PTS method (Prepare To Sleep) is called before the OS is
  * entering a sleep state. The sleep state number is passed in Arg0
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 9ec8e6ef41..dbadb5f4d6 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -25,13 +25,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		/* TRAP(71) */ /* TODO  */
-
 		/* Determine the Operating System and save the value in OSYS.
 		 * We have to do this in order to be able to work around
 		 * certain windows bugs.
diff --git a/src/mainboard/roda/rk886ex/acpi/platform.asl b/src/mainboard/roda/rk886ex/acpi/platform.asl
index 42277c4c76..646a120acc 100644
--- a/src/mainboard/roda/rk886ex/acpi/platform.asl
+++ b/src/mainboard/roda/rk886ex/acpi/platform.asl
@@ -6,31 +6,12 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
 
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
 	Return(Package(){0,0})
 }
 
@@ -43,16 +24,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/mainboard/roda/rk9/acpi/platform.asl b/src/mainboard/roda/rk9/acpi/platform.asl
index 00ac2735ed..982de31bf1 100644
--- a/src/mainboard/roda/rk9/acpi/platform.asl
+++ b/src/mainboard/roda/rk9/acpi/platform.asl
@@ -6,34 +6,11 @@
 
 Method(_PTS,1)
 {
-	// Call a trap so SMI can prepare for Sleep as well.
-	// TRAP(0x55)
 }
 
 /* The _WAK method is called on system wakeup */
-
 Method(_WAK,1)
 {
-	// CPU specific part
-
-	// Notify PCI Express slots in case a card
-	// was inserted while a sleep state was active.
-
-	// Are we going to S3?
-	If (Arg0 == 3) {
-		// ..
-	}
-
-	// Are we going to S4?
-	If (Arg0 == 4) {
-		// ..
-	}
-
-	// TODO: Windows XP SP2 P-State restore
-
-	// TODO: Return Arg0 as second value if S-Arg0 was entered
-	// before.
-
 	Return(Package(){0,0})
 }
 
@@ -46,16 +23,6 @@ Scope(\_SB)
 	 */
 	Method(_INI, 0)
 	{
-		/* The DTS data in NVS is probably not up to date.
-		 * Update temperature values and make sure AP thermal
-		 * interrupts can happen
-		 */
-
-		// TRAP(71) // TODO
-
 		\GOS()
-
-		/* SMM power state and C4-on-C3 settings need to be updated */
-		// TRAP(43) // TODO
 	}
 }
diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl
index c994fdabbe..49d53f8f68 100644
--- a/src/soc/intel/baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/baytrail/acpi/southcluster.asl
@@ -5,15 +5,6 @@
 
 Scope(\)
 {
-	/* IO-Trap at 0x800. This is the ACPI->SMI communication interface. */
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		/* IO-Trap at 0x808 */
-	}
-
 	/* Intel Legacy Block */
 	OperationRegion(ILBS, SystemMemory, ILB_BASE_ADDRESS, ILB_BASE_SIZE)
 	Field (ILBS, AnyAcc, NoLock, Preserve)
diff --git a/src/soc/intel/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl
index 8e765de4ff..2a012e0778 100644
--- a/src/soc/intel/braswell/acpi/southcluster.asl
+++ b/src/soc/intel/braswell/acpi/southcluster.asl
@@ -5,15 +5,6 @@
 
 Scope(\)
 {
-	/* IO-Trap at 0x800. This is the ACPI->SMI communication interface. */
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		/* IO-Trap at 0x808 */
-	}
-
 	/* Intel Legacy Block */
 	OperationRegion(ILBS, SystemMemory, ILB_BASE_ADDRESS, ILB_BASE_SIZE)
 	Field (ILBS, AnyAcc, NoLock, Preserve)
diff --git a/src/soc/intel/broadwell/pch/acpi/pch.asl b/src/soc/intel/broadwell/pch/acpi/pch.asl
index d0d92fe103..5e1f7206d6 100644
--- a/src/soc/intel/broadwell/pch/acpi/pch.asl
+++ b/src/soc/intel/broadwell/pch/acpi/pch.asl
@@ -9,14 +9,6 @@
 
 Scope (\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-	OperationRegion (IO_T, SystemIO, 0x800, 0x10)
-	Field (IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset (0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// Root Complex Register Block
 	OperationRegion (RCRB, SystemMemory, CONFIG_FIXED_RCBA_MMIO_BASE, CONFIG_RCBA_LENGTH)
 	Field (RCRB, DWordAcc, Lock, Preserve)
diff --git a/src/soc/intel/denverton_ns/acpi/southcluster.asl b/src/soc/intel/denverton_ns/acpi/southcluster.asl
index 72e12bd299..b864513de3 100644
--- a/src/soc/intel/denverton_ns/acpi/southcluster.asl
+++ b/src/soc/intel/denverton_ns/acpi/southcluster.asl
@@ -4,15 +4,6 @@
 
 Scope(\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// Private Chipset Register(PCR). Memory Mapped through ILB
 	OperationRegion(PCRR, SystemMemory, DEFAULT_PCR_BASE, 0x01000000)
 	Field(PCRR, DWordAcc, Lock, Preserve)
diff --git a/src/southbridge/intel/bd82x6x/acpi/pch.asl b/src/southbridge/intel/bd82x6x/acpi/pch.asl
index 51c3c48d86..1bfd7201d2 100644
--- a/src/southbridge/intel/bd82x6x/acpi/pch.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/pch.asl
@@ -5,15 +5,6 @@
 
 Scope(\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// PCH Power Management Registers, located at PMBASE (0x1f.0 0x40.l)
 	OperationRegion(PMIO, SystemIO, DEFAULT_PMBASE, 0x80)
 	Field(PMIO, ByteAcc, NoLock, Preserve)
diff --git a/src/southbridge/intel/i82801ix/acpi/ich9.asl b/src/southbridge/intel/i82801ix/acpi/ich9.asl
index 5722b4c741..822bc12958 100644
--- a/src/southbridge/intel/i82801ix/acpi/ich9.asl
+++ b/src/southbridge/intel/i82801ix/acpi/ich9.asl
@@ -4,15 +4,6 @@
 
 Scope(\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// ICH9 Power Management Registers, located at PMBASE (0x1f.0 0x40.l)
 	OperationRegion(PMIO, SystemIO, DEFAULT_PMBASE, 0x80)
 	Field(PMIO, ByteAcc, NoLock, Preserve)
diff --git a/src/southbridge/intel/i82801ix/acpi/lpc.asl b/src/southbridge/intel/i82801ix/acpi/lpc.asl
index d2e88902f9..5c68068d4a 100644
--- a/src/southbridge/intel/i82801ix/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801ix/acpi/lpc.asl
@@ -142,7 +142,6 @@ Device (LPCB)
 			IO (Decode16, 0x80, 0x80, 0x1, 0x01)		// Port 80 Post
 			IO (Decode16, 0x92, 0x92, 0x1, 0x01)		// CPU Reserved
 			IO (Decode16, 0xb2, 0xb2, 0x1, 0x02)		// SWSMI
-			IO (Decode16, 0x800, 0x800, 0x1, 0x10)		// ACPI I/O trap
 			IO (Decode16, DEFAULT_PMBASE, DEFAULT_PMBASE, 0x1, 0x80)	// ICH ACPI
 			IO (Decode16, DEFAULT_GPIOBASE, DEFAULT_GPIOBASE, 0x1, 0x40)	// ICH GPIO
 		})
diff --git a/src/southbridge/intel/i82801jx/acpi/ich10.asl b/src/southbridge/intel/i82801jx/acpi/ich10.asl
index 2324696d90..d6b84adc05 100644
--- a/src/southbridge/intel/i82801jx/acpi/ich10.asl
+++ b/src/southbridge/intel/i82801jx/acpi/ich10.asl
@@ -6,15 +6,6 @@
 
 Scope(\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-
-	OperationRegion(IO_T, SystemIO, 0x800, 0x10)
-	Field(IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset(0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// ICH10 Power Management Registers, located at PMBASE (0x1f.0 0x40.l)
 	OperationRegion(PMIO, SystemIO, DEFAULT_PMBASE, 0x80)
 	Field(PMIO, ByteAcc, NoLock, Preserve)
diff --git a/src/southbridge/intel/i82801jx/acpi/lpc.asl b/src/southbridge/intel/i82801jx/acpi/lpc.asl
index d2e88902f9..5c68068d4a 100644
--- a/src/southbridge/intel/i82801jx/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801jx/acpi/lpc.asl
@@ -142,7 +142,6 @@ Device (LPCB)
 			IO (Decode16, 0x80, 0x80, 0x1, 0x01)		// Port 80 Post
 			IO (Decode16, 0x92, 0x92, 0x1, 0x01)		// CPU Reserved
 			IO (Decode16, 0xb2, 0xb2, 0x1, 0x02)		// SWSMI
-			IO (Decode16, 0x800, 0x800, 0x1, 0x10)		// ACPI I/O trap
 			IO (Decode16, DEFAULT_PMBASE, DEFAULT_PMBASE, 0x1, 0x80)	// ICH ACPI
 			IO (Decode16, DEFAULT_GPIOBASE, DEFAULT_GPIOBASE, 0x1, 0x40)	// ICH GPIO
 		})
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index 50f73cdf9c..8c76002128 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -10,14 +10,6 @@
 
 Scope (\)
 {
-	// IO-Trap at 0x800. This is the ACPI->SMI communication interface.
-	OperationRegion (IO_T, SystemIO, 0x800, 0x10)
-	Field (IO_T, ByteAcc, NoLock, Preserve)
-	{
-		Offset (0x8),
-		TRP0, 8		// IO-Trap at 0x808
-	}
-
 	// Root Complex Register Block
 	OperationRegion (RCRB, SystemMemory, CONFIG_FIXED_RCBA_MMIO_BASE, CONFIG_RCBA_LENGTH)
 	Field (RCRB, DWordAcc, Lock, Preserve)