Skip to content

WIP: fizz: soc/intel/pmclib: Fix boot issue after power loss when using USB-C PD #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
movr4x wants to merge 1 commit into
base: MrChromebox-2512
Choose a base branch
from
Draft

WIP: fizz: soc/intel/pmclib: Fix boot issue after power loss when using USB-C PD #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ec/google/chromeec/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ config EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
config EC_GOOGLE_CHROMEEC_AFTER_G3_STATE
bool "Enable syncing ChromeEC After G3 State with CFR at boot"
depends on DRIVERS_OPTION_CFR_ENABLED
select HAVE_EC_POWER_STATE_AFTER_FAILURE
help
Enable syncing ChromeEC After G3 State with CFR at boot via host
command, otherwise ChromeEC default compiled after G3 behavior
Expand Down
3 changes: 3 additions & 0 deletions src/mainboard/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ config ENABLE_POWER_BUTTON
def_bool y if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_ENABLE
def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE

config HAVE_EC_POWER_STATE_AFTER_FAILURE
bool

config HAVE_POWER_STATE_AFTER_FAILURE
bool

Expand Down
10 changes: 8 additions & 2 deletions src/soc/intel/common/block/pmc/pmclib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,8 +776,14 @@ void pmc_clear_pmcon_sts(void)

void pmc_set_power_failure_state(const bool target_on)
{
const unsigned int state = get_uint_option("power_on_after_fail",
CONFIG_MAINBOARD_POWER_FAILURE_STATE);
/*
* Always set to "auto on" to avoid potential conflicts with EC that
* can result in the inability to boot if EC handles after G3.
*/
const unsigned int state = (CONFIG(HAVE_EC_POWER_STATE_AFTER_FAILURE) ?
MAINBOARD_POWER_STATE_ON :
get_uint_option("power_on_after_fail",
CONFIG_MAINBOARD_POWER_FAILURE_STATE));

/*
* On the shutdown path (target_on == false), we only need to
Expand Down