diff options
| -rw-r--r-- | plat/imx/imx8qm/imx8qm_psci.c | 16 | ||||
| -rw-r--r-- | plat/imx/imx8qm/platform.mk | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/plat/imx/imx8qm/imx8qm_psci.c b/plat/imx/imx8qm/imx8qm_psci.c index 78cd5803..d96a6cde 100644 --- a/plat/imx/imx8qm/imx8qm_psci.c +++ b/plat/imx/imx8qm/imx8qm_psci.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. - * Copyright 2017 NXP + * Copyright 2018 NXP * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -55,8 +55,11 @@ const static int ap_core_index[PLATFORM_CORE_COUNT] = { SC_R_A53_3, SC_R_A72_0, SC_R_A72_1, }; -static unsigned int a53_cpu_on_number; -static unsigned int a72_cpu_on_number; +/* need to enable USE_COHERENT_MEM to avoid coherence issue */ +#if USE_COHERENT_MEM +static unsigned int a53_cpu_on_number __section("tzfw_coherent_mem"); +static unsigned int a72_cpu_on_number __section("tzfw_coherent_mem"); +#endif int imx_pwr_domain_on(u_register_t mpidr) { @@ -144,6 +147,12 @@ void imx_pwr_domain_off(const psci_power_state_t *target_state) tf_printf("turn off cluster:%d core:%d\n", cluster_id, cpu_id); } +void __dead2 imx_pwr_domain_pwr_down_wfi(const psci_power_state_t *target_state) +{ + while (1) + wfi(); +} + int imx_validate_ns_entrypoint(uintptr_t ns_entrypoint) { /* TODO */ @@ -258,6 +267,7 @@ static const plat_psci_ops_t imx_plat_psci_ops = { .cpu_standby = imx_cpu_standby, .pwr_domain_suspend = imx_domain_suspend, .pwr_domain_suspend_finish = imx_domain_suspend_finish, + .pwr_domain_pwr_down_wfi = imx_pwr_domain_pwr_down_wfi, .get_sys_suspend_power_state = imx_get_sys_suspend_power_state, .system_reset = imx_system_reset, .system_off = imx_system_off, diff --git a/plat/imx/imx8qm/platform.mk b/plat/imx/imx8qm/platform.mk index d12c1a45..ca3d0c1a 100644 --- a/plat/imx/imx8qm/platform.mk +++ b/plat/imx/imx8qm/platform.mk @@ -1,6 +1,6 @@ # # Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. -# Copyright 2017 NXP +# Copyright 2018 NXP # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -59,7 +59,7 @@ include plat/imx/common/sci/sci_api.mk ENABLE_PLAT_COMPAT := 0 MULTI_CONSOLE_API := 1 -USE_COHERENT_MEM := 0 +USE_COHERENT_MEM := 1 RESET_TO_BL31 := 1 ERROR_DEPRECATED := 1 A53_DISABLE_NON_TEMPORAL_HINT := 0 |