Commit 2a3dd384 authored by Varun Wadekar's avatar Varun Wadekar
Browse files

Tegra: fixup GIC init from the 'on_finish' handler

Commit e9e19fb2

 accidentally removed the
GIC init routine required to initialze the distributor on system resume.

This patch fixes this anomaly and initializes the distributor on system
resume.
Signed-off-by: default avatarVarun Wadekar <vwadekar@nvidia.com>
Change-Id: I3fdc694404faa509952f2d90b1f16541165e583e
parent 577aca86
...@@ -151,17 +151,19 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state) ...@@ -151,17 +151,19 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state)
{ {
const plat_params_from_bl2_t *plat_params; const plat_params_from_bl2_t *plat_params;
/*
* Initialize the GIC cpu and distributor interfaces
*/
tegra_gic_pcpu_init();
/* /*
* Check if we are exiting from deep sleep. * Check if we are exiting from deep sleep.
*/ */
if (target_state->pwr_domain_state[PLAT_MAX_PWR_LVL] == if (target_state->pwr_domain_state[PLAT_MAX_PWR_LVL] ==
PSTATE_ID_SOC_POWERDN) { PSTATE_ID_SOC_POWERDN) {
/*
* On entering System Suspend state, the GIC loses power
* completely. Initialize the GIC global distributor and
* GIC cpu interfaces.
*/
tegra_gic_init();
/* Restart console output. */ /* Restart console output. */
console_switch_state(CONSOLE_FLAG_RUNTIME); console_switch_state(CONSOLE_FLAG_RUNTIME);
...@@ -183,6 +185,11 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state) ...@@ -183,6 +185,11 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state)
* access * access
*/ */
tegra_memctrl_tzram_setup(TEGRA_TZRAM_BASE, TEGRA_TZRAM_SIZE); tegra_memctrl_tzram_setup(TEGRA_TZRAM_BASE, TEGRA_TZRAM_SIZE);
} else {
/*
* Initialize the GIC cpu and distributor interfaces
*/
tegra_gic_pcpu_init();
} }
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment