[M] Change in coreboot[master]: soc/intel/tigerlake: Replace SOC_INTEL_TIGERLAKE_S3 with D3COLD_SUPPORT

[Lean Sheng Tan (Code Review)]

Lean Sheng Tan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74405 )

(

5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: soc/intel/tigerlake: Replace SOC_INTEL_TIGERLAKE_S3 with D3COLD_SUPPORT
......................................................................

soc/intel/tigerlake: Replace SOC_INTEL_TIGERLAKE_S3 with D3COLD_SUPPORT

The Kconfig option SOC_INTEL_TIGERLAKE_S3 suggests that it's doing
something with S3, but it's actually disabling D3Cold support.

Remove it, and instead use D3COLD_SUPPORT so it's clear what the
option is doing.

Signed-off-by: Sean Rhodes 
Change-Id: Id43f3e5c8620d474831cc02fcecebd8aac961687
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74405
Reviewed-by: Nico Huber 
Reviewed-by: Michael Niewöhner 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/starlabs/starbook/Kconfig
M src/soc/intel/tigerlake/Kconfig
M src/soc/intel/tigerlake/acpi/tcss.asl
M src/soc/intel/tigerlake/acpi/tcss_dma.asl
M src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
M src/soc/intel/tigerlake/acpi/tcss_xhci.asl
6 files changed, 38 insertions(+), 25 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, but someone else must approve
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index 17be0a2..5ad7e27 100644
--- a/src/mainboard/starlabs/starbook/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -48,7 +48,6 @@
    select SOC_INTEL_COMMON_BLOCK_TCSS
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
    select SOC_INTEL_TIGERLAKE
-	select SOC_INTEL_TIGERLAKE_S3
    select SPI_FLASH_WINBOND
    select TPM_MEASURED_BOOT

diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 9928591..9bca895 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -208,12 +208,6 @@
    int
    default 6

-config SOC_INTEL_TIGERLAKE_S3
-	bool
-	default n
-	help
-	  Select if using S3 instead of S0ix to disable D3Cold
-
 config SOC_INTEL_UART_DEV_MAX
    int
    default 3
diff --git a/src/soc/intel/tigerlake/acpi/tcss.asl b/src/soc/intel/tigerlake/acpi/tcss.asl
index be9d306..98337a3 100644
--- a/src/soc/intel/tigerlake/acpi/tcss.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss.asl
@@ -676,7 +676,7 @@
    	}
    }

-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    Method (TCON, 0)
    {
    	/* Reset IOM D3 cold bit if it is in D3 cold now. */
@@ -787,7 +787,7 @@
    		STAT = 0
    	}
    }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT

/*
     * TCSS xHCI device
diff --git a/src/soc/intel/tigerlake/acpi/tcss_dma.asl b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
index 3c19ef6..bbb0b6a 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_dma.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_dma.asl
@@ -27,11 +27,11 @@

Method (_S0W, 0x0)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    Return (0x04)
 #else
    Return (0x03)
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

/*
@@ -40,7 +40,7 @@
  */
 Method (_PR0)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    If (DUID == 0) {
    	Return (Package() { _SB.PCI0.D3C, _SB.PCI0.TBT0 })
    } Else {
@@ -52,12 +52,12 @@
    } Else {
    	Return (Package() { _SB.PCI0.TBT1 })
    }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

Method (_PR3)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    If (DUID == 0) {
    	Return (Package() { _SB.PCI0.D3C, _SB.PCI0.TBT0 })
    } Else {
@@ -69,7 +69,7 @@
    } Else {
    	Return (Package() { _SB.PCI0.TBT1 })
    }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

/*
diff --git a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
index fda58e7..6dbde46 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_pcierp.asl
@@ -247,16 +247,16 @@

Method (_S0W, 0x0, NotSerialized)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    Return (0x4)
 #else
    Return (0x3)
-#endif	// SOC_INTEL_ALDERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

Method (_PR0)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    If ((TUID == 0) || (TUID == 1)) {
    	Return (Package() { _SB.PCI0.D3C, _SB.PCI0.TBT0 })
    } Else {
@@ -268,12 +268,12 @@
    } Else {
    	Return (Package() { _SB.PCI0.TBT1 })
    }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

Method (_PR3)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    If ((TUID == 0) || (TUID == 1)) {
    	Return (Package() { _SB.PCI0.D3C, _SB.PCI0.TBT0 })
    } Else {
@@ -285,7 +285,7 @@
    } Else {
    	Return (Package() { _SB.PCI0.TBT1 })
    }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

/*
diff --git a/src/soc/intel/tigerlake/acpi/tcss_xhci.asl b/src/soc/intel/tigerlake/acpi/tcss_xhci.asl
index a3b8c8f..ddc5a66 100644
--- a/src/soc/intel/tigerlake/acpi/tcss_xhci.asl
+++ b/src/soc/intel/tigerlake/acpi/tcss_xhci.asl
@@ -30,11 +30,11 @@

Method (_S0W, 0x0, NotSerialized)
 {
-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
    Return (0x4)
 #else
    Return (0x3)
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT
 }

/*
@@ -43,7 +43,7 @@
  */
 Name (SD3C, 0)

-#if !CONFIG(SOC_INTEL_TIGERLAKE_S3)
+#if CONFIG(D3COLD_SUPPORT)
 Method (_PR0)
 {
    Return (Package () { _SB.PCI0.D3C })
@@ -53,7 +53,7 @@
 {
    Return (Package () { _SB.PCI0.D3C })
 }
-#endif	// SOC_INTEL_TIGERLAKE_S3
+#endif	// D3COLD_SUPPORT

/*
  * XHCI controller _DSM method