diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-06-10 09:40:25 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-06-10 09:40:25 +0000 |
| commit | cb60e71e835e66001605cd08e5172d2e2b730d1f (patch) | |
| tree | 9fc249521b2fb62d987e4776ccba10c24ddb42d5 /plat | |
| parent | f5b904ea97520deb0ea50812e2eaedfe0e868a5d (diff) | |
| parent | 48d6b2643462b43ed617ca3751121a5587881e44 (diff) | |
| download | platform_external_arm-trusted-firmware-cb60e71e835e66001605cd08e5172d2e2b730d1f.tar.gz platform_external_arm-trusted-firmware-cb60e71e835e66001605cd08e5172d2e2b730d1f.tar.bz2 platform_external_arm-trusted-firmware-cb60e71e835e66001605cd08e5172d2e2b730d1f.zip | |
Merge changes from topic "jts/ti_fix" into integration
* changes:
ti: k3: common: Remove coherency workaround for AM65x
ti: k3: common: Use coherent memory for shared data
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/ti/k3/common/k3_psci.c | 18 | ||||
| -rw-r--r-- | plat/ti/k3/common/plat_common.mk | 8 |
2 files changed, 2 insertions, 24 deletions
diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c index c7754e994..de9cefe5b 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 2e5f58453..83e9c62a0 100644 --- a/plat/ti/k3/common/plat_common.mk +++ b/plat/ti/k3/common/plat_common.mk @@ -12,8 +12,8 @@ COLD_BOOT_SINGLE_CPU := 1 PROGRAMMABLE_RESET_ADDRESS:= 1 # System coherency is managed in hardware -HW_ASSISTED_COHERENCY := 1 -USE_COHERENT_MEM := 0 +WARMBOOT_ENABLE_DCACHE_EARLY := 1 +USE_COHERENT_MEM := 1 # A53 erratum for SoC. (enable them all) ERRATA_A53_826319 := 1 @@ -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)) |