From 4dd22de6345af5e8e75ae3a49fb13fdacf72175f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 30 Nov 2020 14:08:14 -0700
Subject: [PATCH] Restore changes to TCSS ASL

Change-Id: I8e6093f117f5e5aa453a739b88d1d6fc3fed6598
---
 src/soc/intel/tigerlake/acpi/tcss_dma.asl    | 30 +++++++-------------
 src/soc/intel/tigerlake/acpi/tcss_pcierp.asl | 12 ++++++--
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/soc/intel/tigerlake/acpi/tcss_dma.asl b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
index 085990dbfd..d00f79432d 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_dma.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
@@ -32,12 +32,20 @@ Method (_S0W, 0x0)
 
 Method (_PR0)
 {
-	Return (Package() { \_SB.PCI0.D3C })
+	If (DUID == 0) {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
+	} Else {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
+	}
 }
 
 Method (_PR3)
 {
-	Return (Package() { \_SB.PCI0.D3C })
+	If (DUID == 0) {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
+	} Else {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
+	}
 }
 
 /*
@@ -64,24 +72,6 @@ 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 08d890087c..9e1b324bfe 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
@@ -227,12 +227,20 @@ Method (_S0W, 0x0, NotSerialized)
 
 Method (_PR0)
 {
-	Return (Package() { \_SB.PCI0.D3C })
+	If ((TUID == 0) || (TUID == 1)) {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
+	} Else {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
+	}
 }
 
 Method (_PR3)
 {
-	Return (Package() { \_SB.PCI0.D3C })
+	If ((TUID == 0) || (TUID == 1)) {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT0 })
+	} Else {
+		Return (Package() { \_SB.PCI0.D3C, \_SB.PCI0.TBT1 })
+	}
 }
 
 /*