From: Julien Grall <julien.grall@arm.com>
Date: Tue, 14 Jun 2016 11:50:26 +0000 (+0100)
Subject: xen/arm: map_dev_mmio_region: The iomem permission check should be done on MFN
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~811
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=652a11ee2fa710c05df09b21cfeab6bad94e06cc;p=xen.git

xen/arm: map_dev_mmio_region: The iomem permission check should be done on MFN

The helper iomem_access_permitted expects MFNs in parameters and not
GNFs. Thankfully only the hardware domain can call this function and
it will always be with GFNS == MFNs for now.

Also, fix the printf to use the MFN range and not the GFN one.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index aa4e7747dd..0395a40bc0 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1277,14 +1277,14 @@ int map_dev_mmio_region(struct domain *d,
 {
     int res;
 
-    if ( !(nr && iomem_access_permitted(d, start_gfn, start_gfn + nr - 1)) )
+    if ( !(nr && iomem_access_permitted(d, mfn, mfn + nr - 1)) )
         return 0;
 
     res = map_mmio_regions(d, start_gfn, nr, mfn);
     if ( res < 0 )
     {
         printk(XENLOG_G_ERR "Unable to map [%#lx - %#lx] in Dom%d\n",
-               start_gfn, start_gfn + nr - 1, d->domain_id);
+               mfn, mfn + nr - 1, d->domain_id);
         return res;
     }