Changeset 710 for trunk/platforms/tsar_generic_iob/genmap.py

Timestamp:

Jun 10, 2014, 11:09:40 AM (10 years ago)

Author:

alain

Message:

Remove the multi-TTY capability: only one external TTY channel.
This reduce the number of external IRQs (i.e. the number of WTIs)
and we can now generate mono-cluster / mono-processor architecture.

File:

• trunk/platforms/tsar_generic_iob/genmap.py (modified) (5 diffs)

trunk/platforms/tsar_generic_iob/genmap.py

@@ -159 +159 @@
     cma = mapping.addPeriph( 'CMA', base = cma_base, size = cma_size, ptype = 'CMA', channels = 2*nb_nics )
 
-    fbf = mapping.addPeriph( 'FBF', base = fbf_base, size = fbf_size, ptype = 'FBF', arg1 = 128, arg2 = 128 )
+    fbf = mapping.addPeriph( 'FBF', base = fbf_base, size = fbf_size, ptype = 'FBF', arg = 128 )
 
     rom = mapping.addPeriph( 'ROM', base = rom_base, size = rom_size, ptype = 'ROM' )
@@ -165 +165 @@
     pic = mapping.addPeriph( 'PIC', base = pic_base, size = pic_size, ptype = 'PIC', channels = 32 )
 
-    mapping.addIrq( pic, index = 0,  isrtype = 'ISR_NIC_RX', channel = 0 )
-    mapping.addIrq( pic, index = 1,  isrtype = 'ISR_NIC_RX', channel = 1 )
-    mapping.addIrq( pic, index = 2,  isrtype = 'ISR_NIC_TX', channel = 0 )
-    mapping.addIrq( pic, index = 3,  isrtype = 'ISR_NIC_TX', channel = 1 )
-
-    mapping.addIrq( pic, index = 4,  isrtype = 'ISR_CMA'   , channel = 0 )
-    mapping.addIrq( pic, index = 5,  isrtype = 'ISR_CMA'   , channel = 1 )
-    mapping.addIrq( pic, index = 6,  isrtype = 'ISR_CMA'   , channel = 2 )
-    mapping.addIrq( pic, index = 7,  isrtype = 'ISR_CMA'   , channel = 3 )
-
-    mapping.addIrq( pic, index = 8,  isrtype = 'ISR_BDV'   , channel = 0 )
-
-    mapping.addIrq( pic, index = 16, isrtype = 'ISR_TTY_RX', channel = 0 )
-    mapping.addIrq( pic, index = 17, isrtype = 'ISR_TTY_RX', channel = 1 )
-    mapping.addIrq( pic, index = 18, isrtype = 'ISR_TTY_RX', channel = 2 )
-    mapping.addIrq( pic, index = 19, isrtype = 'ISR_TTY_RX', channel = 3 )
-    mapping.addIrq( pic, index = 20, isrtype = 'ISR_TTY_RX', channel = 4 )
-    mapping.addIrq( pic, index = 21, isrtype = 'ISR_TTY_RX', channel = 5 )
-    mapping.addIrq( pic, index = 22, isrtype = 'ISR_TTY_RX', channel = 6 )
-    mapping.addIrq( pic, index = 23, isrtype = 'ISR_TTY_RX', channel = 7 )
+    mapping.addIrq( pic, index = 0, isrtype = 'ISR_NIC_RX', channel = 0 )
+    mapping.addIrq( pic, index = 1, isrtype = 'ISR_NIC_RX', channel = 1 )
+
+    mapping.addIrq( pic, index = 2, isrtype = 'ISR_NIC_TX', channel = 0 )
+    mapping.addIrq( pic, index = 3, isrtype = 'ISR_NIC_TX', channel = 1 )
+
+    mapping.addIrq( pic, index = 4, isrtype = 'ISR_CMA'   , channel = 0 )
+    mapping.addIrq( pic, index = 5, isrtype = 'ISR_CMA'   , channel = 1 )
+    mapping.addIrq( pic, index = 6, isrtype = 'ISR_CMA'   , channel = 2 )
+    mapping.addIrq( pic, index = 7, isrtype = 'ISR_CMA'   , channel = 3 )
+
+    mapping.addIrq( pic, index = 8, isrtype = 'ISR_BDV'   , channel = 0 )
+
+    mapping.addIrq( pic, index = 9, isrtype = 'ISR_TTY_RX', channel = 0 )
 
     ### hardware components replicated in all clusters   
@@ -202 +196 @@
 
             xcu = mapping.addPeriph( 'XCU', base = xcu_base + offset, size = xcu_size, 
-                                     ptype = 'XCU', channels = nb_procs * irq_per_proc, 
-                                     arg1 = 16, arg2 = 16, arg3 = 16 )
-
-            # MMC IRQ replicated in all clusters
-            mapping.addIrq( xcu, index = 0, isrtype = 'ISR_MMC' )
+                                     ptype = 'XCU', channels = nb_procs * irq_per_proc, arg = 16 )
 
             # DMA IRQs replicated in all clusters
@@ -212 +202 @@
                 mapping.addIrq( xcu, index = (p+1), isrtype = 'ISR_DMA', channel = p )
             
+            # MMC IRQ replicated in all clusters
+            mapping.addIrq( xcu, index = 0, isrtype = 'ISR_MMC' )
+
             # processors
             for p in xrange ( nb_procs ):
@@ -273 +266 @@
                        vtype = 'PERI', x = 0, y = 0, pseg = 'ROM', identity = True )
 
-    ### Global vsegs for replicated peripherals, and for scheduler 
-    ### Note: one vseg per cluster: the vseg name is indexed by (x,y)
-    ### the vseg base address is incremented by (cluster_xy * 0x10000)
+    ### Global vsegs for replicated peripherals, and for scheduler. 
+    ### A replicated vseg is replicated in all clusters: vseg name is indexed by (x,y),
+    ### and vseg base address is incremented by (cluster_xy * 0x10000)
 
     mapping.addGlobal( 'seg_xcu'  , xcu_base          , xcu_size         , '__W_',