Pull arm64 fixes from Catalin Marinas: - Stack size increased to 16K (similar to other 64-bit architectures) - Additional cache flushing for secondary CPUs boot mode * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: Change kernel stack size to 16K arm64: Fix definition of arm_pm_restart to match the declaration arm64: virt: ensure visibility of __boot_cpu_mode
Unified · Split
| @@ -24,10 +24,10 @@ · 23 unmodified lines | |||
| 24 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 25 | 25 | ||
| 26 | #ifndef CONFIG_ARM64_64K_PAGES | 26 | #ifndef CONFIG_ARM64_64K_PAGES |
| 27 | #define THREAD_SIZE_ORDER 1 | 27 | #define THREAD_SIZE_ORDER 2 |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #define THREAD_SIZE 8192 | 30 | #define THREAD_SIZE 16384 |
| 31 | #define THREAD_START_SP (THREAD_SIZE - 16) | 31 | #define THREAD_START_SP (THREAD_SIZE - 16) |
| 32 | 32 | ||
| 33 | #ifndef __ASSEMBLY__ | 33 | #ifndef __ASSEMBLY__ |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #define BOOT_CPU_MODE_EL2 (0x0e12b007) | 21 | #define BOOT_CPU_MODE_EL2 (0x0e12b007) |
| 22 | 22 | ||
| 23 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |
| 24 | #include <asm/cacheflush.h> | ||
| 24 | 25 | ||
| 25 | /* | 26 | /* |
| 26 | * __boot_cpu_mode records what mode CPUs were booted in. | 27 | * __boot_cpu_mode records what mode CPUs were booted in. |
| @@ -36,9 +37,20 @@ extern u32 __boot_cpu_mode[2]; · 9 unmodified lines | |||
| 36 | void __hyp_set_vectors(phys_addr_t phys_vector_base); | 37 | void __hyp_set_vectors(phys_addr_t phys_vector_base); |
| 37 | phys_addr_t __hyp_get_vectors(void); | 38 | phys_addr_t __hyp_get_vectors(void); |
| 38 | 39 | ||
| 40 | static inline void sync_boot_mode(void) | ||
| 41 | { | ||
| 42 | /* | ||
| 43 | * As secondaries write to __boot_cpu_mode with caches disabled, we | ||
| 44 | * must flush the corresponding cache entries to ensure the visibility | ||
| 45 | * of their writes. | ||
| 46 | */ | ||
| 47 | __flush_dcache_area(__boot_cpu_mode, sizeof(__boot_cpu_mode)); | ||
| 48 | } | ||
| 49 | |||
| 39 | /* Reports the availability of HYP mode */ | 50 | /* Reports the availability of HYP mode */ |
| 40 | static inline bool is_hyp_mode_available(void) | 51 | static inline bool is_hyp_mode_available(void) |
| 41 | { | 52 | { |
| 53 | sync_boot_mode(); | ||
| 42 | return (__boot_cpu_mode[0] == BOOT_CPU_MODE_EL2 && | 54 | return (__boot_cpu_mode[0] == BOOT_CPU_MODE_EL2 && |
| 43 | __boot_cpu_mode[1] == BOOT_CPU_MODE_EL2); | 55 | __boot_cpu_mode[1] == BOOT_CPU_MODE_EL2); |
| 44 | } | 56 | } |
| @@ -46,6 +58,7 @@ static inline bool is_hyp_mode_available(void) · 1 unmodified line | |||
| 46 | /* Check if the bootloader has booted CPUs in different modes */ | 58 | /* Check if the bootloader has booted CPUs in different modes */ |
| 47 | static inline bool is_hyp_mode_mismatched(void) | 59 | static inline bool is_hyp_mode_mismatched(void) |
| 48 | { | 60 | { |
| 61 | sync_boot_mode(); | ||
| 49 | return __boot_cpu_mode[0] != __boot_cpu_mode[1]; | 62 | return __boot_cpu_mode[0] != __boot_cpu_mode[1]; |
| 50 | } | 63 | } |
| 51 | 64 | ||
| @@ -121,7 +121,7 @@ · 120 unmodified lines | |||
| 121 | 121 | ||
| 122 | .macro get_thread_info, rd | 122 | .macro get_thread_info, rd |
| 123 | mov \rd, sp | 123 | mov \rd, sp |
| 124 | and \rd, \rd, #~((1 << 13) - 1) // top of 8K stack | 124 | and \rd, \rd, #~(THREAD_SIZE - 1) // top of stack |
| 125 | .endm | 125 | .endm |
| 126 | 126 | ||
| 127 | /* | 127 | /* |
| @@ -81,7 +81,7 @@ void soft_restart(unsigned long addr) · 80 unmodified lines | |||
| 81 | void (*pm_power_off)(void); | 81 | void (*pm_power_off)(void); |
| 82 | EXPORT_SYMBOL_GPL(pm_power_off); | 82 | EXPORT_SYMBOL_GPL(pm_power_off); |
| 83 | 83 | ||
| 84 | void (*arm_pm_restart)(char str, const char *cmd); | 84 | void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); |
| 85 | EXPORT_SYMBOL_GPL(arm_pm_restart); | 85 | EXPORT_SYMBOL_GPL(arm_pm_restart); |
| 86 | 86 | ||
| 87 | void arch_cpu_idle_prepare(void) | 87 | void arch_cpu_idle_prepare(void) |