diff options
author | Derek Basehore <dbasehore@chromium.org> | 2018-01-25 22:05:41 -0800 |
---|---|---|
committer | Derek Basehore <dbasehore@chromium.org> | 2018-01-25 22:09:23 -0800 |
commit | 3284ce15ba775432900684bca38983b7b34a33b8 (patch) | |
tree | 174757594fc405fec8dd06f092ab45e3ff21e161 /plat/rockchip | |
parent | b38c6f6b2d7b27af74793f1053f5a3d0d67d307d (diff) |
rockchip: Disable rdist before pwr_dm_suspend is called
This disables the redistributor before either of the pwr_dm_suspend
functions are called. This is because the rdist save code in the
rk3399 rockchip_soc_sys_pwr_dm_suspend function requires that each
redistributor be disabled before saving state.
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Diffstat (limited to 'plat/rockchip')
-rw-r--r-- | plat/rockchip/common/plat_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/rockchip/common/plat_pm.c b/plat/rockchip/common/plat_pm.c index cd88f60c..352dbc84 100644 --- a/plat/rockchip/common/plat_pm.c +++ b/plat/rockchip/common/plat_pm.c @@ -246,14 +246,14 @@ void rockchip_pwr_domain_suspend(const psci_power_state_t *target_state) if (RK_CORE_PWR_STATE(target_state) != PLAT_MAX_OFF_STATE) return; + /* Prevent interrupts from spuriously waking up this cpu */ + plat_rockchip_gic_cpuif_disable(); + if (RK_SYSTEM_PWR_STATE(target_state) == PLAT_MAX_OFF_STATE) rockchip_soc_sys_pwr_dm_suspend(); else rockchip_soc_cores_pwr_dm_suspend(); - /* Prevent interrupts from spuriously waking up this cpu */ - plat_rockchip_gic_cpuif_disable(); - /* Perform the common cluster specific operations */ if (RK_CLUSTER_PWR_STATE(target_state) == PLAT_MAX_OFF_STATE) plat_cci_disable(); |