Changeset 295 for soft/giet_vm/giet_xml/mapping_info.h

Timestamp:

Mar 26, 2014, 6:44:44 PM (10 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/giet_xml/mapping_info.h (modified) (7 diffs)

soft/giet_vm/giet_xml/mapping_info.h

@@ -30 +30 @@
 // - mapping_vspace_t   vspace[]  
 // - mapping_vseg_t     vseg[]     
-// - mapping_vseg_t     vobj[]    
+// - mapping_vobj_t     vobj[]    
 // - mapping_task_t     task[]  
 // - mapping_proc_t     proc[]  
@@ -61 +61 @@
 #define U_MODE_MASK  0b0001   // user access
 
-#define IN_MAPPING_SIGNATURE    0xDEADBEEF
+#define IN_MAPPING_SIGNATURE    0xDACE2014
 #define OUT_MAPPING_SIGNATURE   0xBABEF00D
 
@@ -85 +85 @@
 {
     IRQ_TYPE_HWI = 0,        // HARD in map.xml file
-    IRQ_TYPE_SWI = 1,        // SOFT in map.xml file,
+    IRQ_TYPE_WTI = 1,        // SOFT in map.xml file,
     IRQ_TYPE_PTI = 2,        // TIME in map.xml file,
 };
@@ -115 +115 @@
     PERIPH_TYPE_TTY       = 12,
     PERIPH_TYPE_XCU       = 13,
-
-    PERIPH_TYPE_MAX_VALUE = 14,
+    PERIPH_TYPE_PIC       = 14,
+
+    PERIPH_TYPE_MAX_VALUE = 15,
 };
 
@@ -145 +146 @@
     unsigned int globals;            // number of vsegs mapped in all vspaces
     unsigned int vspaces;            // number of virtual spaces
-    unsigned int increment;          // vseg cluster increment for replicated periphs
+    unsigned int x_io;               // x coordinate for cluster_io_ext
+    unsigned int y_io;               // y coordinate for cluster_io_ext
     unsigned int irq_per_proc;       // number of IRQ per processor
-
-    unsigned int cma_cluster;        // index of cluster containing CMA controler
-    unsigned int cma_cluster_bis;    // index of cluster containing second CMA controler
-
-    unsigned int fbf_cluster;        // index of cluster containing FBF controler
-    unsigned int fbf_cluster_bis;    // index of cluster containing second FBF controler
-
-    unsigned int iob_cluster;        // index of cluster containing IOB controler
-    unsigned int iob_cluster_bis;    // index of cluster containing second IOB controler
-
-    unsigned int ioc_cluster;        // index of cluster containing IOC controler
-    unsigned int ioc_cluster_bis;    // index of cluster containing second IOC controler
-
-    unsigned int nic_cluster;        // index of cluster containing NIC controler
-    unsigned int nic_cluster_bis;    // index of cluster containing second NIC controler
-
-    unsigned int rom_cluster;        // index of cluster containing ROM controler
-    unsigned int rom_cluster_bis;    // index of cluster containing second ROM controler
-
-    unsigned int sim_cluster;        // index of cluster containing SIM controler
-    unsigned int sim_cluster_bis;    // index of cluster containing second SIM controler
-
-    unsigned int tty_cluster;        // index of cluster containing TTY controler
-    unsigned int tty_cluster_bis;    // index of cluster containing second TTY controler
+    unsigned int use_ramdisk;        // does not use IOC peripheral if non zero
+    unsigned int increment;          // vbase address increment (replicated peripherals)
 
     unsigned int psegs;              // total number of physical segments (for all clusters)
@@ -286 +266 @@
 typedef struct __attribute__((packed))  mapping_proc_s 
 {
-    unsigned int    irqs;            // number of IRQs allocated to processor
-    unsigned int    irq_offset;      // index of first IRQ allocated to processor
+    unsigned int    index;           // processor local index (in cluster)
 } mapping_proc_t;
-
-
-/////////////////////////////////////////////////////
-typedef struct __attribute__((packed))  mapping_irq_s 
-{
-    unsigned int    type;            // HWI / SWI / PTI
-    unsigned int    icuid;           // IRQ Index for the ICU component
-    unsigned int    isr;             // ISR Index (defined in irq_handler.h)
-    unsigned int    channel;         // Channel Index (for multi-channels peripherals)
-} mapping_irq_t; 
 
 
@@ -323 +292 @@
 typedef struct __attribute__((packed))  mapping_periph_s 
 {
-    unsigned int    type;         
+    unsigned int    type;            // legal values defined above
     unsigned int    subtype;         // periph specialization
     unsigned int    psegid;          // pseg index in cluster
     unsigned int    channels;        // number of channels
+    unsigned int    irqs;            // number of input IRQs (for ICU, XCU or PIC)
+    unsigned int    irq_offset;      // index of first IRQ (can be HWI/PTI/WTI)
 } mapping_periph_t;
+
+
+/////////////////////////////////////////////////////
+typedef struct __attribute__((packed))  mapping_irq_s 
+{
+    unsigned int    srctype;         // source IRQ type (HWI / WTI / PTI)
+    unsigned int    srcid;           // source IRQ index (for ICU/PIC component)
+    unsigned int    isr;             // ISR type (defined in irq_handler.h)
+    unsigned int    channel;         // channel index (for multi-channels peripherals)
+    unsigned int    dstx;            // x coordinate of destination cluster
+    unsigned int    dsty;            // y coordinate of destination cluster
+    unsigned int    dstid;           // destination IRQ index (can be PROC or ICU)
+} mapping_irq_t;