Changeset cc205f1 in mainline for arch/mips32/src/mm/tlb.c

Timestamp:

2005-10-06T12:45:22Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fd3c9e5

Parents:

bca1b47

Message:

Add mm/mapping1 test.
(Will not make it past TLB Invalid exception on mips32.)
Fixes in asid.c.
Make TLB register types union with u32 value.
Implement tlb_invalidate() for mips32.
(TLB invalidation and shootdown path will have to be revised.)

File:

• arch/mips32/src/mm/tlb.c (modified) (15 diffs)

arch/mips32/src/mm/tlb.c

@@ -38 +38 @@
 #include <synch/spinlock.h>
 #include <print.h>
+#include <debug.h>
 
 static void tlb_refill_fail(struct exception_regdump *pstate);
@@ -44 +45 @@
 
 static pte_t *find_mapping_and_check(__address badvaddr);
-static void prepare_entry_lo(struct entry_lo *lo, bool g, bool v, bool d, int c, __address pfn);
+static void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, int c, __address pfn);
 
 /** Initialize TLB
@@ -83 +84 @@
 void tlb_refill(struct exception_regdump *pstate)
 {
-        struct entry_lo lo;
+        entry_lo_t lo;
         __address badvaddr;
         pte_t *pte;
@@ -105 +106 @@
          */
         if ((badvaddr/PAGE_SIZE) % 2 == 0) {
-                cp0_entry_lo0_write(*((__u32 *) &lo));
+                cp0_entry_lo0_write(lo.value);
                 cp0_entry_lo1_write(0);
         }
         else {
                 cp0_entry_lo0_write(0);
-                cp0_entry_lo1_write(*((__u32 *) &lo));
+                cp0_entry_lo1_write(lo.value);
         }
         tlbwr();
@@ -130 +131 @@
 void tlb_invalid(struct exception_regdump *pstate)
 {
-        struct index index;
+        tlb_index_t index;
         __address badvaddr;
-        struct entry_lo lo;
+        entry_lo_t lo;
         pte_t *pte;
 
@@ -141 +142 @@
          */
         tlbp();
-        *((__u32 *) &index) = cp0_index_read();
+        index.value = cp0_index_read();
         
         spinlock_lock(&VM->lock);       
@@ -148 +149 @@
          * Fail if the entry is not in TLB.
          */
-        if (index.p)
-                goto fail;
+        if (index.p) {
+                printf("TLB entry not found.\n");
+                goto fail;
+        }
 
         pte = find_mapping_and_check(badvaddr);
@@ -171 +174 @@
          */
         if ((badvaddr/PAGE_SIZE) % 2 == 0)
-                cp0_entry_lo0_write(*((__u32 *) &lo));
+                cp0_entry_lo0_write(lo.value);
         else
-                cp0_entry_lo1_write(*((__u32 *) &lo));
+                cp0_entry_lo1_write(lo.value);
         tlbwi();
 
@@ -190 +193 @@
  * @param pstate Interrupted register context.
  */
-
 void tlb_modified(struct exception_regdump *pstate)
 {
-        struct index index;
+        tlb_index_t index;
         __address badvaddr;
-        struct entry_lo lo;
+        entry_lo_t lo;
         pte_t *pte;
 
@@ -204 +206 @@
          */
         tlbp();
-        *((__u32 *) &index) = cp0_index_read();
+        index.value = cp0_index_read();
         
         spinlock_lock(&VM->lock);       
@@ -211 +213 @@
          * Fail if the entry is not in TLB.
          */
-        if (index.p)
-                goto fail;
+        if (index.p) {
+                printf("TLB entry not found.\n");
+                goto fail;
+        }
 
         pte = find_mapping_and_check(badvaddr);
@@ -241 +245 @@
          */
         if ((badvaddr/PAGE_SIZE) % 2 == 0)
-                cp0_entry_lo0_write(*((__u32 *) &lo));
+                cp0_entry_lo0_write(lo.value);
         else
-                cp0_entry_lo1_write(*((__u32 *) &lo));
+                cp0_entry_lo1_write(lo.value);
         tlbwi();
 
@@ -289 +293 @@
 }
 
-
-void tlb_invalidate(int asid)
-{
+/** Invalidate TLB entries with specified ASID
+ *
+ * Invalidate TLB entries with specified ASID.
+ *
+ * @param asid ASID.
+ */
+void tlb_invalidate(asid_t asid)
+{
+        entry_hi_t hi;
         pri_t pri;
-        
+        int i;  
+        
+        ASSERT(asid != ASID_INVALID);
+
         pri = cpu_priority_high();
         
-        // TODO
+        for (i = 0; i < TLB_SIZE; i++) {
+                cp0_index_write(i);
+                tlbr();
+                
+                hi.value = cp0_entry_hi_read();
+                if (hi.asid == asid) {
+                        cp0_pagemask_write(TLB_PAGE_MASK_16K);
+                        cp0_entry_hi_write(0);
+                        cp0_entry_lo0_write(0);
+                        cp0_entry_lo1_write(0);
+                        tlbwi();
+                }
+        }
         
         cpu_priority_restore(pri);
@@ -312 +337 @@
 pte_t *find_mapping_and_check(__address badvaddr)
 {
-        struct entry_hi hi;
+        entry_hi_t hi;
         pte_t *pte;
 
-        *((__u32 *) &hi) = cp0_entry_hi_read();
+        hi.value = cp0_entry_hi_read();
 
         /*
          * Handler cannot succeed if the ASIDs don't match.
          */
-        if (hi.asid != VM->asid)
+        if (hi.asid != VM->asid) {
+                printf("EntryHi.asid=%d, VM->asid=%d\n", hi.asid, VM->asid);
                 return NULL;
+        }
         
         /*
@@ -327 +354 @@
          */
         pte = find_mapping(badvaddr, 0);
-        if (!pte)
+        if (!pte) {
+                printf("No such mapping.\n");
                 return NULL;
+        }
 
         /*
          * Handler cannot succeed if the mapping is marked as invalid.
          */
-        if (!pte->v)
+        if (!pte->v) {
+                printf("Invalid mapping.\n");
                 return NULL;
+        }
 
         return pte;
 }
 
-void prepare_entry_lo(struct entry_lo *lo, bool g, bool v, bool d, int c, __address pfn)
+void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, int c, __address pfn)
 {
         lo->g = g;