Changeset 69146b93 in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2012-11-26T19:02:45Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

04552324

Parents:

5d230a30 (diff), 7462674 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged mainline,1723.

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (10 diffs)

kernel/arch/ia64/src/mm/tlb.c

@@ -113 +113 @@
         va = page;
         
-        rr.word = rr_read(VA2VRN(va));
-        if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(va))))) {
+        rr.word = rr_read(VA2VRN(page));
+        if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(page))))) {
                 /*
                  * The selected region register does not contain required RID.
@@ -122 +122 @@
                 
                 rr0 = rr;
-                rr0.map.rid = ASID2RID(asid, VA2VRN(va));
-                rr_write(VA2VRN(va), rr0.word);
+                rr0.map.rid = ASID2RID(asid, VA2VRN(page));
+                rr_write(VA2VRN(page), rr0.word);
                 srlz_d();
                 srlz_i();
@@ -139 +139 @@
         case 1: /* cnt 4 - 15 */
                 ps = PAGE_WIDTH + 2;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 2: /* cnt 16 - 63 */
                 ps = PAGE_WIDTH + 4;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 3: /* cnt 64 - 255 */
                 ps = PAGE_WIDTH + 6;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 4: /* cnt 256 - 1023 */
                 ps = PAGE_WIDTH + 8;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 5: /* cnt 1024 - 4095 */
                 ps = PAGE_WIDTH + 10;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 6: /* cnt 4096 - 16383 */
                 ps = PAGE_WIDTH + 12;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 7: /* cnt 16384 - 65535 */
         case 8: /* cnt 65536 - (256K - 1) */
                 ps = PAGE_WIDTH + 14;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         default:
                 ps = PAGE_WIDTH + 18;
-                va &= ~((1 << ps) - 1);
-                break;
-        }
-        
-        for (; va < (page + cnt * PAGE_SIZE); va += (1 << ps))
+                va &= ~((1UL << ps) - 1);
+                break;
+        }
+        
+        for (; va < (page + cnt * PAGE_SIZE); va += (1UL << ps))
                 asm volatile (
                         "ptc.l %[va], %[ps] ;;"
@@ -183 +183 @@
         
         if (restore_rr) {
-                rr_write(VA2VRN(va), rr.word);
+                rr_write(VA2VRN(page), rr.word);
                 srlz_d();
                 srlz_i();
@@ -501 +501 @@
                  * Forward the page fault to address space page fault handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -619 +615 @@
                  * handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }
@@ -667 +659 @@
                 dtc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_WRITE, istate);
         }
 }
@@ -700 +688 @@
                 itc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -764 +748 @@
         ASSERT((t) && (t->p));
         ASSERT(!t->w);
-        if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault at %p.",
-                    (void *) va);
-                panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
-        }
+        as_page_fault(va, PF_ACCESS_WRITE, istate);
 }
 
@@ -799 +779 @@
                         dtc_pte_copy(t);
         } else {
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        fault_if_from_uspace(istate, "Page fault at %p.",
-                            (void *) va);
-                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }