diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-10-06 18:46:23 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-23 21:09:01 +0800 |
| commit | 3a3fcbe69f048f87aa59d72b73d9958af800bd2a (patch) | |
| tree | 0ca30cfbd98069e986f9fa4ff498e272dd5903da /arch/arm64/kernel/suspend.c | |
| parent | cffbfed25fd96d4db65450b2206fc6c6e0b24e9a (diff) | |
arm64: flush: use local TLB and I-cache invalidation
There are a number of places where a single CPU is running with a
private page-table and we need to perform maintenance on the TLB and
I-cache in order to ensure correctness, but do not require the operation
to be broadcast to other CPUs.
This patch adds local variants of tlb_flush_all and __flush_icache_all
to support these use-cases and updates the callers respectively.
__local_flush_icache_all also implies an isb, since it is intended to be
used synchronously.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: David Daney <david.daney@cavium.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 8e63d38876691756f9bc6930850f1fb77809be1b)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
arch/arm64/kernel/suspend.c
Diffstat (limited to 'arch/arm64/kernel/suspend.c')
| -rw-r--r-- | arch/arm64/kernel/suspend.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c index dd6ad81d53aa..874ced5f5fac 100644 --- a/arch/arm64/kernel/suspend.c +++ b/arch/arm64/kernel/suspend.c @@ -97,13 +97,13 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) * them back to complete the address space configuration * restoration before returning. */ - cpu_set_reserved_ttbr0(); - flush_tlb_all(); - cpu_set_default_tcr_t0sz(); - - if (mm != &init_mm) + if (mm == &init_mm) + cpu_set_reserved_ttbr0(); + else cpu_switch_mm(mm->pgd, mm); + local_flush_tlb_all(); + /* * Restore per-cpu offset before any kernel * subsystem relying on it has a chance to run. |