Changeset 4512d7e in mainline for generic/src

Timestamp:

2006-01-19T22:17:47Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6461d67c

Parents:

64c44e8

Message:

New ASID management subsystem (initial work, more is required).
Some TLB invalidation changes.

Location:

generic/src

Files:

• main/kinit.c (modified) (1 diff)
• main/main.c (modified) (1 diff)
• mm/as.c (modified) (6 diffs)
• mm/tlb.c (modified) (3 diffs)

generic/src/main/kinit.c

@@ -147 +147 @@
                         panic("config.init_addr is not frame aligned");
                 
-                as = as_create(NULL);
+                as = as_create(NULL, 0);
                 if (!as)
                         panic("as_create\n");

generic/src/main/main.c

@@ -186 +186 @@
          * Create kernel address space.
          */
-        as = as_create(GET_PTL0_ADDRESS());
+        as = as_create(GET_PTL0_ADDRESS(), AS_KERNEL);
         if (!as)
                 panic("can't create kernel address space\n");

generic/src/mm/as.c

@@ -34 +34 @@
 
 #include <mm/as.h>
+#include <mm/asid.h>
 #include <mm/page.h>
 #include <mm/frame.h>
@@ -40 +41 @@
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
+#include <mm/asid.h>
 #include <arch/mm/asid.h>
 #include <arch/mm/as.h>
@@ -71 +73 @@
  *        (Virtual Address Translation) mechanisms.
  */
-as_t *as_create(pte_t *ptl0)
+as_t *as_create(pte_t *ptl0, int flags)
 {
         as_t *as;
@@ -77 +79 @@
         as = (as_t *) malloc(sizeof(as_t));
         if (as) {
+                list_initialize(&as->as_with_asid_link);
                 spinlock_initialize(&as->lock, "as_lock");
                 list_initialize(&as->as_area_head);
 
-                as->asid = asid_get();
+                if (flags & AS_KERNEL)
+                        as->asid = ASID_KERNEL;
+                else
+                        as->asid = ASID_INVALID;
 
                 as->ptl0 = ptl0;
@@ -290 +296 @@
         ipl_t ipl;
         
+        asid_install(as);
+        
         ipl = interrupts_disable();
         spinlock_lock(&as->lock);
@@ -299 +307 @@
         /*
          * Perform architecture-specific steps.
-         * (e.g. invalidate TLB, install ASID etc.)
+         * (e.g. write ASID to hardware register etc.)
          */
         as_install_arch(as);

generic/src/mm/tlb.c

@@ -47 +47 @@
 #ifdef CONFIG_SMP
 /* must be called with interrupts disabled */
-void tlb_shootdown_start(void)
+void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, __address page, count_t cnt)
 {
         int i;
@@ -53 +53 @@
         CPU->tlb_active = 0;
         spinlock_lock(&tlblock);
+        
+        /*
+         * TODO: assemble shootdown message.
+         */
         tlb_shootdown_ipi_send();
-        tlb_invalidate(0); /* TODO: use valid ASID */
+
+        switch (type) {
+            case TLB_INVL_ALL:
+                tlb_invalidate_all();
+                break;
+            case TLB_INVL_ASID:
+                tlb_invalidate_asid(asid);
+                break;
+            case TLB_INVL_PAGES:
+                tlb_invalidate_pages(asid, page, cnt);
+                break;
+            default:
+                panic("unknown tlb_invalidate_type_t value: %d\n", type);
+                break;
+        }
         
 busy_wait:      
@@ -78 +96 @@
         spinlock_lock(&tlblock);
         spinlock_unlock(&tlblock);
-        tlb_invalidate(0);      /* TODO: use valid ASID */
+        tlb_invalidate_all();   /* TODO: use valid ASID */
         CPU->tlb_active = 1;
 }