diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-04-29 11:28:39 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-04-29 11:28:39 +0000 |
| commit | 591e2b3d1f67ad49a7b03fbd114bcb76bb5b2a05 (patch) | |
| tree | 07b6f69549c2e39fa5044ae71d0dec6cdaad398a | |
| parent | d697f9b8b79e4e93fae129718e2d8c23316dda3e (diff) | |
| parent | ff180993af519c2a7063c37ed12975c287c8c8e8 (diff) | |
Merge changes from topic "k3-coherency" into integration
* changes:
ti: k3: common: Mark sections for AM65x coherency workaround
ti: k3: common: Allow USE_COHERENT_MEM for K3
ti: k3: common: Fix RO data area size calculation
ti: k3: common: Remove unused STUB macro
| -rw-r--r-- | plat/ti/k3/common/k3_bl31_setup.c | 9 | ||||
| -rw-r--r-- | plat/ti/k3/common/k3_psci.c | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index b4ec3745..8bd73629 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_setup.c @@ -99,9 +99,12 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_plat_arch_setup(void) { const mmap_region_t bl_regions[] = { - MAP_REGION_FLAT(BL31_START, BL31_END - BL31_START, MT_MEMORY | MT_RW | MT_SECURE), - MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MT_CODE | MT_RO | MT_SECURE), - MAP_REGION_FLAT(BL_RO_DATA_BASE, BL_RO_DATA_END - BL_RO_DATA_END, MT_RO_DATA | MT_RO | MT_SECURE), + MAP_REGION_FLAT(BL31_START, BL31_END - BL31_START, MT_MEMORY | MT_RW | MT_SECURE), + MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MT_CODE | MT_RO | MT_SECURE), + MAP_REGION_FLAT(BL_RO_DATA_BASE, BL_RO_DATA_END - BL_RO_DATA_BASE, MT_RO_DATA | MT_RO | MT_SECURE), +#if USE_COHERENT_MEM + MAP_REGION_FLAT(BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE, MT_DEVICE | MT_RW | MT_SECURE), +#endif { /* sentinel */ } }; diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c index f66f12a3..c7754e99 100644 --- a/plat/ti/k3/common/k3_psci.c +++ b/plat/ti/k3/common/k3_psci.c @@ -17,10 +17,10 @@ #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" - -#define STUB() ERROR("stub %s called\n", __func__) +#endif uintptr_t k3_sec_entrypoint; @@ -115,6 +115,7 @@ 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) { @@ -122,6 +123,7 @@ static void __dead2 k3_pwr_domain_pwr_down_wfi(const psci_power_state_t flush_dcache_range((uintptr_t) psci_locks, sizeof(psci_locks)); psci_power_down_wfi(); } +#endif static void __dead2 k3_system_reset(void) { @@ -152,7 +154,9 @@ 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 |