From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH] libxc/arm: Correctly handle the difference between virtual and physical address Date: Tue, 10 Dec 2013 17:36:21 +0000 Message-ID: <1386696982-23129-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VqREX-0005uy-Qh for xen-devel@lists.xenproject.org; Tue, 10 Dec 2013 17:36:34 +0000 Received: by mail-wg0-f53.google.com with SMTP id k14so5354745wgh.32 for ; Tue, 10 Dec 2013 09:36:32 -0800 (PST) List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, Julien Grall , ian.jackson@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org List-Id: xen-devel@lists.xenproject.org xc_dom_alloc_page deals with virtual address not physical address. When an ELF is loaded, virtual address and physical address may be different. Signed-off-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index a40e04d..75a6f1c 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -108,13 +108,15 @@ static int shared_info_arm(struct xc_dom_image *dom, void *ptr) static int vcpu_arm32(struct xc_dom_image *dom, void *ptr) { vcpu_guest_context_t *ctxt = ptr; + uint32_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; + uint32_t offset = dom->parms.virt_base - rambase; DOMPRINTF_CALLED(dom->xch); /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); - ctxt->user_regs.pc32 = dom->parms.virt_entry; + ctxt->user_regs.pc32 = dom->parms.virt_entry - offset; /* Linux boot protocol. See linux.Documentation/arm/Booting. */ ctxt->user_regs.r0_usr = 0; /* SBZ */ @@ -125,7 +127,7 @@ static int vcpu_arm32(struct xc_dom_image *dom, void *ptr) * like a valid pointer to a set of ATAGS or a DTB. */ ctxt->user_regs.r2_usr = dom->devicetree_blob ? - dom->devicetree_seg.vstart : 0xffffffff; + (dom->devicetree_seg.vstart - offset) : 0xffffffff; ctxt->sctlr = SCTLR_GUEST_INIT; @@ -280,15 +282,15 @@ int arch_setup_meminit(struct xc_dom_image *dom) if ( dom->devicetree_blob ) { - const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; - const uint64_t ramend = rambase + ( dom->total_pages << XC_PAGE_SHIFT ); + const uint64_t virtbase = dom->parms.virt_base; + const uint64_t virtend = virtbase + ( dom->total_pages << XC_PAGE_SHIFT ); const uint64_t dtbsize = ROUNDUP(dom->devicetree_size, XC_PAGE_SHIFT); /* Place at 128MB if there is sufficient RAM */ - if ( ramend >= rambase + 128*1024*1024 + dtbsize ) - dom->devicetree_seg.vstart = rambase + 128*1024*1024; + if ( virtend >= virtbase + 128*1024*1024 + dtbsize ) + dom->devicetree_seg.vstart = virtbase + 128*1024*1024; else /* otherwise at top of RAM */ - dom->devicetree_seg.vstart = ramend - dtbsize; + dom->devicetree_seg.vstart = virtend - dtbsize; dom->devicetree_seg.vend = dom->devicetree_seg.vstart + dom->devicetree_size; -- 1.7.10.4