Changeset f1d1f5d3 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2006-09-17T20:10:10Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57da95c

Parents:

06e1e95

Message:

Fix bug in mm/as.c:

• as_area_destroy() should not work with AS but as

sparc64 work:

• start implementing TSB support

File:

• kernel/generic/src/mm/as.c (modified) (6 diffs)

kernel/generic/src/mm/as.c

@@ -360 +360 @@
                                         i = (start_free - b) >> PAGE_WIDTH;
                                         if (!used_space_remove(area, start_free, c - i))
-                                                panic("Could not remove used space.");
+                                                panic("Could not remove used space.\n");
                                 } else {
                                         /*
@@ -390 +390 @@
                 tlb_invalidate_pages(AS->asid, area->base + pages*PAGE_SIZE, area->pages - pages);
                 tlb_shootdown_finalize();
+                
+                /*
+                 * Invalidate software translation caches (e.g. TSB on sparc64).
+                 */
+                as_invalidate_translation_cache(as, area->base + pages*PAGE_SIZE, area->pages - pages);
         } else {
                 /*
@@ -441 +446 @@
          * Start TLB shootdown sequence.
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, AS->asid, area->base, area->pages);
+        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
 
         /*
@@ -464 +469 @@
                                                 b + j*PAGE_SIZE, PTE_GET_FRAME(pte));
                                 }
-                                page_mapping_remove(as, b + j*PAGE_SIZE);
+                                page_mapping_remove(as, b + j*PAGE_SIZE);                               
                                 page_table_unlock(as, false);
                         }
@@ -473 +478 @@
          * Finish TLB shootdown sequence.
          */
-        tlb_invalidate_pages(AS->asid, area->base, area->pages);
+        tlb_invalidate_pages(as->asid, area->base, area->pages);
         tlb_shootdown_finalize();
+        
+        /*
+         * Invalidate potential software translation caches (e.g. TSB on sparc64).
+         */
+        as_invalidate_translation_cache(as, area->base, area->pages);
         
         btree_destroy(&area->used_space);
@@ -488 +498 @@
          * Remove the empty area from address space.
          */
-        btree_remove(&AS->as_area_btree, base, NULL);
+        btree_remove(&as->as_area_btree, base, NULL);
         
         free(area);
         
-        mutex_unlock(&AS->lock);
+        mutex_unlock(&as->lock);
         interrupts_restore(ipl);
         return 0;