From c74d12b35b4bd4f6ad29059a1ee2bd99410d233c Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 17 Sep 2012 12:23:47 +0100 Subject: arm64: Reserve memory range for the PCI I/O space This patch reserves 64K for the PCI I/O space in the AArch64 Linux memory map (not mapped yet). Signed-off-by: Catalin Marinas Reported-by: Arnd Bergmann --- Documentation/arm64/memory.txt | 6 +++++- arch/arm64/include/asm/io.h | 7 +------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/arm64/memory.txt b/Documentation/arm64/memory.txt index 7210af75167..dbbdcbba75a 100644 --- a/Documentation/arm64/memory.txt +++ b/Documentation/arm64/memory.txt @@ -27,7 +27,11 @@ Start End Size Use ----------------------------------------------------------------------- 0000000000000000 0000007fffffffff 512GB user -ffffff8000000000 ffffffbbfffeffff ~240GB vmalloc +ffffff8000000000 ffffffbbfffcffff ~240GB vmalloc + +ffffffbbfffd0000 ffffffbcfffdffff 64KB [guard page] + +ffffffbbfffe0000 ffffffbcfffeffff 64KB PCI I/O space ffffffbbffff0000 ffffffbcffffffff 64KB [guard page] diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 48fa83f7dc1..74a2a7d304a 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -114,12 +114,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) * I/O port access primitives. */ #define IO_SPACE_LIMIT 0xffff - -/* - * We currently don't have any platform with PCI support, so just leave this - * defined to 0 until needed. - */ -#define PCI_IOBASE ((void __iomem *)0) +#define PCI_IOBASE ((void __iomem *)0xffffffbbfffe0000UL) static inline u8 inb(unsigned long addr) { -- cgit v1.2.3