From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 5/5] xen: arm: correctly round down MFN to 1GB boundary make sure pagetable mask macros as physaddr size Date: Mon, 7 Oct 2013 12:38:16 +0100 Message-ID: <1381145896-25890-5-git-send-email-ian.campbell@citrix.com> References: <1381145870.21562.93.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1381145870.21562.93.camel@kazak.uk.xensource.com> 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.xen.org Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , anup.patel@linaro.org, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org ~FIRST_MASK is nothing like correct for rounding down an MFN. It is the inverse *and* an address not a framenumber so wrong in every dimension! We cannot use FIRST_MASK since that would mask off any zeroeth level bits. Instead calculate the correct value from FIRST_SIZE. Signed-off-by: Ian Campbell --- xen/arch/arm/mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index e48d473..887930a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -656,7 +656,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, end_mfn = base_mfn + nr_mfns; /* Align to previous 1GB boundary */ - base_mfn &= ~FIRST_MASK; + base_mfn &= ~((FIRST_SIZE>>PAGE_SHIFT)-1); offset = base_mfn - xenheap_mfn_start; vaddr = DIRECTMAP_VIRT_START + offset*PAGE_SIZE; -- 1.7.10.4