[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/common/acpi: Change EC PTS/WAK dynamic loading

[Lijian Zhao (Code Review)]

Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32371

Change subject: soc/intel/common/acpi: Change EC PTS/WAK dynamic loading
......................................................................

soc/intel/common/acpi: Change EC PTS/WAK dynamic loading

Use CondRefOf to replace config optios for EC PTS/WAK acpi method
dynamic loading.

BUG=N/A
TEST=Build sarien source code, check build/dsdt.dsl have EC.PTS method
included, build whlrvp soure, check build/dsdt.dsl don't have EC.PTS
method. Both able to build pass.

Signed-off-by: Lijian Zhao 
Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8
---
M src/mainboard/google/sarien/Kconfig
M src/soc/intel/common/Kconfig
M src/soc/intel/common/acpi/platform.asl
3 files changed, 11 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/1

diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 9d658fa..42b3a4f 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -16,7 +16,6 @@
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_I2C_TPM_CR50
    select MAINBOARD_HAS_TPM2
-	select SOC_INTEL_COMMON_ACPI_EC_PTS_WAK
    select SOC_INTEL_WHISKEYLAKE
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
    select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE
diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig
index b5caf40..c945514 100644
--- a/src/soc/intel/common/Kconfig
+++ b/src/soc/intel/common/Kconfig
@@ -51,13 +51,6 @@
    bool
    default n

-config SOC_INTEL_COMMON_ACPI_EC_PTS_WAK
-	bool
-	default n
-	help
-	  Set this option to have the platform level _PTS/_WAK methods call
-	  methods provided by the Embedded Controller.
-
 config SOC_INTEL_COMMON_NHLT
    bool
    default n
diff --git a/src/soc/intel/common/acpi/platform.asl b/src/soc/intel/common/acpi/platform.asl
index bdc0d5c..12a41e7 100644
--- a/src/soc/intel/common/acpi/platform.asl
+++ b/src/soc/intel/common/acpi/platform.asl
@@ -17,6 +17,9 @@

#include <include/console/post_codes.h>

+External(_SB.PCI0.LPCB.EC0.PTS, MethodObj)
+External(_SB.PCI0.LPCB.EC0.WAK, MethodObj)
+
 /* Port 80 POST */

OperationRegion (POST, SystemIO, CONFIG_POST_IO_PORT, 1)
@@ -34,10 +37,10 @@
 {
    Store (POST_OS_ENTER_PTS, DBG0)

-#if CONFIG(SOC_INTEL_COMMON_ACPI_EC_PTS_WAK)
-	/* Call EC _PTS handler */
-	_SB.PCI0.LPCB.EC0.PTS (Arg0)
-#endif
+	If (CondRefOf(_SB.PCI0.LPCB.EC0.PTS)) {
+		/* Call EC _PTS handler */
+		_SB.PCI0.LPCB.EC0.PTS (Arg0)
+	}
 }

/* The _WAK method is called on system wakeup */
@@ -46,10 +49,10 @@
 {
    Store (POST_OS_ENTER_WAKE, DBG0)

-#if CONFIG(SOC_INTEL_COMMON_ACPI_EC_PTS_WAK)
-	/* Call EC _WAK handler */
-	_SB.PCI0.LPCB.EC0.WAK (Arg0)
-#endif
+	If (CondRefOf(_SB.PCI0.LPCB.EC0.WAK)) {
+		/* Call EC _WAK handler */
+		_SB.PCI0.LPCB.EC0.WAK (Arg0)
+	}

Return (Package(){0,0})
 }