| Message ID | 1474479154-20991-13-git-send-email-konrad.wilk@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Konrad, On 21/09/16 18:32, Konrad Rzeszutek Wilk wrote: > This is similar to commit fb9d877a9c0f3d4d15db8f6e0c5506ea641862c6 > "xen/arm64: Add an helper to invalidate all instruction caches" > except it is on ARM32 side. > > When we are flushing the cache we are most likley also want s/likley/likely/ > to flush the branch predictor too. Hence we add this. > > And we also need to follow this with dsb()/isb() which are > memory barriers(). > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Julien Grall <julien.grall@arm.com> Regards,
diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index bccdbfc..ea4b312 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -30,6 +30,22 @@ static inline void write_pte(lpae_t *p, lpae_t pte) #define __clean_and_invalidate_dcache_one(R) STORE_CP32(R, DCCIMVAC) /* + * Invalidate all instruction caches in Inner Shareable domain to PoU. + * We also need to flush the branch predictor for ARMv7 as it may be + * architecturally visible to the software (see B2.2.4 in ARM DDI 0406C.b). + */ +static inline void invalidate_icache(void) +{ + asm volatile ( + CMD_CP32(ICIALLUIS) /* Flush I-cache. */ + CMD_CP32(BPIALLIS) /* Flush branch predictor. */ + : : : "memory"); + + dsb(ish); /* Ensure completion of the flush I-cache */ + isb(); /* Synchronize fetched instruction stream. */ +} + +/* * Flush all hypervisor mappings from the TLB and branch predictor of * the local processor. *
This is similar to commit fb9d877a9c0f3d4d15db8f6e0c5506ea641862c6 "xen/arm64: Add an helper to invalidate all instruction caches" except it is on ARM32 side. When we are flushing the cache we are most likley also want to flush the branch predictor too. Hence we add this. And we also need to follow this with dsb()/isb() which are memory barriers(). Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- Cc: Julien Grall <julien.grall@arm.com> Cc: Stefano Stabellini <sstabellini@kernel.org> v2: First submission v3: Squashed "xen/arm32/livepatch: Add BPICALLIS to helper to invalidate all instruction caches" in this patch. v4: Added dsb()/isb() instructions. --- xen/include/asm-arm/arm32/page.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)