From 9c35572f359cd6f71aa20b0991c74e032b8721d2 Mon Sep 17 00:00:00 2001
From: Julien Grall <julien.grall@arm.com>
Date: Thu, 29 Nov 2018 19:14:43 +0000
Subject: [PATCH] xen/arm: domctl: Use typesafe gfn in XEN_DOMCTL_cacheflush

This will make changes in a follow-up patch easier.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---
 xen/arch/arm/domctl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index c10f568aad..20691528a6 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -52,16 +52,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d,
     {
     case XEN_DOMCTL_cacheflush:
     {
-        unsigned long s = domctl->u.cacheflush.start_pfn;
-        unsigned long e = s + domctl->u.cacheflush.nr_pfns;
+        gfn_t s = _gfn(domctl->u.cacheflush.start_pfn);
+        gfn_t e = gfn_add(s, domctl->u.cacheflush.nr_pfns);
 
         if ( domctl->u.cacheflush.nr_pfns > (1U<<MAX_ORDER) )
             return -EINVAL;
 
-        if ( e < s )
+        if ( gfn_x(e) < gfn_x(s) )
             return -EINVAL;
 
-        return p2m_cache_flush_range(d, _gfn(s), _gfn(e));
+        return p2m_cache_flush_range(d, s, e);
     }
     case XEN_DOMCTL_bind_pt_irq:
     {
-- 
2.30.2