Changeset dd14cced in mainline

Timestamp:

2005-12-11T14:35:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

54aff98

Parents:

a98d2ec

Message:

Fixes for mips32 invalidation functions.

Location:

arch/mips32

Files:

• include/mm/tlb.h (modified) (1 diff)
• src/mm/tlb.c (modified) (6 diffs)

arch/mips32/include/mm/tlb.h

@@ -133 +133 @@
 }
 
+#define tlb_invalidate(asid)    tlb_invalidate_asid(asid)
+
 extern void tlb_invalid(struct exception_regdump *pstate);
 extern void tlb_refill(struct exception_regdump *pstate);

arch/mips32/src/mm/tlb.c

@@ -56 +56 @@
 void tlb_arch_init(void)
 {
+        int i;
+
         cp0_pagemask_write(TLB_PAGE_MASK_16K);
-
-        tlb_invalidate_all();
+        cp0_entry_hi_write(0);
+        cp0_entry_lo0_write(0);
+        cp0_entry_lo1_write(0);
+
+        /* Clear and initialize TLB. */
+        
+        for (i = 0; i < TLB_ENTRY_COUNT; i++) {
+                cp0_index_write(i);
+                tlbwi();
+        }
                 
         /*
@@ -294 +304 @@
                 symbol = s;
         panic("%X: TLB Modified Exception at %X(%s)\n", cp0_badvaddr_read(), pstate->epc, symbol);
-}
-
-/** 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;
-        ipl_t ipl;
-        int i;  
-        
-        ASSERT(asid != ASID_INVALID);
-
-        ipl = interrupts_disable();
-        
-        for (i = 0; i < TLB_ENTRY_COUNT; 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();
-                }
-        }
-        
-        interrupts_restore(ipl);
 }
 
@@ -415 +392 @@
 void tlb_invalidate_all(void)
 {
+        ipl_t ipl;
+        entry_lo_t lo0, lo1;
         int i;
 
-        cp0_entry_hi_write(0);
-        cp0_entry_lo0_write(0);
-        cp0_entry_lo1_write(0);
+        ipl = interrupts_disable();
 
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
+                tlbr();
+
+                lo0.value = cp0_entry_lo0_read();
+                lo1.value = cp0_entry_lo1_read();
+
+                lo0.v = 0;
+                lo1.v = 0;
+
+                cp0_entry_lo0_write(lo0.value);
+                cp0_entry_lo1_write(lo1.value);
+                                
                 tlbwi();
         }
+        
+        interrupts_restore(ipl);
 }
 
@@ -433 +423 @@
 void tlb_invalidate_asid(asid_t asid)
 {
+        ipl_t ipl;
+        entry_lo_t lo0, lo1;
         entry_hi_t hi;
         int i;
 
+        ASSERT(asid != ASID_INVALID);
+
+        ipl = interrupts_disable();
+        
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbr();
                 
+                hi.value = cp0_entry_hi_read();
+                
                 if (hi.asid == asid) {
-                        cp0_entry_lo0_write(0);
-                        cp0_entry_lo1_write(0);
+                        lo0.value = cp0_entry_lo0_read();
+                        lo1.value = cp0_entry_lo1_read();
+
+                        lo0.v = 0;
+                        lo1.v = 0;
+
+                        cp0_entry_lo0_write(lo0.value);
+                        cp0_entry_lo1_write(lo1.value);
+
                         tlbwi();
                 }
         }
-
+        
+        interrupts_restore(ipl);
 }
 
@@ -456 +462 @@
 void tlb_invalidate_page(asid_t asid, __address page)
 {
+        ipl_t ipl;
+        entry_lo_t lo0, lo1;
         entry_hi_t hi;
         tlb_index_t index;
-        int i;
+
+        ASSERT(asid != ASID_INVALID);
+
+        ipl = interrupts_disable();
 
         hi.value = 0;
         prepare_entry_hi(&hi, asid, page);
-        
+        cp0_entry_hi_write(hi.value);
+
         tlbp();
         index.value = cp0_index_read();
@@ -468 +480 @@
         if (!index.p) {
                 /* Entry was found, index register contains valid index. */
-                cp0_entry_lo0_write(0);
-                cp0_entry_lo1_write(0);
+                tlbr();
+
+                lo0.value = cp0_entry_lo0_read();
+                lo1.value = cp0_entry_lo1_read();
+
+                lo0.v = 0;
+                lo1.v = 0;
+
+                cp0_entry_lo0_write(lo0.value);
+                cp0_entry_lo1_write(lo1.value);
+
                 tlbwi();
         }
-}
+        
+        interrupts_restore(ipl);
+}