Changeset 1084a784 in mainline for arch/mips32/include/mm

Timestamp:

2005-10-04T22:09:41Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

342de62

Parents:

8e3f47b3

Message:

mips32 memory management work.
TLB Refill Exception implemented (passed basic testing).
Remove bit g from struct entry_hi.
Add generic find_mapping().
Add asid to vm_t type, define asid_t to hide architecture specific differences.
Implement ASID allocation for mips32, dummy for other architectures.
Add THE→vm (a.k.a. VM).
Add vm_install_arch().
Move pte_t definition to arch/types.h on each architecture.
Fix PTL manipulating functions on mips32 to shift pfn by 12 instead of by 14.
Fix tlb_init_arch() to initialize all entries.

Other.
Remove unnecessary header files from arch.h
Add missing headers here and there.
Remove two unnecessary ld flags from mips32 makefile.

Location:

arch/mips32/include/mm

Files:

• asid.h (modified) (2 diffs)
• page.h (modified) (1 diff)
• tlb.h (modified) (2 diffs)
• vm.h (modified) (2 diffs)

arch/mips32/include/mm/asid.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Matrin Decky
+ * Copyright (C) 2005 Martin Decky
  * All rights reserved.
  *
@@ -30 +30 @@
 #define __mips32_ASID_H__
 
-extern void asid_bitmap_reset(void);
+#include <arch/types.h>
+
+typedef __u8 asid_t;
+
+extern asid_t asid_get(void);
+extern void asid_put(asid_t asid);
 
 #endif

arch/mips32/include/mm/page.h

@@ -57 +57 @@
 #define PTL1_INDEX_ARCH(vaddr)  0
 #define PTL2_INDEX_ARCH(vaddr)  0
-#define PTL3_INDEX_ARCH(vaddr)  (((vaddr)>>14)&0xfff)
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr)>>12)&0xfff)
 
 #define GET_PTL0_ADDRESS_ARCH()                 (PTL0)
 #define SET_PTL0_ADDRESS_ARCH(ptl0)             (PTL0 = (pte_t *)(ptl0))
 
-#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          (((pte_t *)(ptl0))[(i)].pfn<<14)
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          (((pte_t *)(ptl0))[(i)].pfn<<12)
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i)          (ptl2)
-#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         (((pte_t *)(ptl3))[(i)].pfn<<14)
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         (((pte_t *)(ptl3))[(i)].pfn<<12)
 
-#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)       (((pte_t *)(ptl0))[(i)].pfn = (a)>>14)
+#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)       (((pte_t *)(ptl0))[(i)].pfn = (a)>>12)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
 #define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
-#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a)      (((pte_t *)(ptl3))[(i)].pfn = (a)>>14)
+#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a)      (((pte_t *)(ptl3))[(i)].pfn = (a)>>12)
 
 #define GET_PTL1_FLAGS_ARCH(ptl0, i)            get_pt_flags((pte_t *)(ptl0), (index_t)(i))

arch/mips32/include/mm/tlb.h

@@ -53 +53 @@
 struct entry_hi {
         unsigned asid : 8;
-        unsigned : 4;
-        unsigned g : 1;
+        unsigned : 5;
         unsigned vpn2 : 19;
 } __attribute__ ((packed));
@@ -71 +70 @@
 } __attribute__ ((packed));
 
-typedef struct entry_lo pte_t;
 
 /** Read Indexed TLB Entry

arch/mips32/include/mm/vm.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x80000000
@@ -41 +42 @@
 #define UDATA_ADDRESS_ARCH      0x01001000
 
+extern void vm_install_arch(vm_t *vm);
+
 #endif