From patchwork Mon Jul 14 16:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33615 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 296CB20CAD for ; Mon, 14 Jul 2014 16:28:11 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id s7sf9498240qap.10 for ; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=6ZWmrq+O+6dR7+jl2KE2Pa5h4wqH8/4Yi9aHOhpN3RU=; b=F0ma2bEScv8WmEqtMpLHfK2Is+AJnD9DMxdSb1Ab1ShOwtYq3A/4SXNxxAXaG8JK36 zyDRNqopLjfzbooRwW1eh98P2YUkkddENxJ5uYyntYeBgnmY8eG+5/0lSAFeB+UCmmL5 uEME1waKepItq7oPtQXxXvQ84yESWKu2IF6pqfoEFZMh0PmB2e9lTgzSi6AW7ZYV08M4 PMUSWR4zeFl2QnuMkZ3ozgi/EGQOcFhKV/qXV8gfP1Q3mKBq9dfXPkahOou2xuNr1/Pm TDvR07xkabqEYhyHe+EP3ejXh3h465QlcowE1FU9AMbvwc2km6941OU5jljZyMdN3tgb nUVg== X-Gm-Message-State: ALoCoQlK8ypOn0PbgtYMLJ/oXQC6n1w07A+NOkM9Psy3gHaKmtyQwDMhTAtQMQWMHH5EC963FRgY X-Received: by 10.52.230.71 with SMTP id sw7mr7134134vdc.9.1405355290903; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.132 with SMTP id 4ls1093326qgj.12.gmail; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-Received: by 10.220.177.133 with SMTP id bi5mr3704694vcb.26.1405355290815; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id si10si5556481vcb.10.2014.07.14.09.28.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:28:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hq11so7777429vcb.13 for ; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr17364555vcb.16.1405355290733; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp147797vcb; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) X-Received: by 10.42.76.205 with SMTP id f13mr5148569ick.63.1405355290233; Mon, 14 Jul 2014 09:28:10 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h5si12365996igo.50.2014.07.14.09.28.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:28:10 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j5s-0006Dh-4t; Mon, 14 Jul 2014 16:27:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j5r-0006DQ-AC for xen-devel@lists.xen.org; Mon, 14 Jul 2014 16:27:11 +0000 Received: from [85.158.143.35:56341] by server-3.bemta-4.messagelabs.com id B9/EA-09960-ED404C35; Mon, 14 Jul 2014 16:27:10 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1405355228!17323970!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18009 invoked from network); 14 Jul 2014 16:27:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 14 Jul 2014 16:27:10 -0000 X-IronPort-AV: E=Sophos;i="5.01,659,1400025600"; d="scan'208";a="152330229" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jul 2014 16:27:08 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 14 Jul 2014 12:27:07 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X6j5n-0008Fp-0G; Mon, 14 Jul 2014 17:27:08 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 14 Jul 2014 17:27:06 +0100 From: Ian Campbell To: Date: Mon, 14 Jul 2014 17:27:04 +0100 Message-ID: <1405355225-4623-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405355194.31863.2.camel@kazak.uk.xensource.com> References: <1405355194.31863.2.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 2/3] xen: arm: when ALLOCATING p2m entries maddr is meaningless X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The maddr differs on each loop depending on the pages which happen to get allocated. There is already an assertion that maddr == 0. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 917baa3..a10cbaf 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -501,7 +501,6 @@ static int apply_one_level(struct domain *d, p2m->stats.mappings[level]++; *addr += level_size; - *maddr += level_size; return P2M_ONE_PROGRESS; }