coreboot-gerrit April 2023

coreboot-gerrit@coreboot.org

1 participants
5761 discussions

[S] Change in coreboot[master]: soc/intel: Don't report _S1 state when unsupported
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Jeff Daly, Tarun Tuli, Subrata Banik, Jonathan Zhang, Johnny Lin, Christian Walter, Kapil Porwal, Vanessa Eusebio, Arthur Heymans, Lean Sheng Tan, Werner Zeh, Tim Chu. Hello Sean Rhodes, Jeff Daly, Tarun Tuli, Subrata Banik, Jonathan Zhang, Johnny Lin, Kapil Porwal, Christian Walter, Vanessa Eusebio, Lean Sheng Tan, Werner Zeh, Tim Chu, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/74760 to look at the new patch set (#2). Change subject: soc/intel: Don't report _S1 state when unsupported ...................................................................... soc/intel: Don't report _S1 state when unsupported Since skylake Intel hardware does not support this sleep state. Trying to do enter it results in a system hang on at least Alderlake (prodrive/atlas). Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: Ic9e19410696240755e8714db53a0525284f3a2da --- M src/Kconfig M src/soc/intel/alderlake/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/elkhartlake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/meteorlake/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/southbridge/intel/common/acpi/sleepstates.asl 12 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/74760/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/74760 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic9e19410696240755e8714db53a0525284f3a2da Gerrit-Change-Number: 74760 Gerrit-PatchSet: 2 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Reviewer: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: soc/intel: Don't report _S1 state when unsupported
by Sean Rhodes (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Jeff Daly, Tarun Tuli, Subrata Banik, Jonathan Zhang, Johnny Lin, Christian Walter, Kapil Porwal, Vanessa Eusebio, Arthur Heymans, Lean Sheng Tan, Werner Zeh, Tim Chu. Sean Rhodes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/74760 ) Change subject: soc/intel: Don't report _S1 state when unsupported ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/74760 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic9e19410696240755e8714db53a0525284f3a2da Gerrit-Change-Number: 74760 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Reviewer: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Comment-Date: Tue, 25 Apr 2023 14:52:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: mb/prodrive/atlas: Enable/disable sleep states based on EC
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Lance Zhao, Tim Wawrzynczak, Christian Walter, Angel Pons, Arthur Heymans, Lean Sheng Tan. Hello Lance Zhao, build bot (Jenkins), Tim Wawrzynczak, Christian Walter, Angel Pons, Lean Sheng Tan, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/74421 to look at the new patch set (#5). Change subject: mb/prodrive/atlas: Enable/disable sleep states based on EC ...................................................................... mb/prodrive/atlas: Enable/disable sleep states based on EC With the profile ATLAS_PROF_REALTIME_PERFORMANCE it is desired to not have the option to be able to sleep, the reason being that windows goes to sleep after 30min of inactivity. Change-Id: I424db7e712a705c628aa3a10a486d3313404987a Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/mainboard/prodrive/atlas/Kconfig M src/mainboard/prodrive/atlas/mainboard.c 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/74421/5 -- To view, visit https://review.coreboot.org/c/coreboot/+/74421 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I424db7e712a705c628aa3a10a486d3313404987a Gerrit-Change-Number: 74421 Gerrit-PatchSet: 5 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: mb/prodrive/atlas: Enable/disable sleep states based on EC
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Lance Zhao, Tim Wawrzynczak, Christian Walter, Angel Pons, Arthur Heymans, Lean Sheng Tan. Hello Lance Zhao, build bot (Jenkins), Tim Wawrzynczak, Christian Walter, Angel Pons, Lean Sheng Tan, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/74421 to look at the new patch set (#4). Change subject: mb/prodrive/atlas: Enable/disable sleep states based on EC ...................................................................... mb/prodrive/atlas: Enable/disable sleep states based on EC With the profile ATLAS_PROF_REALTIME_PERFORMANCE it is desired to not have the option to be able to sleep, the reason being that windows goes to sleep after 30min of inactivity. Change-Id: I424db7e712a705c628aa3a10a486d3313404987a Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/mainboard/prodrive/atlas/Kconfig M src/mainboard/prodrive/atlas/mainboard.c 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/74421/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/74421 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I424db7e712a705c628aa3a10a486d3313404987a Gerrit-Change-Number: 74421 Gerrit-PatchSet: 4 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: acpi: Add a runtime method to override exposed _Sx sleep states
by build bot (Jenkins) (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Lance Zhao, Tim Wawrzynczak. build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/74762 ) Change subject: acpi: Add a runtime method to override exposed _Sx sleep states ...................................................................... Patch Set 1: (2 comments) Commit Message: Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-174927): https://review.coreboot.org/c/coreboot/+/74762/comment/a0f20c9d_2724225f PS1, Line 9: This allows mainboards to override available sleep states at runtime. This is Possible unwrapped commit description (prefer a maximum 72 chars per line) Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-174927): https://review.coreboot.org/c/coreboot/+/74762/comment/d75ba273_acde9786 PS1, Line 10: done by adding a IntObj in SSDT that DSDT consumes to override the available _Sx Possible unwrapped commit description (prefer a maximum 72 chars per line) -- To view, visit https://review.coreboot.org/c/coreboot/+/74762 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic21830c1ef9c183b1e3005cc1f8b7daf7e9ea998 Gerrit-Change-Number: 74762 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Comment-Date: Tue, 25 Apr 2023 14:40:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: sb/intel/sleepstates.asl: Use variable to enable sleepstates
by build bot (Jenkins) (Code Review) 25 Apr '23

25 Apr '23

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/74761 ) Change subject: sb/intel/sleepstates.asl: Use variable to enable sleepstates ...................................................................... Patch Set 1: (2 comments) Commit Message: Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-174926): https://review.coreboot.org/c/coreboot/+/74761/comment/0c684f9b_d94fad93 PS1, Line 8: Possible unwrapped commit description (prefer a maximum 72 chars per line) Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-174926): https://review.coreboot.org/c/coreboot/+/74761/comment/f9653e82_63dbb7d3 PS1, Line 9: In order to make supported sleep states a runtime configuration option use a Possible unwrapped commit description (prefer a maximum 72 chars per line) -- To view, visit https://review.coreboot.org/c/coreboot/+/74761 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6910c2c75e668e6f75a6f431813edeb59d52dd93 Gerrit-Change-Number: 74761 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 25 Apr 2023 14:40:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: soc/intel: Don't report _S1 state when unsupported
by build bot (Jenkins) (Code Review) 25 Apr '23

25 Apr '23

1 0

[S] Change in coreboot[master]: acpi: Add a runtime method to override exposed _Sx sleep states
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Lance Zhao, Tim Wawrzynczak. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74762 ) Change subject: acpi: Add a runtime method to override exposed _Sx sleep states ...................................................................... acpi: Add a runtime method to override exposed _Sx sleep states This allows mainboards to override available sleep states at runtime. This is done by adding a IntObj in SSDT that DSDT consumes to override the available _Sx states. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: Ic21830c1ef9c183b1e3005cc1f8b7daf7e9ea998 --- M src/acpi/Kconfig M src/acpi/acpi.c M src/include/acpi/acpi.h M src/southbridge/intel/common/acpi/sleepstates.asl 4 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/74762/1 diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig index 5af8b22..236bb9f 100644 --- a/src/acpi/Kconfig +++ b/src/acpi/Kconfig @@ -61,3 +61,10 @@ depends on HAVE_ACPI_TABLES help Selected by platforms that support and fill Intel Low Power Idle Table. + +config OVERRIDE_ENABLED_SLEEP_STATES + bool + depends on HAVE_ACPI_TABLES + help + Select this on platforms that want a way to override the enabled + _Sx states during runtime. diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 492d043..38b1b63 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -517,6 +517,20 @@ acpigen_pop_len(); } +void acpi_ssdt_override_sleep_states(bool enable_s1, bool enable_s2, bool enable_s3, bool enable_s4) +{ + assert(CONFIG(OVERRIDE_ENABLED_SLEEP_STATES)); + assert(!(enable_s1 && CONFIG(PLATFORM_LACKS_ACPI_S1))); + assert(!(enable_s3 && !CONFIG(HAVE_ACPI_RESUME))); + assert(!(enable_s4 && CONFIG(DISABLE_ACPI_HIBERNATE))); + + acpigen_write_scope("\\"); + uint32_t sleep_enable = (enable_s1 << 0) | (enable_s2 << 1) + | (enable_s3 << 2) | (enable_s4 << 3); + acpigen_write_name_dword("OSFG", sleep_enable); + acpigen_pop_len(); +} + void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 77f73ae..1aa195c 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -1308,6 +1308,7 @@ unsigned long write_acpi_tables(unsigned long addr); unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current); +void acpi_ssdt_override_sleep_states(bool enable_s1, bool enable_s2, bool enable_s3, bool enable_s4); void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id); void acpi_write_bert(acpi_bert_t *bert, uintptr_t region, size_t length); void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt); diff --git a/src/southbridge/intel/common/acpi/sleepstates.asl b/src/southbridge/intel/common/acpi/sleepstates.asl index baee300..5f86e79 100644 --- a/src/southbridge/intel/common/acpi/sleepstates.asl +++ b/src/southbridge/intel/common/acpi/sleepstates.asl @@ -15,6 +15,11 @@ SSFG &= 0xf7 } +if (CONFIG(OVERRIDE_ENABLED_SLEEP_STATES)) { + External (\OSFG, IntObj) + SSFG = \OSFG +} + /* Supported sleep states: */ Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ -- To view, visit https://review.coreboot.org/c/coreboot/+/74762 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic21830c1ef9c183b1e3005cc1f8b7daf7e9ea998 Gerrit-Change-Number: 74762 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: sb/intel/sleepstates.asl: Use variable to enable sleepstates
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74761 ) Change subject: sb/intel/sleepstates.asl: Use variable to enable sleepstates ...................................................................... sb/intel/sleepstates.asl: Use variable to enable sleepstates In order to make supported sleep states a runtime configuration option use a variable. A follow-up patch will implement updating this variable based on an SSDT generated IntObj. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: I6910c2c75e668e6f75a6f431813edeb59d52dd93 --- M src/southbridge/intel/common/acpi/sleepstates.asl 1 file changed, 41 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/74761/1 diff --git a/src/southbridge/intel/common/acpi/sleepstates.asl b/src/southbridge/intel/common/acpi/sleepstates.asl index 7028c63..baee300 100644 --- a/src/southbridge/intel/common/acpi/sleepstates.asl +++ b/src/southbridge/intel/common/acpi/sleepstates.asl @@ -1,12 +1,31 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -Name(\_S0, Package(){0x0,0x0,0x0,0x0}) -#if !CONFIG(HAVE_ACPI_RESUME) && !CONFIG(PLATFORM_LACKS_ACPI_S1) -Name(\_S1, Package(){0x1,0x0,0x0,0x0}) +/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ +#if CONFIG(HAVE_ACPI_RESUME) +Name (SSFG, 0x0D) #else -Name(\_S3, Package(){0x5,0x0,0x0,0x0}) +Name (SSFG, 0x09) #endif -#if !CONFIG(DISABLE_ACPI_HIBERNATE) -Name(\_S4, Package(){0x6,0x0,0x0,0x0}) -#endif -Name(\_S5, Package(){0x7,0x0,0x0,0x0}) + +If (CONFIG(PLATFORM_LACKS_ACPI_S1)) { + SSFG &= 0xfe +} + +If (CONFIG(DISABLE_ACPI_HIBERNATE)) { + SSFG &= 0xf7 +} + +/* Supported sleep states: */ +Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} ) /* (S0) - working state */ + +If (SSFG & 0x01) { + Name(\_S1, Package () {0x01, 0x00, 0x00, 0x00} ) /* (S1) - sleeping w/CPU context */ +} +If (SSFG & 0x04) { + Name(\_S3, Package () {0x05, 0x00, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ +} +If (SSFG & 0x08) { + Name(\_S4, Package () {0x06, 0x04, 0x00, 0x00} ) /* (S4) - Suspend to Disk */ +} + +Name(\_S5, Package () {0x07, 0x00, 0x00, 0x00} ) /* (S5) - Soft Off */ -- To view, visit https://review.coreboot.org/c/coreboot/+/74761 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6910c2c75e668e6f75a6f431813edeb59d52dd93 Gerrit-Change-Number: 74761 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: soc/intel: Don't report _S1 state when unsupported
by Arthur Heymans (Code Review) 25 Apr '23

