diff options
Diffstat (limited to 'power/amd_x86.c')
| -rw-r--r-- | power/amd_x86.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/power/amd_x86.c b/power/amd_x86.c index 2a35849039..e5b44a313f 100644 --- a/power/amd_x86.c +++ b/power/amd_x86.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,6 +13,7 @@ #include "hooks.h" #include "lid_switch.h" #include "lpc.h" +#include "power/amd_x86.h" #include "power.h" #include "power_button.h" #include "system.h" @@ -231,8 +232,7 @@ static void lpc_s0ix_resume_restore_masks(void) backup_sci_mask = backup_smi_mask = 0; } -__override void power_chipset_handle_sleep_hang( - enum sleep_hang_type hang_type) +__override void power_chipset_handle_sleep_hang(enum sleep_hang_type hang_type) { /* * Wake up the AP so they don't just chill in a non-suspended state and @@ -274,15 +274,15 @@ void power_reset_host_sleep_state(void) #ifdef CONFIG_POWER_TRACK_HOST_SLEEP_STATE -__overridable void power_board_handle_host_sleep_event( - enum host_sleep_event state) +__overridable void +power_board_handle_host_sleep_event(enum host_sleep_event state) { /* Default weak implementation -- no action required. */ } -__override void power_chipset_handle_host_sleep_event( - enum host_sleep_event state, - struct host_sleep_event_context *ctx) +__override void +power_chipset_handle_host_sleep_event(enum host_sleep_event state, + struct host_sleep_event_context *ctx) { power_board_handle_host_sleep_event(state); @@ -301,7 +301,6 @@ __override void power_chipset_handle_host_sleep_event( sleep_set_notify(SLEEP_NOTIFY_SUSPEND); sleep_start_suspend(ctx); - power_signal_enable_interrupt(GPIO_PCH_SLP_S0_L); } else if (state == HOST_SLEEP_EVENT_S0IX_RESUME) { /* * Wake up chipset task and indicate to power state machine that @@ -310,7 +309,6 @@ __override void power_chipset_handle_host_sleep_event( sleep_set_notify(SLEEP_NOTIFY_RESUME); task_wake(TASK_ID_CHIPSET); lpc_s0ix_resume_restore_masks(); - power_signal_disable_interrupt(GPIO_PCH_SLP_S0_L); sleep_complete_resume(ctx); /* * If the sleep signal timed out and never transitioned, then @@ -319,8 +317,6 @@ __override void power_chipset_handle_host_sleep_event( * mask to its S0 state now. */ power_update_wake_mask(); - } else if (state == HOST_SLEEP_EVENT_DEFAULT_RESET) { - power_signal_disable_interrupt(GPIO_PCH_SLP_S0_L); } #endif /* CONFIG_POWER_S0IX */ } @@ -438,9 +434,9 @@ enum power_state power_handle_state(enum power_state state) * Ignore the SLP_S0 assertions in idle scenario by checking * the host sleep state. */ - else if (power_get_host_sleep_state() - == HOST_SLEEP_EVENT_S0IX_SUSPEND && - gpio_get_level(GPIO_PCH_SLP_S0_L) == 0) { + else if (power_get_host_sleep_state() == + HOST_SLEEP_EVENT_S0IX_SUSPEND && + gpio_get_level(GPIO_PCH_SLP_S0_L) == 0) { return POWER_S0S0ix; } #endif |