summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/mmu.h
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-05-22 04:43:41 (GMT)
committerEmil Medve <Emilian.Medve@Freescale.com>2013-03-21 18:42:14 (GMT)
commit0dcd97576a8a922fcb524d821b12c5128b9f516d (patch)
treeced5aedeaf3be7bf56130ee93d6e8a119e655af0 /arch/powerpc/include/asm/mmu.h
parentc7fc6d737f900ea7272059f02421f14578075b5a (diff)
downloadlinux-fsl-qoriq-0dcd97576a8a922fcb524d821b12c5128b9f516d.tar.xz
powerpc/e6500: hardware tablewalk support
Preliminary support for e6500 hardware tablewalk. This is for simulator (and rev2) only. On rev1 hardware, be sure to set CONFIG_PPC_FSL_BUGGY_HW_TABLEWALK. Locking is introduced to make TLB misses threadsafe. TODO: add locking to the non-tablewalk miss handlers, which was the main reason for making the locking conditional. Signed-off-by: Scott Wood <scott@tyr.buserror.net> Signed-off-by: Andy Fleming <afleming@freescale.net> (cherry-picked from commit f071125a3d33816772caa91146936af0716f0f78)
Diffstat (limited to 'arch/powerpc/include/asm/mmu.h')
-rw-r--r--arch/powerpc/include/asm/mmu.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 691fd8a..f8d1d6d 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -180,16 +180,17 @@ static inline void assert_pte_locked(struct mm_struct *mm, unsigned long addr)
#define MMU_PAGE_64K_AP 3 /* "Admixed pages" (hash64 only) */
#define MMU_PAGE_256K 4
#define MMU_PAGE_1M 5
-#define MMU_PAGE_4M 6
-#define MMU_PAGE_8M 7
-#define MMU_PAGE_16M 8
-#define MMU_PAGE_64M 9
-#define MMU_PAGE_256M 10
-#define MMU_PAGE_1G 11
-#define MMU_PAGE_16G 12
-#define MMU_PAGE_64G 13
-
-#define MMU_PAGE_COUNT 14
+#define MMU_PAGE_2M 6
+#define MMU_PAGE_4M 7
+#define MMU_PAGE_8M 8
+#define MMU_PAGE_16M 9
+#define MMU_PAGE_64M 10
+#define MMU_PAGE_256M 11
+#define MMU_PAGE_1G 12
+#define MMU_PAGE_16G 13
+#define MMU_PAGE_64G 14
+
+#define MMU_PAGE_COUNT 15
#if defined(CONFIG_PPC_STD_MMU_64)
/* 64-bit classic hash table MMU */