From patchwork Tue Nov 18 16:44:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41051 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 48842241C9 for ; Tue, 18 Nov 2014 16:47:04 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf124619wgh.5 for ; Tue, 18 Nov 2014 08:47:03 -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=cirGZusOMTL1SxEe3LZDSI5HvJLphf03US3Y5/jEyck=; b=T2dmBKoakpEv7ut98GLFyDvdgBiUlOebbKPSoBjEZnhVReugNCHKEkt3jqKIZd5aZN N5eY+u7vupMZ5dG4NblLGs8gPWx0TV7CMJbCqvJFybC3DyBW1tibaFjvj3Zcn0Hggc3i 7ErLTT058od/IWDNKMGjjIHtsrgV9W4j+qMk4D6rQ+L9nnbkkEc97BQIRttAvQvh+Lom fGNvNvqAK2P4Tm4bzcSTc1AQCOB3KSvcSrDGEkjirEppKIiTh2fdsokxadMMuGZJlGco NMu4L64MXnsDuuCCJ9UEqmscDGr+NOAIiPI7NGgIqwMMhPAAk8eOONVIC5A4Ul9ErITl 2Gcw== X-Gm-Message-State: ALoCoQmlE8p9tDeD3fEfMtxl9XOFC5lf8rM0P05VhAdOlt1iVT9g/6C0lkfZaS2+YdGCppBaitWo X-Received: by 10.180.182.195 with SMTP id eg3mr6017445wic.1.1416329223165; Tue, 18 Nov 2014 08:47:03 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.106.104 with SMTP id gt8ls1086845wib.0.gmail; Tue, 18 Nov 2014 08:47:03 -0800 (PST) X-Received: by 10.194.58.8 with SMTP id m8mr50328269wjq.43.1416329223062; Tue, 18 Nov 2014 08:47:03 -0800 (PST) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com. [74.125.82.41]) by mx.google.com with ESMTPS id cq2si67581383wjc.73.2014.11.18.08.47.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Nov 2014 08:47:03 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 74.125.82.41 as permitted sender) client-ip=74.125.82.41; Received: by mail-wg0-f41.google.com with SMTP id y19so9014415wgg.28 for ; Tue, 18 Nov 2014 08:47:03 -0800 (PST) X-Received: by 10.194.209.180 with SMTP id mn20mr49627538wjc.49.1416329222952; Tue, 18 Nov 2014 08:47:02 -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 ew9csp1360457lbc; Tue, 18 Nov 2014 08:47:02 -0800 (PST) X-Received: by 10.52.27.10 with SMTP id p10mr877373vdg.89.1416329221301; Tue, 18 Nov 2014 08:47:01 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 16si26911226vce.105.2014.11.18.08.47.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Nov 2014 08:47:01 -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 1XqluD-0007D7-LP; Tue, 18 Nov 2014 16:45:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqluD-0007Co-7a for xen-devel@lists.xen.org; Tue, 18 Nov 2014 16:45:29 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 2C/10-25727-8A77B645; Tue, 18 Nov 2014 16:45:28 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1416329125!12266735!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27309 invoked from network); 18 Nov 2014 16:45:27 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 18 Nov 2014 16:45:27 -0000 X-IronPort-AV: E=Sophos;i="5.07,410,1413244800"; d="scan'208";a="194056788" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Tue, 18 Nov 2014 11:44:51 -0500 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xqlta-0008T6-MK; Tue, 18 Nov 2014 16:44:51 +0000 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Tue, 18 Nov 2014 16:44:50 +0000 From: Ian Campbell To: Date: Tue, 18 Nov 2014 16:44:47 +0000 Message-ID: <1416329088-23328-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1416329045.17982.27.camel@citrix.com> References: <1416329045.17982.27.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 for-4.5 3/4] xen: arm: correct specific mappings for PCIE0 on X-Gene 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 74.125.82.41 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 region assigned to PCIE0, according to the docs, is 0x0e000000000 to 0x10000000000. They make no distinction between PCI CFG and PCI IO mem within this range (in fact, I'm not sure that isn't up to the driver). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/xgene-storm.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 38674cd..6c432a1 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -89,22 +89,8 @@ static int xgene_storm_specific_mapping(struct domain *d) int ret; /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEM REGION", paddr_to_pfn(0xe000000000UL), - paddr_to_pfn(0xe010000000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI IO REGION", paddr_to_pfn(0xe080000000UL), - paddr_to_pfn(0xe080010000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI CFG REGION", paddr_to_pfn(0xe0d0000000UL), - paddr_to_pfn(0xe0d0200000UL)); - if ( ret ) - goto err; - ret = map_one_mmio(d, "PCI MSI REGION", paddr_to_pfn(0xe010000000UL), - paddr_to_pfn(0xe010800000UL)); + ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(0x0e000000000UL), + paddr_to_pfn(0x01000000000UL)); if ( ret ) goto err;