Changeset cefb126 in mainline for kernel/generic/src/mm/tlb.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

Merge mainline changes.

File:

• kernel/generic/src/mm/tlb.c (modified) (3 diffs)

kernel/generic/src/mm/tlb.c

@@ -73 +73 @@
  * to all other processors.
  *
- * This function must be called with interrupts disabled.
- *
- * @param type Type describing scope of shootdown.
- * @param asid Address space, if required by type.
- * @param page Virtual page address, if required by type.
+ * @param type  Type describing scope of shootdown.
+ * @param asid  Address space, if required by type.
+ * @param page  Virtual page address, if required by type.
  * @param count Number of pages, if required by type.
  *
+ * @return The interrupt priority level as it existed prior to this call.
+ *
  */
-void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
+ipl_t tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
     uintptr_t page, size_t count)
 {
+        ipl_t ipl = interrupts_disable();
         CPU->tlb_active = false;
         irq_spinlock_lock(&tlblock, false);
@@ -89 +90 @@
         size_t i;
         for (i = 0; i < config.cpu_count; i++) {
-                cpu_t *cpu;
-                
                 if (i == CPU->id)
                         continue;
                 
-                cpu = &cpus[i];
+                cpu_t *cpu = &cpus[i];
+                
                 irq_spinlock_lock(&cpu->lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
@@ -122 +122 @@
         
 busy_wait:
-        for (i = 0; i < config.cpu_count; i++)
+        for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].tlb_active)
                         goto busy_wait;
+        }
+        
+        return ipl;
 }
 
 /** Finish TLB shootdown sequence.
  *
+ * @param ipl Previous interrupt priority level.
+ *
  */
-void tlb_shootdown_finalize(void)
+void tlb_shootdown_finalize(ipl_t ipl)
 {
         irq_spinlock_unlock(&tlblock, false);
         CPU->tlb_active = true;
+        interrupts_restore(ipl);
 }