diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-28 09:49:13 +0000 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-04-16 21:36:51 +0900 |
| commit | 840caf3b6e0c0e741ebe973588ea5c36558d7e38 (patch) | |
| tree | 4a16f2a8e6d300b2b3ea1cb3f1f58664c844e755 | |
| parent | 613666cd77fd957ed9a18e139981e552d0994ebd (diff) | |
| download | linux-3.10-840caf3b6e0c0e741ebe973588ea5c36558d7e38.tar.gz linux-3.10-840caf3b6e0c0e741ebe973588ea5c36558d7e38.tar.bz2 linux-3.10-840caf3b6e0c0e741ebe973588ea5c36558d7e38.zip | |
Revert "arm64: virt: ensure visibility of __boot_cpu_mode"
This reverts commit 82b2f495fba338d1e3098dde1df54944a9c19751. The
__boot_cpu_mode variable is flushed in head.S after being written,
therefore the additional cache flushing is no longer required.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/include/asm/virt.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 130e2be952c..215ad4649dd 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -22,7 +22,6 @@ #define BOOT_CPU_MODE_EL2 (0xe12) #ifndef __ASSEMBLY__ -#include <asm/cacheflush.h> /* * __boot_cpu_mode records what mode CPUs were booted in. @@ -38,20 +37,9 @@ extern u32 __boot_cpu_mode[2]; void __hyp_set_vectors(phys_addr_t phys_vector_base); phys_addr_t __hyp_get_vectors(void); -static inline void sync_boot_mode(void) -{ - /* - * As secondaries write to __boot_cpu_mode with caches disabled, we - * must flush the corresponding cache entries to ensure the visibility - * of their writes. - */ - __flush_dcache_area(__boot_cpu_mode, sizeof(__boot_cpu_mode)); -} - /* Reports the availability of HYP mode */ static inline bool is_hyp_mode_available(void) { - sync_boot_mode(); return (__boot_cpu_mode[0] == BOOT_CPU_MODE_EL2 && __boot_cpu_mode[1] == BOOT_CPU_MODE_EL2); } @@ -59,7 +47,6 @@ static inline bool is_hyp_mode_available(void) /* Check if the bootloader has booted CPUs in different modes */ static inline bool is_hyp_mode_mismatched(void) { - sync_boot_mode(); return __boot_cpu_mode[0] != __boot_cpu_mode[1]; } |