From: Julien Grall <jgrall@amazon.com>
Date: Tue, 13 Apr 2021 16:15:39 +0000 (+0100)
Subject: Revert "xen/arm: mm: flush_page_to_ram() only need to clean to PoC"
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~698
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a33ad60cc3c2a107b43f9c368b1718eda3282760;p=xen.git

Revert "xen/arm: mm: flush_page_to_ram() only need to clean to PoC"

Some callers of flush_page_to_ram() expect the memory to be
invalidated. Reverts commit 9617d5f9c19d1d157629e1e436791509526e0ce5
to unblock OssTest.

Signed-off-by: Julien Grall <jgrall@amazon.com>
---

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 2f11d214e1..59f8a3f15f 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -529,7 +529,7 @@ void flush_page_to_ram(unsigned long mfn, bool sync_icache)
 {
     void *v = map_domain_page(_mfn(mfn));
 
-    clean_dcache_va_range(v, PAGE_SIZE);
+    clean_and_invalidate_dcache_va_range(v, PAGE_SIZE);
     unmap_domain_page(v);
 
     /*