diff options
| author | Andrew F. Davis <afd@ti.com> | 2019-04-25 14:33:30 -0400 |
|---|---|---|
| committer | John Tsichritzis <john.tsichritzis@arm.com> | 2019-06-06 11:20:26 +0100 |
| commit | 48d6b2643462b43ed617ca3751121a5587881e44 (patch) | |
| tree | 351d6dc998168666a4d8211372834e523e7d7f26 /plat/ti | |
| parent | 65f7b81728d0701e93bd13cee4e88375ec9e9b17 (diff) | |
ti: k3: common: Remove coherency workaround for AM65x
We previously left our caches on during power-down to prevent any
non-caching accesses to memory that is cached by other cores. Now with
the last accessed areas all being marked as non-cached by
USE_COHERENT_MEM we can rely on that to workaround our interconnect
issues. Remove the old workaround.
Change-Id: Idadb7696d1449499d1edff4f6f62ab3b99d1efb7
Signed-off-by: Andrew F. Davis <afd@ti.com>
Diffstat (limited to 'plat/ti')
| -rw-r--r-- | plat/ti/k3/common/k3_psci.c | 18 | ||||
| -rw-r--r-- | plat/ti/k3/common/plat_common.mk | 4 |
2 files changed, 0 insertions, 22 deletions
diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c index c7754e99..de9cefe5 100644 --- a/plat/ti/k3/common/k3_psci.c +++ b/plat/ti/k3/common/k3_psci.c @@ -17,11 +17,6 @@ #include <k3_gicv3.h> #include <ti_sci.h> -#ifdef TI_AM65X_WORKAROUND -/* Need to flush psci internal locks before shutdown or their values are lost */ -#include "../../../../lib/psci/psci_private.h" -#endif - uintptr_t k3_sec_entrypoint; static void k3_cpu_standby(plat_local_state_t cpu_state) @@ -115,16 +110,6 @@ void k3_pwr_domain_on_finish(const psci_power_state_t *target_state) k3_gic_cpuif_enable(); } -#ifdef TI_AM65X_WORKAROUND -static void __dead2 k3_pwr_domain_pwr_down_wfi(const psci_power_state_t - *target_state) -{ - flush_cpu_data(psci_svc_cpu_data); - flush_dcache_range((uintptr_t) psci_locks, sizeof(psci_locks)); - psci_power_down_wfi(); -} -#endif - static void __dead2 k3_system_reset(void) { /* Send the system reset request to system firmware */ @@ -154,9 +139,6 @@ static const plat_psci_ops_t k3_plat_psci_ops = { .pwr_domain_on = k3_pwr_domain_on, .pwr_domain_off = k3_pwr_domain_off, .pwr_domain_on_finish = k3_pwr_domain_on_finish, -#ifdef TI_AM65X_WORKAROUND - .pwr_domain_pwr_down_wfi = k3_pwr_domain_pwr_down_wfi, -#endif .system_reset = k3_system_reset, .validate_power_state = k3_validate_power_state, .validate_ns_entrypoint = k3_validate_ns_entrypoint diff --git a/plat/ti/k3/common/plat_common.mk b/plat/ti/k3/common/plat_common.mk index 3613a0e2..83e9c62a 100644 --- a/plat/ti/k3/common/plat_common.mk +++ b/plat/ti/k3/common/plat_common.mk @@ -28,10 +28,6 @@ ERRATA_A72_859971 := 1 # Split out RO data into a non-executable section SEPARATE_CODE_AND_RODATA := 1 -# Leave the caches enabled on core powerdown path -TI_AM65X_WORKAROUND := 1 -$(eval $(call add_define,TI_AM65X_WORKAROUND)) - MULTI_CONSOLE_API := 1 TI_16550_MDR_QUIRK := 1 $(eval $(call add_define,TI_16550_MDR_QUIRK)) |