diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2018-07-30 18:29:21 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-07-30 19:58:11 +0300 |
| commit | 140aada48b5f1a8bed3ba4afb5fc59220651657f (patch) | |
| tree | 3c73e8a8d6771a2b2908ff34873094f6115d3789 /arch/arm64/kernel/machine_kexec.c | |
| parent | efd112353bf7c0f9d50f928b449ea9da0ee9554b (diff) | |
| download | linux-140aada48b5f1a8bed3ba4afb5fc59220651657f.tar.xz | |
arm64: kexec: machine_kexec should call __flush_icache_range
machine_kexec flushes the reboot_code_buffer from the icache
after stopping the other cpus.
Commit 3b8c9f1cdfc5 ("arm64: IPI each CPU after invalidating the I-cache
for kernel mappings") added an IPI call to flush_icache_range, which
causes a hang here, so replace the call with __flush_icache_range
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm64/kernel/machine_kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index f62effc6e064..e8c02832b7ad 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -184,7 +184,7 @@ void machine_kexec(struct kimage *kimage) /* Flush the reboot_code_buffer in preparation for its execution. */ __flush_dcache_area(reboot_code_buffer, arm64_relocate_new_kernel_size); - flush_icache_range((uintptr_t)reboot_code_buffer, + __flush_icache_range((uintptr_t)reboot_code_buffer, arm64_relocate_new_kernel_size); /* Flush the kimage list and its buffers. */ |