diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-03-17 12:34:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 12:34:37 +0000 |
| commit | 510a9de79fe14460ec591bba4aa8790665c3f86a (patch) | |
| tree | e35d84d8351a885bf3154665b14554454e58d452 /bl31 | |
| parent | 28ee754d15a885c290a42827b5626df05f0a8676 (diff) | |
| parent | b0408e87f7dfbdfe3e00cd3c1421b2939dd209ca (diff) | |
Merge pull request #860 from jeenu-arm/hw-asstd-coh
Patches for platforms with hardware-assisted coherency
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 4a710bdf..62383290 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -180,24 +180,29 @@ func bl31_warm_entrypoint _init_c_runtime=0 \ _exception_vectors=runtime_exceptions - /* -------------------------------------------- - * Enable the MMU with the DCache disabled. It - * is safe to use stacks allocated in normal - * memory as a result. All memory accesses are - * marked nGnRnE when the MMU is disabled. So - * all the stack writes will make it to memory. - * All memory accesses are marked Non-cacheable - * when the MMU is enabled but D$ is disabled. - * So used stack memory is guaranteed to be - * visible immediately after the MMU is enabled - * Enabling the DCache at the same time as the - * MMU can lead to speculatively fetched and - * possibly stale stack memory being read from - * other caches. This can lead to coherency - * issues. - * -------------------------------------------- + /* + * We're about to enable MMU and participate in PSCI state coordination. + * + * The PSCI implementation invokes platform routines that enable CPUs to + * participate in coherency. On a system where CPUs are not + * cache-coherent out of reset, having caches enabled until such time + * might lead to coherency issues (resulting from stale data getting + * speculatively fetched, among others). Therefore we keep data caches + * disabled while enabling the MMU, thereby forcing data accesses to + * have non-cacheable, nGnRnE attributes (these will always be coherent + * with main memory). + * + * On systems with hardware-assisted coherency, where CPUs are expected + * to be cache-coherent out of reset without needing explicit software + * intervention, PSCI need not invoke platform routines to enter + * coherency (as CPUs already are); and there's no reason to have caches + * disabled either. */ +#if HW_ASSISTED_COHERENCY + mov x0, #0 +#else mov x0, #DISABLE_DCACHE +#endif bl bl31_plat_enable_mmu bl psci_warmboot_entrypoint |