summaryrefslogtreecommitdiffstats
path: root/arch/arm/xen
diff options
context:
space:
mode:
authorEric Trudeau <etrudeau@broadcom.com>2013-12-04 11:39:33 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-12-04 11:39:33 +0000
commitc94cae53f9e564484f906a79be5639fc66e8cb02 (patch)
tree852b4a17d6d7ddaa9ea228b4b815b0f7e3e04f55 /arch/arm/xen
parent14883a75ec76b44759385fb12629f4a0f1aef4e3 (diff)
downloadop-kernel-dev-c94cae53f9e564484f906a79be5639fc66e8cb02.zip
op-kernel-dev-c94cae53f9e564484f906a79be5639fc66e8cb02.tar.gz
XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn
From: Eric Trudeau <etrudeau@broadcom.com> xen_hvm_resume_frames stores the physical address of the grant table. englighten.c was incorrectly setting it as if it was a page frame number. This caused the table to be mapped into the guest at an unexpected physical address. Additionally, a warning is improved to include the grant table address which failed in xen_remap. Signed-off-by: Eric Trudeau <etrudeau@broadcom.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'arch/arm/xen')
-rw-r--r--arch/arm/xen/enlighten.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 83e4f95..6a288c7 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -224,10 +224,10 @@ static int __init xen_guest_init(void)
}
if (of_address_to_resource(node, GRANT_TABLE_PHYSADDR, &res))
return 0;
- xen_hvm_resume_frames = res.start >> PAGE_SHIFT;
+ xen_hvm_resume_frames = res.start;
xen_events_irq = irq_of_parse_and_map(node, 0);
pr_info("Xen %s support found, events_irq=%d gnttab_frame_pfn=%lx\n",
- version, xen_events_irq, xen_hvm_resume_frames);
+ version, xen_events_irq, (xen_hvm_resume_frames >> PAGE_SHIFT));
xen_domain_type = XEN_HVM_DOMAIN;
xen_setup_features();
OpenPOWER on IntegriCloud