2 files changed, 29 insertions, 23 deletions
diff --git a/src/soc/intel/tigerlake/acpi/tcss_dma.asl b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
index da2e8fe97d..f7c4117dcf 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_dma.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
@@ -32,20 +32,12 @@ Method (_S0W, 0x0)
 
 Method (_PR0)
 {
-	If (DUID == 0) {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
-	} Else {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
-	}
+	Return (Package() { \_SB.PCI0.D3C })
 }
 
 Method (_PR3)
 {
-	If (DUID == 0) {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
-	} Else {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
-	}
+	Return (Package() { \_SB.PCI0.D3C })
 }
 
 /*
@@ -72,6 +64,24 @@ Method (D3CE, 0, Serialized)
  */
 Name (SD3C, 0)
 
+Method (_PS0, 0, Serialized)
+{
+	If (DUID == 0) {
+		\_SB.PCI0.TBT0._ON()
+	} Else {
+		\_SB.PCI0.TBT1._ON()
+	}
+}
+
+Method (_PS3, 0, Serialized)
+{
+	If (DUID == 0) {
+		\_SB.PCI0.TBT0._OFF()
+	} Else {
+		\_SB.PCI0.TBT1._OFF()
+	}
+}
+
 Method (_DSW, 3)
 {
 	/* If entering Sx (Arg1 > 1), need to skip TCSS D3Cold & TBT RTD3/D3Cold. */
diff --git a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
index abca5d1607..b4c0cefa1e 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
@@ -76,10 +76,14 @@ Device (PXSX)
 
 Method (_DSW, 3)
 {
-	C2PM (Arg0, Arg1, Arg2, DCPM)
 	/* If entering Sx (Arg1 > 1), need to skip TCSS D3Cold & TBT RTD3/D3Cold. */
-	\_SB.PCI0.TDM0.SD3C = Arg1
-	\_SB.PCI0.TDM1.SD3C = Arg1
+	If ((TUID == 0) || (TUID == 1)) {
+		\_SB.PCI0.TDM0.SD3C = Arg1
+	} Else {
+		\_SB.PCI0.TDM1.SD3C = Arg1
+	}
+
+	C2PM (Arg0, Arg1, Arg2, DCPM)
 }
 
 Method (_PRW, 0)
@@ -302,20 +306,12 @@ Method (_S0W, 0x0, NotSerialized)
 
 Method (_PR0)
 {
-	If ((TUID == 0) || (TUID == 1)) {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
-	} Else {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
-	}
+	Return (Package() { \_SB.PCI0.D3C })
 }
 
 Method (_PR3)
 {
-	If ((TUID == 0) || (TUID == 1)) {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
-	} Else {
-		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
-	}
+	Return (Package() { \_SB.PCI0.D3C })
 }
 
 /*