Merge branch arm64/for-next/caches into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 18 Jun 2021 16:30:39 +0000 (17:30 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 18 Jun 2021 16:30:39 +0000 (17:30 +0100)
commit85c653fcc6353b44ee6cad18746be5bb2b08be42
treea9f5e507598f6cca7c0d574beb72bb27036184ed
parentcb5faa8c7df02a83dd18d8b5c4090a69e93523ec
parentfade9c2c6ee2baea7df8e6059b3f143c681e5ce4
Merge branch arm64/for-next/caches into kvmarm-master/next

arm64 cache management function cleanup from Fuad Tabba,
shared with the arm64 tree.

* arm64/for-next/caches:
  arm64: Rename arm64-internal cache maintenance functions
  arm64: Fix cache maintenance function comments
  arm64: sync_icache_aliases to take end parameter instead of size
  arm64: __clean_dcache_area_pou to take end parameter instead of size
  arm64: __clean_dcache_area_pop to take end parameter instead of size
  arm64: __clean_dcache_area_poc to take end parameter instead of size
  arm64: __flush_dcache_area to take end parameter instead of size
  arm64: dcache_by_line_op to take end parameter instead of size
  arm64: __inval_dcache_area to take end parameter instead of size
  arm64: Fix comments to refer to correct function __flush_icache_range
  arm64: Move documentation of dcache_by_line_op
  arm64: assembler: remove user_alt
  arm64: Downgrade flush_icache_range to invalidate
  arm64: Do not enable uaccess for invalidate_icache_range
  arm64: Do not enable uaccess for flush_icache_range
  arm64: Apply errata to swsusp_arch_suspend_exit
  arm64: assembler: add conditional cache fixups
  arm64: assembler: replace `kaddr` with `addr`

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/setup.c
arch/arm64/kvm/hyp/pgtable.c