Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
93b2434f
Commit
93b2434f
authored
5 years ago
by
Sandrine Bailleux
Committed by
TrustedFirmware Code Review
5 years ago
Browse files
Options
Download
Plain Diff
Merge "Tegra: fixup GIC init from the 'on_finish' handler" into integration
parents
3be86517
2a3dd384
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plat/nvidia/tegra/common/tegra_pm.c
+12
-5
plat/nvidia/tegra/common/tegra_pm.c
with
12 additions
and
5 deletions
+12
-5
plat/nvidia/tegra/common/tegra_pm.c
View file @
93b2434f
...
...
@@ -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
;
/*
* Initialize the GIC cpu and distributor interfaces
*/
tegra_gic_pcpu_init
();
/*
* Check if we are exiting from deep sleep.
*/
if
(
target_state
->
pwr_domain_state
[
PLAT_MAX_PWR_LVL
]
==
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. */
console_switch_state
(
CONSOLE_FLAG_RUNTIME
);
...
...
@@ -183,6 +185,11 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state)
* access
*/
tegra_memctrl_tzram_setup
(
TEGRA_TZRAM_BASE
,
TEGRA_TZRAM_SIZE
);
}
else
{
/*
* Initialize the GIC cpu and distributor interfaces
*/
tegra_gic_pcpu_init
();
}
/*
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help