Changeset 231 for soft

Timestamp:

Mar 5, 2013, 1:42:57 PM (12 years ago)

Author:

joannou

Message:

• Bugfix in Interruption mechanism :
  • _it_mask() and _it_restore() functions now share a global array indexed by the proc_id (used a simple global variable before => problem with multiproc)
  • added 2 new fuctions _it_enable() and _it_disable() that only affect the IE bit of the status register in COP0
  • replaced interrupt masking/restoring arround _ctx_switch() in sys_handler by a simple interrupt disabling before the call to _ctx_switch (restoring after a _ctx_switch wouldn't restore the correct task's status register)
  • replaced the use of _ctx_switch in _exit() by a call to _context_switch() (this function actually does the interrupt disabling)
• Added some comments in the ctx_handler.h
• Added the delay reset in the idle task (ctx_handler.c)
• Added a new irq type (PTI)
  • Modifications in xml_parser.c to accept PTI irq type (now used in xml mappings)
  • Added the test on the irq type in the _irq_demux() function. This leads to a different argument passed to the ISR (i.e. either channel_id or irq_id (aka icuid) )

Location:

soft/giet_vm

Files:

• mappings/1c_4p_four_tsar_generic_mmu.xml (added)
• sys/common.c (modified) (4 diffs)
• sys/common.h (modified) (2 diffs)
• sys/ctx_handler.c (modified) (1 diff)
• sys/ctx_handler.h (modified) (1 diff)
• sys/irq_handler.c (modified) (1 diff)
• sys/sys_handler.c (modified) (2 diffs)
• xml/xml_parser.c (modified) (1 diff)

soft/giet_vm/sys/common.c

@@ -23 +23 @@
 
 // SR save (used by _it_mask() / it_restore()
-unsigned int _status_register_save;
+unsigned int _status_register_save[NB_CLUSTERS*NB_PROCS_MAX];
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -103 +103 @@
 //    _it_mask()
 // Access CP0 and mask IRQs
+// This function uses a global _status_register_save array
+// This function is NOT USED and NOT TESTED
 ///////////////////////////////////////////////////////////////////////////////////
 inline void _it_mask() {
     unsigned int sr_value;
+    unsigned int proc_id;
     asm volatile(
             "li      $3,        0xFFFFFFFE    \n"
@@ -111 +114 @@
             "and     $3,        $3, %0        \n"
             "mtc0    $3,        $12           \n"
-            : "=r"(sr_value) 
+            "mfc0    %1,        $15, 1        \n"
+            : "=r"(sr_value), "=r"(proc_id)
             : 
             : "$3");
-    _status_register_save = sr_value;
+    _status_register_save[proc_id] = sr_value;
 }
 
@@ -121 +125 @@
 //    _it_restore()
 // Access CP0 and enable IRQs
+// This function uses a global _status_register_save array
+// This function is NOT USED and NOT TESTED
 ///////////////////////////////////////////////////////////////////////////////////
 inline void _it_restore() {
-    unsigned int sr_value = _status_register_save;
-    asm volatile(
-            "mtc0  %0,        $12            \n"
-            :
-            : "r"(sr_value));
+    unsigned int proc_id;
+    // get the processor id to index the _status_register_save table
+    asm volatile("mfc0 %0, $15, 1" : "=r" (proc_id));
+    // restore the saved value into the status register
+    asm volatile("mtc0  %0, $12" : : "r" (_status_register_save[proc_id]));
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+//    _it_disable()
+// Access CP0 and disables IRQs
+///////////////////////////////////////////////////////////////////////////////////
+inline void _it_disable() {
+    asm volatile(
+            "li      $3,        0xFFFFFFFE    \n"
+            "mfc0    $4,        $12           \n"
+            "and     $3,        $3, $4        \n"
+            "mtc0    $3,        $12           \n"
+            ::: "$3", "$4");
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+//    _it_enable()
+// Access CP0 and enables IRQs
+///////////////////////////////////////////////////////////////////////////////////
+inline void _it_enable() {
+    asm volatile(
+            "li      $3,        0x00000001    \n"
+            "mfc0    $4,        $12           \n"
+            "or      $3,        $3, $4        \n"
+            "mtc0    $3,        $12           \n"
+            ::: "$3", "$4");
 }
 

soft/giet_vm/sys/common.h

@@ -10 +10 @@
 
 #include <mapping_info.h>
+#include <giet_config.h>
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -45 +46 @@
 void _it_mask(void);
 void _it_restore(void);
+void _it_disable(void);
+void _it_enable(void);
 
 unsigned int _get_epc(void);

soft/giet_vm/sys/ctx_handler.c

@@ -155 +155 @@
         _release_lock(&_tty_put_lock);
 
+        delay = 1000000;
     }
 } // end ctx_idle()

soft/giet_vm/sys/ctx_handler.h

@@ -37 +37 @@
 #define CTX_PTPR_ID             39
 
-#define CTX_TTY_ID              40
-#define CTX_DMA_ID          41
-#define CTX_NIC_ID          42
-#define CTX_TIMER_ID    43
-#define CTX_PTAB_ID             44
-#define CTX_LTID_ID             45
-#define CTX_VSID_ID             46
-#define CTX_RUN_ID              47
+#define CTX_TTY_ID              40  // Integer : global TTY terminal index 
+#define CTX_DMA_ID          41  // Integer : global DMA channel index
+#define CTX_NIC_ID          42  // Integer : global NIC channel index
+#define CTX_TIMER_ID    43  // Integer : user level timer index / UNUSED
+#define CTX_PTAB_ID             44  // Pointer : page table virtual base adress
+#define CTX_LTID_ID             45  // Integer : local task index (in scheduler) / UNUSED
+#define CTX_VSID_ID             46  // Integer : vspace index
+#define CTX_RUN_ID              47  // Boolean : task runable
 
 //////////////////////////////////////////////////////////////////////////////////

soft/giet_vm/sys/irq_handler.c

@@ -57 +57 @@
         unsigned int entry = _get_interrupt_vector_entry(irq_id);
         unsigned int isr_id = entry & 0x000000FF;
+        unsigned int type_id = (entry >> 8) & 0x000000FF;
         unsigned int channel_id = (entry >> 16) & 0x0000FFFF;
-        if      ( isr_id == ISR_SWITCH) _isr_switch( channel_id);
-        else if ( isr_id == ISR_IOC   ) _isr_ioc();
-        else if ( isr_id == ISR_DMA   ) _isr_dma(channel_id);
-        else if ( isr_id == ISR_TTY   ) _isr_tty(channel_id);
-        else if ( isr_id == ISR_TIMER ) _isr_timer(channel_id);
-        else                            _isr_default();
+        if(type_id == 0) // HARD irq type
+        {
+            if      ( isr_id == ISR_SWITCH) _isr_switch(channel_id);
+            else if ( isr_id == ISR_IOC   ) _isr_ioc();
+            else if ( isr_id == ISR_DMA   ) _isr_dma(channel_id);
+            else if ( isr_id == ISR_TTY   ) _isr_tty(channel_id);
+            else if ( isr_id == ISR_TIMER ) _isr_timer(channel_id);
+            else                            _isr_default();
+        }
+        else // PTI irq type
+        {
+            if      ( isr_id == ISR_SWITCH) _isr_switch(irq_id);
+            else if ( isr_id == ISR_TIMER ) _isr_timer(irq_id);
+        }
     }
 }

soft/giet_vm/sys/sys_handler.c

@@ -94 +94 @@
 
     // deschedule
-    _ctx_switch();
+    _context_switch();
 } 
 
@@ -232 +232 @@
 ////////////////////////////////////////////////////////////////
 void _context_switch() {
-    _it_mask();
+    _it_disable();
     _ctx_switch();
-    _it_restore();
 }
 

soft/giet_vm/xml/xml_parser.c

@@ -1239 +1239 @@
             irq[irq_index]->type = 0;
         }
-        else if (strcmp(str, "SOFT") == 0 ) {
+        else {
             irq[irq_index]->type = 1;
         }
-        else {
-            printf("[XML ERROR] undefined IRQ  <type> for processor %d in cluster %d\n",
-                    cluster_index, proc_loc_index);
-            exit(1);
-        }
-    }  
+    }
     else {
         printf("[XML ERROR] missing IRQ <type> for processor %d in cluster %d\n",