25 Apr '23

Attention is currently required from: Jeff Daly, Tarun Tuli, Sean Rhodes, Subrata Banik, Jonathan Zhang, Johnny Lin, Christian Walter, Kapil Porwal, Vanessa Eusebio, Lean Sheng Tan, Werner Zeh, Tim Chu. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74760 ) Change subject: soc/intel: Don't report _S1 state when unsupported ...................................................................... soc/intel: Don't report _S1 state when unsupported Since skylake Intel hardware does not support this sleep state. Trying to enter it results in a system hang on at least Alderlake (prodrive/atlas). Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: Ic9e19410696240755e8714db53a0525284f3a2da --- M src/Kconfig M src/soc/intel/alderlake/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/elkhartlake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/meteorlake/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/southbridge/intel/common/acpi/sleepstates.asl 12 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/74760/1 diff --git a/src/Kconfig b/src/Kconfig index e35df43..2a54760 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -711,6 +711,12 @@ source "src/console/Kconfig" +config PLATFORM_LACKS_ACPI_S1 + bool + default n + help + Set this to 'y' on platforms that do not support ACPI S1 state. + config HAVE_ACPI_RESUME bool default n diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 0913480..177fd5d 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -78,6 +78,7 @@ select MP_SERVICES_PPI_V2 select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_2 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 395d7aa6..0627cc7 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -64,6 +64,7 @@ select PCIEXP_COMMON_CLOCK select PCIEXP_CLK_PM select PCIEXP_L1_SUB_STATE + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_0 select PMC_INVALID_READ_AFTER_WRITE select PMC_GLOBAL_RESET_ENABLE_LOCK diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 33025eb..5f717f8 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -79,6 +79,7 @@ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_0 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig index dcf9a5f..42881e8 100644 --- a/src/soc/intel/denverton_ns/Kconfig +++ b/src/soc/intel/denverton_ns/Kconfig @@ -27,6 +27,7 @@ select HAVE_SMI_HANDLER select INTEL_DESCRIPTOR_MODE_CAPABLE select PCR_COMMON_IOSF_1_0 + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_0 select SOC_INTEL_COMMON select SOC_INTEL_COMMON_RESET diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 9e7f3eb..af47ec88 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -30,6 +30,7 @@ select MP_SERVICES_PPI_V1 select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_1 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 660b24a..6aec3b1 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -33,6 +33,7 @@ select MP_SERVICES_PPI_V1 select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_2 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 3d99f81..5b48e5f 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -43,6 +43,7 @@ select MP_SERVICES_PPI_V2 select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_3 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index e15af04..67935a0 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -45,6 +45,7 @@ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_0 select PMC_GLOBAL_RESET_ENABLE_LOCK select SA_ENABLE_DPR diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 9928591..2fef475 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -42,6 +42,7 @@ select MP_SERVICES_PPI_V1 select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK + select PLATFORM_LACKS_ACPI_S1 select PLATFORM_USES_FSP2_2 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index f6bfd42..1fb4703 100644 --- a/src/soc/intel/xeon_sp/Kconfig +++ b/src/soc/intel/xeon_sp/Kconfig @@ -50,6 +50,7 @@ select INTEL_DESCRIPTOR_MODE_CAPABLE select PARALLEL_MP_AP_WORK select PMC_GLOBAL_RESET_ENABLE_LOCK + select PLATFORM_LACKS_ACPI_S1 select POSTCAR_STAGE select REG_SCRIPT select SMM_TSEG diff --git a/src/southbridge/intel/common/acpi/sleepstates.asl b/src/southbridge/intel/common/acpi/sleepstates.asl index eae7642..7028c63 100644 --- a/src/southbridge/intel/common/acpi/sleepstates.asl +++ b/src/southbridge/intel/common/acpi/sleepstates.asl @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ Name(\_S0, Package(){0x0,0x0,0x0,0x0}) -#if !CONFIG(HAVE_ACPI_RESUME) +#if !CONFIG(HAVE_ACPI_RESUME) && !CONFIG(PLATFORM_LACKS_ACPI_S1) Name(\_S1, Package(){0x1,0x0,0x0,0x0}) #else Name(\_S3, Package(){0x5,0x0,0x0,0x0}) -- To view, visit https://review.coreboot.org/c/coreboot/+/74760 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic9e19410696240755e8714db53a0525284f3a2da Gerrit-Change-Number: 74760 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Reviewer: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Attention: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Jonathan Zhang <jon.zhixiong.zhang(a)gmail.com> Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2023