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 lijian.zhao@intel.com 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}) }
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#2).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 11 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/2
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#3).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 13 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/3
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#4).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 13 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/4
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#5).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 19 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/5
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#6).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 14 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/6
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#7).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 12 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/7
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#8).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig M src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl M src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 13 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/8
Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32371 )
Change subject: soc/intel/common/acpi: Change EC PTS/WAK dynamic loading ......................................................................
Set Ready For Review
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#10).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig A src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl A src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 54 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/10
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#11).
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 --- M src/mainboard/google/sarien/Kconfig A src/mainboard/google/sarien/variants/arcada/include/variant/acpi/mainboard.asl A src/mainboard/google/sarien/variants/sarien/include/variant/acpi/mainboard.asl M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 5 files changed, 46 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/11
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#12).
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 lijian.zhao@intel.com 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, 0 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/12
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#13).
Change subject: soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading ......................................................................
soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading
Use CondRefOf to replace config optios for PTS/WAK acpi method dynamic loading. Then we can move EC PTS and WAK method to be under mainboard.
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 lijian.zhao@intel.com 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, 0 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/13
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32371
to look at the new patch set (#14).
Change subject: soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading ......................................................................
soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading
Use CondRefOf to replace config optios for PTS/WAK acpi method dynamic loading. Then we can move EC PTS and WAK method to be under mainboard.
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 lijian.zhao@intel.com 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, 0 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/32371/14
Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32371 )
Change subject: soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading ......................................................................
Patch Set 14: Code-Review+2
Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32371 )
Change subject: soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading ......................................................................
soc/intel/common/acpi: Remove EC PTS/WAK dynamic loading
Use CondRefOf to replace config optios for PTS/WAK acpi method dynamic loading. Then we can move EC PTS and WAK method to be under mainboard.
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 lijian.zhao@intel.com Change-Id: I9f4bd7240832caf070e65039e4ba2d8656371da8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32371 Reviewed-by: Duncan Laurie dlaurie@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/sarien/Kconfig M src/soc/intel/common/Kconfig M src/soc/intel/common/acpi/platform.asl 3 files changed, 0 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Duncan Laurie: Looks good to me, approved
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index c48a908..e6d1f1f 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 318cc25..ac22686 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 8b85d44..9aa2edc 100644 --- a/src/soc/intel/common/acpi/platform.asl +++ b/src/soc/intel/common/acpi/platform.asl @@ -37,10 +37,6 @@ { 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.MPTS)) { _SB.MPTS (Arg0) @@ -58,10 +54,5 @@ _SB.MWAK (Arg0) }
-#if CONFIG(SOC_INTEL_COMMON_ACPI_EC_PTS_WAK) - /* Call EC _WAK handler */ - _SB.PCI0.LPCB.EC0.WAK (Arg0) -#endif - Return (Package(){0,0}) }
-
Duncan Laurie (Code Review) -
Lijian Zhao (Code Review)