From patchwork Wed Mar 5 11:49:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25759 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77A5F203C3 for ; Wed, 5 Mar 2014 11:50:40 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id hw13sf2040051qab.1 for ; Wed, 05 Mar 2014 03:50:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=5yFLN/6W9MRfbf/edEnRBN19ytaglqw3cym5dSEOTqU=; b=erfHqd6YPkLyxcnhV5QSymYduM+sImAnb56q4AMrjQfPQVhk/cW/wH5StvPeknOCSc PxNmIVfdPZL4UCdE3YyeMdeA4CnVpMJNT3W8Qynmz7ApDHFkuBduN8jRhgVj9p8WVnaa tQ05Zuivhehp9ds3RTi+FB9dW16460xfUJYvyLsdP8f9cSpJ358d0vBxpdd9+JFlXEGx Hn3RFMNfy9RQqra2kdaJSy6V43NArCYaH+lk0IysKueeNERcUoOz82j4EDvgWHPbPdgl PyX5oHjgJxAh9Iirm801z24Vo4WI8P3aSn7N6tmJt6xGjVZ3lCBltW8Xu08xLbKyEJkl ryPw== X-Gm-Message-State: ALoCoQnbPVa6trybnnjd/TyNy7Pd0w6k5MtrfhwYyad2OiqfwMgS0L/ausioElXoWbcZ9QFgTOfm X-Received: by 10.236.129.41 with SMTP id g29mr2075827yhi.20.1394020240268; Wed, 05 Mar 2014 03:50:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.209 with SMTP id f75ls279771qgd.48.gmail; Wed, 05 Mar 2014 03:50:40 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr2238917vco.25.1394020240148; Wed, 05 Mar 2014 03:50:40 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id rl1si610085vcb.74.2014.03.05.03.50.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Mar 2014 03:50:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so891680veb.4 for ; Wed, 05 Mar 2014 03:50:40 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr31426vec.9.1394020240059; Wed, 05 Mar 2014 03:50:40 -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.220.78.9 with SMTP id i9csp12460vck; Wed, 5 Mar 2014 03:50:39 -0800 (PST) X-Received: by 10.69.1.69 with SMTP id be5mr6342768pbd.126.1394020239097; Wed, 05 Mar 2014 03:50:39 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vo7si2194541pab.335.2014.03.05.03.50.38; Wed, 05 Mar 2014 03:50:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756283AbaCELu2 (ORCPT + 26 others); Wed, 5 Mar 2014 06:50:28 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:51640 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756039AbaCELtt (ORCPT ); Wed, 5 Mar 2014 06:49:49 -0500 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.1.195.170]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s25BnA5B028915; Wed, 5 Mar 2014 11:49:10 GMT From: Liviu Dudau To: linux-pci , Bjorn Helgaas , Catalin Marinas , Will Deacon , linaro-kernel Cc: Benjamin Herrenschmidt , LKML , "devicetree@vger.kernel.org" , LAKML , Tanmay Inamdar , Arnd Bergmann Subject: [PATCH v6 2/3] arm64: Extend the PCI I/O space to 16MB Date: Wed, 5 Mar 2014 11:49:09 +0000 Message-Id: <1394020150-1875-3-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394020150-1875-1-git-send-email-Liviu.Dudau@arm.com> References: <1394020150-1875-1-git-send-email-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: liviu.dudau@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Catalin Marinas The patch moves the PCI I/O space (currently at 64K) before the earlyprintk mapping and extends it to 16MB. Signed-off-by: Catalin Marinas --- Documentation/arm64/memory.txt | 16 ++++++++++------ arch/arm64/include/asm/io.h | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/arm64/memory.txt b/Documentation/arm64/memory.txt index 5e054bf..85e24c4 100644 --- a/Documentation/arm64/memory.txt +++ b/Documentation/arm64/memory.txt @@ -35,11 +35,13 @@ ffffffbc00000000 ffffffbdffffffff 8GB vmemmap ffffffbe00000000 ffffffbffbbfffff ~8GB [guard, future vmmemap] -ffffffbffbc00000 ffffffbffbdfffff 2MB earlyprintk device +ffffffbffa000000 ffffffbffaffffff 16MB PCI I/O space + +ffffffbffb000000 ffffffbffbbfffff 12MB [guard] -ffffffbffbe00000 ffffffbffbe0ffff 64KB PCI I/O space +ffffffbffbc00000 ffffffbffbdfffff 2MB earlyprintk device -ffffffbffbe10000 ffffffbcffffffff ~2MB [guard] +ffffffbffbe00000 ffffffbffbffffff 2MB [guard] ffffffbffc000000 ffffffbfffffffff 64MB modules @@ -60,11 +62,13 @@ fffffdfc00000000 fffffdfdffffffff 8GB vmemmap fffffdfe00000000 fffffdfffbbfffff ~8GB [guard, future vmmemap] -fffffdfffbc00000 fffffdfffbdfffff 2MB earlyprintk device +fffffdfffa000000 fffffdfffaffffff 16MB PCI I/O space + +fffffdfffb000000 fffffdfffbbfffff 12MB [guard] -fffffdfffbe00000 fffffdfffbe0ffff 64KB PCI I/O space +fffffdfffbc00000 fffffdfffbdfffff 2MB earlyprintk device -fffffdfffbe10000 fffffdfffbffffff ~2MB [guard] +fffffdfffbe00000 fffffdfffbffffff 2MB [guard] fffffdfffc000000 fffffdffffffffff 64MB modules diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 4cc813e..7846a6b 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -121,7 +121,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) * I/O port access primitives. */ #define IO_SPACE_LIMIT 0xffff -#define PCI_IOBASE ((void __iomem *)(MODULES_VADDR - SZ_2M)) +#define PCI_IOBASE ((void __iomem *)(MODULES_VADDR - SZ_32M)) static inline u8 inb(unsigned long addr) {