From b4dcbd3c2863e69f348352a6c214bf4fb7e4148d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 24 Nov 2020 08:27:12 -0700
Subject: [PATCH] Sync more tcss changes from alderlake to tigerlake

Change-Id: I4ec025714f48bed5623687827d3362e507dc6f90
---
 src/soc/intel/tigerlake/acpi/tcss_dma.asl    | 45 ++++++-----
 src/soc/intel/tigerlake/acpi/tcss_pcierp.asl | 79 ++++++++++++++++++++
 2 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/src/soc/intel/tigerlake/acpi/tcss_dma.asl b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
index e3d66f642f..da2e8fe97d 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_dma.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
@@ -72,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. */
@@ -100,3 +82,30 @@ Method (_PRW, 0)
 {
 	Return (Package() { 0x6D, 4 })
 }
+
+Method (_DSD, 0)
+{
+	Return(
+		Package()
+		{
+			/* Thunderbolt GUID for IMR_VALID at ../drivers/acpi/property.c */
+			ToUUID("C44D002F-69F9-4E7D-A904-A7BAABDF43F7"),
+			Package ()
+			{
+				Package (2) { "IMR_VALID", 1 }
+			},
+
+			/* Thunderbolt GUID for WAKE_SUPPORTED at ../drivers/acpi/property.c */
+			ToUUID("6C501103-C189-4296-BA72-9BF5A26EBE5D"),
+			Package ()
+			{
+				Package (2) { "WAKE_SUPPORTED", 1 }
+			}
+		}
+	)
+}
+
+Method (_DSM, 4, Serialized)
+{
+	Return (Buffer() { 0 })
+}
diff --git a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
index 9e1b324bfe..9571e1916f 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
@@ -220,6 +220,85 @@ Method (_PS3, 0, Serialized)
 	}
 }
 
+Method (_DSD, 0) {
+	If ((TUID == 0) || (TUID == 1)) {
+		Return ( Package() {
+			/* acpi_pci_bridge_d3 at ../drivers/pci/pci-acpi.c */
+			ToUUID("6211E2C0-58A3-4AF3-90E1-927A4E0C55A4"),
+			Package ()
+			{
+				Package (2) { "HotPlugSupportInD3", 1 },
+			},
+
+			/* pci_acpi_set_untrusted at ../drivers/pci/pci-acpi.c */
+			ToUUID("EFCC06CC-73AC-4BC3-BFF0-76143807C389"),
+			Package () {
+				Package (2) { "ExternalFacingPort", 1 },  /* TBT/CIO port */
+				/*
+				 * UID of the TBT RP on platform, range is: 0, 1 ...,
+				 * (NumOfTBTRP - 1).
+				 */
+				Package (2) { "UID", TUID },
+			},
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package (2) { "usb4-host-interface", \_SB.PCI0.TDM0 },
+				Package (2) { "usb4-port-number", TUID },
+			}
+		})
+	} ElseIf (TUID == 2) {
+		Return ( Package () {
+			/* acpi_pci_bridge_d3 at ../drivers/pci/pci-acpi.c */
+			ToUUID("6211E2C0-58A3-4AF3-90E1-927A4E0C55A4"),
+			Package ()
+			{
+				Package (2) { "HotPlugSupportInD3", 1 },
+			},
+
+			/* pci_acpi_set_untrusted at ../drivers/pci/pci-acpi.c */
+			ToUUID("EFCC06CC-73AC-4BC3-BFF0-76143807C389"),
+			Package () {
+				Package (2) { "ExternalFacingPort", 1 },  /* TBT/CIO port */
+				/*
+				 * UID of the TBT RP on platform, range is: 0, 1 ...,
+				 * (NumOfTBTRP - 1).
+				 */
+				Package (2) { "UID", TUID },
+			},
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package (2) { "usb4-host-interface", \_SB.PCI0.TDM1 },
+				Package (2) { "usb4-port-number", 0 },
+			}
+		})
+	} Else {  /* TUID == 3 */
+		Return ( Package () {
+			/* acpi_pci_bridge_d3 at ../drivers/pci/pci-acpi.c */
+			ToUUID("6211E2C0-58A3-4AF3-90E1-927A4E0C55A4"),
+			Package ()
+			{
+				Package (2) { "HotPlugSupportInD3", 1 },
+			},
+
+			/* pci_acpi_set_untrusted at ../drivers/pci/pci-acpi.c */
+			ToUUID("EFCC06CC-73AC-4BC3-BFF0-76143807C389"),
+			Package () {
+				Package (2) { "ExternalFacingPort", 1 },  /* TBT/CIO port */
+				/*
+				 * UID of the TBT RP on platform, range is: 0, 1 ...,
+				 * (NumOfTBTRP - 1).
+				 */
+				Package (2) { "UID", TUID },
+			},
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package (2) { "usb4-host-interface", \_SB.PCI0.TDM1 },
+				Package (2) { "usb4-port-number", 1 },
+			}
+		})
+	}
+}
+
 Method (_S0W, 0x0, NotSerialized)
 {
 	Return (0x4)