diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-11 18:52:41 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-14 14:53:02 +0100 |
| commit | 0759dfc2ec0dfb8ac5747357bf37459d621f891b (patch) | |
| tree | d471910b1d5aebafc9423c1e7bc2351ed7cd0746 | |
| parent | fd5e1314fc76161e78734707452596014295d1b1 (diff) | |
| download | linux-aarch64-0759dfc2ec0dfb8ac5747357bf37459d621f891b.tar.gz | |
arm64: Use Device memory for IO_MMUFLAGS in head.S
IO_MMUFLAGS were still using MT_NORMAL as the memory type which is not
suitable for device memory.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/kernel/head.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b158f17f787..a2f02b63eae 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -72,19 +72,19 @@ * Initial memory map attributes. */ #ifndef CONFIG_SMP -#define PTE_FLAGS PTE_ATTRINDX(MT_NORMAL) | PTE_AF -#define PMD_FLAGS PMD_ATTRINDX(MT_NORMAL) | PMD_SECT_AF +#define PTE_FLAGS PTE_TYPE_PAGE | PTE_AF +#define PMD_FLAGS PMD_TYPE_SECT | PMD_SECT_AF #else -#define PTE_FLAGS PTE_ATTRINDX(MT_NORMAL) | PTE_AF | PTE_SHARED -#define PMD_FLAGS PMD_ATTRINDX(MT_NORMAL) | PMD_SECT_AF | PMD_SECT_S +#define PTE_FLAGS PTE_TYPE_PAGE | PTE_AF | PTE_SHARED +#define PMD_FLAGS PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S #endif #ifdef CONFIG_ARM64_64K_PAGES -#define MM_MMUFLAGS PTE_TYPE_PAGE | PTE_FLAGS -#define IO_MMUFLAGS PTE_TYPE_PAGE | PTE_XN | PTE_FLAGS +#define MM_MMUFLAGS PTE_ATTRINDX(MT_NORMAL) | PTE_FLAGS +#define IO_MMUFLAGS PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_XN | PTE_FLAGS #else -#define MM_MMUFLAGS PMD_TYPE_SECT | PMD_FLAGS -#define IO_MMUFLAGS PMD_TYPE_SECT | PMD_SECT_XN | PMD_FLAGS +#define MM_MMUFLAGS PMD_ATTRINDX(MT_NORMAL) | PMD_FLAGS +#define IO_MMUFLAGS PMD_ATTRINDX(MT_DEVICE_nGnRE) | PMD_SECT_XN | PMD_FLAGS #endif /* |