From patchwork Tue Mar 4 15:50:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25684 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB93E2066C for ; Tue, 4 Mar 2014 15:51:15 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hl1sf3079968igb.0 for ; Tue, 04 Mar 2014 07:51:15 -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=04S9dmA9uGj5yHuEfr8o4BPw8GdZZvnX0WqgEU7WE3w=; b=LjS/Pdk44XKOdL9SIgzHNIfCDhwGXCVV73xE+V8yvmwFO3YcwpprVU4D/rMV6pveUA wvYX+7t9PTiYLQk7trEyg1jnqY3OFq2ffeoqWJqTuviC59QOePWmxfW3TtMr6x7NMS5s ibNx/q0TZVwdMCtbnK9ahR4/gpT8oa3fXqGPBsArDCivHDlHpzXyR31Gy91D8Ssa4u8Y P23plGJ0CZXfYvaSXugEhE3CMyecsFJETANEIZBGcRawgeJHaPzM+9FfwlP44p829+JV Y7gc+7tIPSLtRHsLccEdT38N2WfoGq2YneVANAEhEMiWQnyqa8HmjcsYj2/Hzx92e2BI aHig== X-Gm-Message-State: ALoCoQki/bHO4gKut1NbxfqMC+cXg59Qk4L60hEXFhccb1KPgkujVqlWayTb+lZ5fiYk3qaDWYn/ X-Received: by 10.50.222.103 with SMTP id ql7mr13619601igc.1.1393948275341; Tue, 04 Mar 2014 07:51:15 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.70 with SMTP id u64ls2654588qgd.86.gmail; Tue, 04 Mar 2014 07:51:15 -0800 (PST) X-Received: by 10.221.39.196 with SMTP id tn4mr59005vcb.51.1393948275063; Tue, 04 Mar 2014 07:51:15 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id cz20si4356400veb.15.2014.03.04.07.51.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 07:51:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so5902910veb.36 for ; Tue, 04 Mar 2014 07:51:15 -0800 (PST) X-Received: by 10.221.26.10 with SMTP id rk10mr194883vcb.0.1393948274973; Tue, 04 Mar 2014 07:51:14 -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.130.193 with SMTP id u1csp135999vcs; Tue, 4 Mar 2014 07:51:14 -0800 (PST) X-Received: by 10.69.21.106 with SMTP id hj10mr142336pbd.87.1393948273602; Tue, 04 Mar 2014 07:51:13 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si14686369pav.16.2014.03.04.07.51.12; Tue, 04 Mar 2014 07:51:12 -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 S1754823AbaCDPu7 (ORCPT + 26 others); Tue, 4 Mar 2014 10:50:59 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:51611 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754709AbaCDPuz (ORCPT ); Tue, 4 Mar 2014 10:50:55 -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 s24FoGdX013621; Tue, 4 Mar 2014 15:50:16 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 v5 2/3] arm64: Extend the PCI I/O space to 16MB Date: Tue, 4 Mar 2014 15:50:15 +0000 Message-Id: <1393948216-11599-3-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393948216-11599-1-git-send-email-Liviu.Dudau@arm.com> References: <1393948216-11599-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.177 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 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) {