summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiandi An <anjiandi@codeaurora.org>2016-12-27 18:47:32 -0600
committerStefano Stabellini <sstabellini@kernel.org>2017-01-03 10:06:13 -0800
commit0b47a6bd1150f4846b1d61925a4cc5a96593a541 (patch)
treeec91ad5336033603d3cf1aa47a8ee5718530edd7
parentf9751a60f17eb09e1d1bd036daaddc3ea3a8bed6 (diff)
downloadlwn-0b47a6bd1150f4846b1d61925a4cc5a96593a541.tar.gz
lwn-0b47a6bd1150f4846b1d61925a4cc5a96593a541.zip
Xen: ARM: Zero reserved fields of xatp before making hypervisor call
Ensure all reserved fields of xatp are zero before making hypervisor call to XEN in xen_map_device_mmio(). xenmem_add_to_physmap_one() in XEN fails the mapping request if extra.res reserved field in xatp is not zero for XENMAPSPACE_dev_mmio request. Signed-off-by: Jiandi An <anjiandi@codeaurora.org> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-rw-r--r--drivers/xen/arm-device.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
index 778acf80aacb..85dd20e05726 100644
--- a/drivers/xen/arm-device.c
+++ b/drivers/xen/arm-device.c
@@ -58,9 +58,13 @@ static int xen_map_device_mmio(const struct resource *resources,
xen_pfn_t *gpfns;
xen_ulong_t *idxs;
int *errs;
- struct xen_add_to_physmap_range xatp;
for (i = 0; i < count; i++) {
+ struct xen_add_to_physmap_range xatp = {
+ .domid = DOMID_SELF,
+ .space = XENMAPSPACE_dev_mmio
+ };
+
r = &resources[i];
nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
@@ -87,9 +91,7 @@ static int xen_map_device_mmio(const struct resource *resources,
idxs[j] = XEN_PFN_DOWN(r->start) + j;
}
- xatp.domid = DOMID_SELF;
xatp.size = nr;
- xatp.space = XENMAPSPACE_dev_mmio;
set_xen_guest_handle(xatp.gpfns, gpfns);
set_xen_guest_handle(xatp.idxs, idxs);