From patchwork Wed Nov 19 15:28:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41179 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B3CBC241C9 for ; Wed, 19 Nov 2014 15:32:09 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf878110eek.9 for ; Wed, 19 Nov 2014 07:32:09 -0800 (PST) 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=Ds9cdTv5W4nqg3dkh074hVrt1YK5tjNWSjrIkXGqmDE=; b=OrX8od+hhy+Wwz8dwr8duGHvPrGNQ7ynH9TMEycWFAxbibSBwyhdx11GoU6d/R/E0O wLP8gRfu4SzAUMkHbiZOVYluQ6NZwqU0sLH28232WHKntlAAmEVzRXcbNKhaV3fapBx9 +Uix2KHBx8S43j5VudoDFiY8juacCLrv9V+bdUwP5diOKMxmkpxHcopDvEL8aOmXTsCG s6FgZHxoyYfGepjgxxLeajAGyxIBzP/1O+g2bmkI7oSAXWvn+RsyET5K53tBdale7Daj VoeUdFFNrZC4jt8iJr4xjAJLLQU2makXjFRmv57yCJcOXDWBsNDf/NmVppN0orZlywKs OWcw== X-Gm-Message-State: ALoCoQn1vKFzOhnubFiJe8ILjrCa41Rjpy5wyAahqfvJfsEHnI1ItICvOvGXXKDjW7X4Bfw09OyW X-Received: by 10.180.106.67 with SMTP id gs3mr7266513wib.3.1416411129006; Wed, 19 Nov 2014 07:32:09 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.137 with SMTP id b9ls893386lah.29.gmail; Wed, 19 Nov 2014 07:32:08 -0800 (PST) X-Received: by 10.112.150.136 with SMTP id ui8mr5981612lbb.60.1416411128489; Wed, 19 Nov 2014 07:32:08 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id u1si2120407lbb.79.2014.11.19.07.32.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 07:32:08 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id pn19so725477lab.12 for ; Wed, 19 Nov 2014 07:32:08 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr42562032lbc.23.1416411128383; Wed, 19 Nov 2014 07:32:08 -0800 (PST) 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.112.184.201 with SMTP id ew9csp103012lbc; Wed, 19 Nov 2014 07:32:07 -0800 (PST) X-Received: by 10.224.2.135 with SMTP id 7mr54120880qaj.64.1416411127199; Wed, 19 Nov 2014 07:32:07 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h1si2170277qcu.15.2014.11.19.07.32.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 07:32:07 -0800 (PST) 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 1Xr7Cs-0000Mh-PR; Wed, 19 Nov 2014 15:30:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7Cr-0000Lb-5A for xen-devel@lists.xen.org; Wed, 19 Nov 2014 15:30:09 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A7/CF-25727-087BC645; Wed, 19 Nov 2014 15:30:08 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416411003!8762172!3 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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32180 invoked from network); 19 Nov 2014 15:30:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 19 Nov 2014 15:30:07 -0000 X-IronPort-AV: E=Sophos;i="5.07,417,1413244800"; d="scan'208";a="192908037" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 19 Nov 2014 10:28:19 -0500 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xr7B4-00059U-J8; Wed, 19 Nov 2014 15:28:19 +0000 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Wed, 19 Nov 2014 15:28:18 +0000 From: Ian Campbell To: Date: Wed, 19 Nov 2014 15:28:13 +0000 Message-ID: <1416410895-20461-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1416410868.29243.39.camel@citrix.com> References: <1416410868.29243.39.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , julien.grall@linaro.org, tim@xen.org, Clark Laughlin , stefano.stabellini@eu.citrix.com, Pranavkumar Sawargaonkar Subject: [Xen-devel] [PATCH v2 for-4.5 3/5] xen: arm: correct off by one in xgene-storm's map_one_mmio 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.215.53 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 callers pass the end as the pfn immediately *after* the last page to be mapped, therefore adding one is incorrect and causes an additional page to be mapped. At the same time correct the printing of the mfn values, zero-padding them to 16 digits as for a paddr when they are frame numbers is just confusing. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- v2: Fix the other printk format string too. --- xen/arch/arm/platforms/xgene-storm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 29c4752..8685c93 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -45,11 +45,11 @@ static int map_one_mmio(struct domain *d, const char *what, { int ret; - printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", + printk("Additional MMIO %lx-%lx (%s)\n", start, end, what); - ret = map_mmio_regions(d, start, end - start + 1, start); + ret = map_mmio_regions(d, start, end - start, start); if ( ret ) - printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", + printk("Failed to map %s @ %lx to dom%d\n", what, start, d->domain_id); return ret; }