From 5d09bd535504253593e05938cbddb092f7eb277a Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Tue, 24 Jul 2018 16:59:57 -0700 Subject: cr50: wait for RBOX_WAKEUP_INTR to be cleared Wait for the interrupt status register to be cleared before clearing the RBOX_WAKEUP_CLEAR bit. BUG=b:111801707 BRANCH=cr50 TEST=shutdown the AP. Make sure cr50 doesn't wake up immediately after entering deep sleep. Make sure RBOX wakeups still work. Change-Id: I8f02e387f212a5071d9bad0bf977ab09fd053756 Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/1149320 Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: Mary Ruthven Reviewed-by: Randall Spangler --- chip/g/idle.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'chip/g/idle.c') diff --git a/chip/g/idle.c b/chip/g/idle.c index dd745ec766..e0f82cb0ef 100644 --- a/chip/g/idle.c +++ b/chip/g/idle.c @@ -97,11 +97,6 @@ static void prepare_to_sleep(void) GC_PMU_EXITPD_MASK_TIMELS0_PD_EXIT_TIMER0_MASK | GC_PMU_EXITPD_MASK_TIMELS0_PD_EXIT_TIMER1_MASK; - /* Clear the RBOX wakeup signal and status bits */ - GREG32(RBOX, WAKEUP) = GC_RBOX_WAKEUP_CLEAR_MASK; - /* Wake on RBOX interrupts */ - GREG32(RBOX, WAKEUP) = GC_RBOX_WAKEUP_ENABLE_MASK; - if (utmi_wakeup_is_enabled() && idle_action != IDLE_DEEP_SLEEP) GR_PMU_EXITPD_MASK |= GC_PMU_EXITPD_MASK_UTMI_SUSPEND_N_MASK; -- cgit v1.2.1