diff options
| author | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-04-28 12:28:39 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-05-07 11:19:47 +0100 |
| commit | 8cec598ba3b689b86d9dfc58bca5610bdc48f55a (patch) | |
| tree | 10a3622d6a57fe02b45112fd512297238ad93dc5 /services | |
| parent | e404d7f44a190b82332bb96daffa0c6239732218 (diff) | |
Correct usage of data and instruction barriers
The current code does not always use data and instruction
barriers as required by the architecture and frequently uses
barriers excessively due to their inclusion in all of the
write_*() helper functions.
Barriers should be used explicitly in assembler or C code
when modifying processor state that requires the barriers in
order to enable review of correctness of the code.
This patch removes the barriers from the helper functions and
introduces them as necessary elsewhere in the code.
PORTING NOTE: check any port of Trusted Firmware for use of
system register helper functions for reliance on the previous
barrier behaviour and add explicit barriers as necessary.
Fixes ARM-software/tf-issues#92
Change-Id: Ie63e187404ff10e0bdcb39292dd9066cb84c53bf
Diffstat (limited to 'services')
| -rw-r--r-- | services/std_svc/psci/psci_afflvl_off.c | 1 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_afflvl_suspend.c | 1 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_entry.S | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/services/std_svc/psci/psci_afflvl_off.c b/services/std_svc/psci/psci_afflvl_off.c index e007bc3..21a4d1a 100644 --- a/services/std_svc/psci/psci_afflvl_off.c +++ b/services/std_svc/psci/psci_afflvl_off.c @@ -82,6 +82,7 @@ static int psci_afflvl0_off(unsigned long mpidr, aff_map_node_t *cpu_node) sctlr = read_sctlr_el3(); sctlr &= ~SCTLR_C_BIT; write_sctlr_el3(sctlr); + isb(); /* ensure MMU disable takes immediate effect */ /* * CAUTION: This flush to the level of unification makes an assumption diff --git a/services/std_svc/psci/psci_afflvl_suspend.c b/services/std_svc/psci/psci_afflvl_suspend.c index dc12f7a..534e4a9 100644 --- a/services/std_svc/psci/psci_afflvl_suspend.c +++ b/services/std_svc/psci/psci_afflvl_suspend.c @@ -198,6 +198,7 @@ static int psci_afflvl0_suspend(unsigned long mpidr, sctlr = read_sctlr_el3(); sctlr &= ~SCTLR_C_BIT; write_sctlr_el3(sctlr); + isb(); /* ensure MMU disable takes immediate effect */ /* * CAUTION: This flush to the level of unification makes an assumption diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S index e2c690d..ec55a81 100644 --- a/services/std_svc/psci/psci_entry.S +++ b/services/std_svc/psci/psci_entry.S @@ -75,7 +75,6 @@ psci_aff_common_finish_entry: * --------------------------------------------- */ msr spsel, #0 - isb bl read_mpidr mov x19, x0 @@ -158,7 +157,7 @@ func __psci_cpu_suspend ret func final_wfi - dsb sy + dsb sy // ensure write buffer empty wfi wfi_spill: b wfi_spill |