Merge branch 'akpm' (patches from Andrew)

[mirror_ubuntu-jammy-kernel.git] / arch / sh / include / cpu-sh4 / cpu / mmu_context.h

diff --git a/arch/sh/include/cpu-sh4/cpu/mmu_context.h b/arch/sh/include/cpu-sh4/cpu/mmu_context.h
index 5963124c1d4ad0f105605e139ea6f1e7d55cc845..421b56d5c5956223dbfe5db4902f893d69391a28 100644 (file)
--- a/arch/sh/include/cpu-sh4/cpu/mmu_context.h
+++ b/arch/sh/include/cpu-sh4/cpu/mmu_context.h
@@ -1,11 +1,8 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * include/asm-sh/cpu-sh4/mmu_context.h
  *
  * Copyright (C) 1999 Niibe Yutaka
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #ifndef __ASM_CPU_SH4_MMU_CONTEXT_H
 #define __ASM_CPU_SH4_MMU_CONTEXT_H
@@ -19,13 +16,26 @@
 
 #define MMUCR          0xFF000010      /* MMU Control Register */
 
+#define MMU_TLB_ENTRY_SHIFT    8
+
 #define MMU_ITLB_ADDRESS_ARRAY  0xF2000000
 #define MMU_ITLB_ADDRESS_ARRAY2        0xF2800000
+#define MMU_ITLB_DATA_ARRAY    0xF3000000
+#define MMU_ITLB_DATA_ARRAY2   0xF3800000
+
 #define MMU_UTLB_ADDRESS_ARRAY 0xF6000000
 #define MMU_UTLB_ADDRESS_ARRAY2        0xF6800000
+#define MMU_UTLB_DATA_ARRAY    0xF7000000
+#define MMU_UTLB_DATA_ARRAY2   0xF7800000
 #define MMU_PAGE_ASSOC_BIT     0x80
 
-#define MMUCR_TI               (1<<2)
+#ifdef CONFIG_MMU
+#define MMUCR_AT               (1 << 0)
+#else
+#define MMUCR_AT               (0)
+#endif
+
+#define MMUCR_TI               (1 << 2)
 
 #define MMUCR_URB              0x00FC0000
 #define MMUCR_URB_SHIFT                18
@@ -58,7 +68,8 @@
 #endif
 
 #define MMU_NTLB_ENTRIES       64
-#define MMU_CONTROL_INIT       (0x05|MMUCR_SQMD|MMUCR_ME|MMUCR_SE|MMUCR_AEX)
+#define MMU_CONTROL_INIT       (MMUCR_AT | MMUCR_TI | MMUCR_SQMD | \
+                                MMUCR_ME | MMUCR_SE | MMUCR_AEX)
 
 #define TRA    0xff000020
 #define EXPEVT 0xff000024