From: Julien Grall Date: Tue, 12 Jul 2016 13:59:28 +0000 (+0100) Subject: xen/arm: map_regions_rw_cache: Map the region with p2m->default_access X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~781 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abea864be5bf96608165c4cc2704da1da4cad3d5;p=xen.git xen/arm: map_regions_rw_cache: Map the region with p2m->default_access The parameter 'access' is used by memaccess to restrict temporarily the permission. This parameter should not be used for other purpose (such as restricting permanently the permission). Instead, we should use the default access requested by memacess. When it is not enabled, the access will be p2m_access_rwx (i.e no restriction applied). The type p2m_mmio_direct will map the region read-write and non-executable before any further restriction by memaccess. Note that this is already the resulting permission with the curreent combination of the type and the access. So there is no functional change. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 1cfb62bba7..fcc45130d1 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1231,7 +1231,7 @@ int map_regions_rw_cache(struct domain *d, pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_MEM, 0, p2m_mmio_direct, - p2m_access_rw); + d->arch.p2m.default_access); } int unmap_regions_rw_cache(struct domain *d, @@ -1244,7 +1244,7 @@ int unmap_regions_rw_cache(struct domain *d, pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_MEM, 0, p2m_invalid, - p2m_access_rw); + d->arch.p2m.default_access); } int map_mmio_regions(struct domain *d,