aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-09-17 12:23:47 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2012-09-17 13:39:25 +0100
commitc74d12b35b4bd4f6ad29059a1ee2bd99410d233c (patch)
treedf9a2d13c2b15eedcf1426259a4127d110127d68
parent18a6b6ca7231affbfedd7f004f58dfb6af22420e (diff)
downloadlinux-aarch64-c74d12b35b4bd4f6ad29059a1ee2bd99410d233c.tar.gz
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 <catalin.marinas@arm.com> Reported-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--Documentation/arm64/memory.txt6
-rw-r--r--arch/arm64/include/asm/io.h7
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)
{