From patchwork Wed Nov 19 15:28:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41176 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 98819241C9 for ; Wed, 19 Nov 2014 15:31:50 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id q1sf594340lam.1 for ; Wed, 19 Nov 2014 07:31:49 -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=YrmpmtyVsZRgwSCNpJyrSro/J4+e0aUVa4cR5Dn/8pM=; b=JC1RuWWD9qLuylYWHVMPbVoxefnHbc7EhoLJZQWCjt5ZmXTMf116oNITa3u4XWkyGv ROZpW4fs0sP3of+YP++k/9EXfJvrV23F+dgok75x5Uyw7DiDhp1VhVuRFXkBMITvaz4M AVWnezAurBAR6P4nUd0StxvZcDO7ga8454XextKYiwFgtAx6gyADHtHyXoXlgVcaFMxh 4LZmyvi+Q+BxEwiMl+XdXtiCFj0GdX1nZIOGa7O7Az27O4MC+efdTXO7MwsG1g6oaGGV MbVMKAQvkCw8j5elkUp6tFGaeEqyDy3PV8fUU0c0PdIEnzhuB4R9U9sxgk2AE6tgxRtT HsYw== X-Gm-Message-State: ALoCoQmudmLVoi35K4Wu4WUebO+Y3A4+CF9/MLbXxGVaeMLndTt9MRoQzgOaIFquLprGjp5odrRP X-Received: by 10.112.154.194 with SMTP id vq2mr730421lbb.10.1416411109615; Wed, 19 Nov 2014 07:31:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.146 with SMTP id ay18ls1047315lab.51.gmail; Wed, 19 Nov 2014 07:31:49 -0800 (PST) X-Received: by 10.112.254.162 with SMTP id aj2mr6012577lbd.70.1416411109273; Wed, 19 Nov 2014 07:31:49 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id v3si2117440lav.81.2014.11.19.07.31.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 07:31:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id gf13so704819lab.27 for ; Wed, 19 Nov 2014 07:31:49 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr3149852lbb.80.1416411109143; Wed, 19 Nov 2014 07:31:49 -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 ew9csp102943lbc; Wed, 19 Nov 2014 07:31:48 -0800 (PST) X-Received: by 10.236.100.115 with SMTP id y79mr9777611yhf.151.1416411107849; Wed, 19 Nov 2014 07:31:47 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id a2si2276719qam.18.2014.11.19.07.31.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 07:31:47 -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 1Xr7Ct-0000Nc-DF; Wed, 19 Nov 2014 15:30:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7Cs-0000Lq-0u for xen-devel@lists.xen.org; Wed, 19 Nov 2014 15:30:10 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 5F/01-18267-187BC645; Wed, 19 Nov 2014 15:30:09 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416411003!8762172!4 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 32331 invoked from network); 19 Nov 2014 15:30:08 -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:08 -0000 X-IronPort-AV: E=Sophos;i="5.07,417,1413244800"; d="scan'208";a="192908048" 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:21 -0500 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Xr7B5-00059X-QV; Wed, 19 Nov 2014 15:28:20 +0000 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Wed, 19 Nov 2014 15:28:19 +0000 From: Ian Campbell To: Date: Wed, 19 Nov 2014 15:28:14 +0000 Message-ID: <1416410895-20461-4-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: MIA2 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 4/5] 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 209.85.215.54 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 8685c93..8c27f24 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;