Changeset 965 for trunk/platforms/tsar_generic_iob/arch.py

Timestamp:

Apr 5, 2015, 12:42:04 AM (9 years ago)

Author:

alain

Message:

Introduce a new parameter in the tsar_generic_iob SystemC architecture:
The top cell use now the hard_config.h file to select the block_device type:
If USE_IOC_HBA is set, it use the vci_multi_ahci controller.
Else, it use the vci_block_device_tsar component.

File:

• trunk/platforms/tsar_generic_iob/arch.py (modified) (11 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -16 +16 @@
 #  This platform includes 6 external peripherals, accessible through an IOB
 #  components located in cluster [0,0] or in cluster [x_size-1, y_size-1].
-#  Available peripherals are: TTY, BDV, FBF, ROM, NIC, CMA, PIC.
+#  Available peripherals are: TTY, HBA, FBF, ROM, NIC, CMA, PIC.
 #
 #  All clusters contain (nb_procs) processors, one L2 cache, one XCU, and
@@ -27 +27 @@
 #  - nb_ttys        : number of TTY channels
 #  - fbf_width      : frame_buffer width = frame_buffer heigth
+#  - ioc_type       : can be 'BDV' , 'HBA' , 'SDC' , 'NONE'
 #
 #  The other hardware parameters are:
@@ -57 +58 @@
           nb_procs  = 2,
           nb_ttys   = 1,
-          fbf_width = 128 ):
+          fbf_width = 128,
+          ioc_type  = 'BDV' ):
 
     ### define architecture constants
@@ -70 +72 @@
     paddr_width     = 40
     irq_per_proc    = 4
-    use_ramdisk     = False
     peri_increment  = 0x10000    # distributed peripherals vbase address increment
 
@@ -88 +89 @@
             ((x_io == x_size-1) and (y_io == y_size-1)) )
 
-    ### define type and name
-
-    platform_type  = 'tsar_iob'
-    platform_name  = '%s_%d_%d_%d' % ( platform_type, x_size, y_size , nb_procs )
+    assert( ioc_type in IOCSUBTYPES )
+ 
+    ### define platform name
+
+    platform_name = 'tsar_iob_%d_%d_%d' % ( x_size, y_size , nb_procs )
+    platform_name += '_%d_%d_%s' % ( fbf_width , nb_ttys , ioc_type )
 
     ### define physical segments replicated in all clusters
@@ -110 +113 @@
     ## These segments are only defined in cluster_io
 
-    bdv_base  = 0x00B3000000
-    bdv_size  = 0x1000                     # 4kbytes
+    ioc_base  = 0x00B3000000
+    ioc_size  = 0x1000                     # 4 Kbytes
 
     tty_base  = 0x00B4000000
@@ -186 +189 @@
                        coherence      = True,          
                        irq_per_proc   = irq_per_proc,  
-                       use_ramdisk    = use_ramdisk,  
+                       use_ramdisk    = (ioc_type == 'RDK'),
                        x_io           = x_io,          
                        y_io           = y_io,
@@ -234 +237 @@
                                          ptype = 'IOB' )
 
-                bdv = mapping.addPeriph( 'BDV', base = bdv_base + offset, size = bdv_size, 
-                                         ptype = 'IOC', subtype = 'BDV' )
+                ioc = mapping.addPeriph( 'IOC', base = ioc_base + offset, size = ioc_size, 
+                                         ptype = 'IOC', subtype = ioc_type )
 
                 tty = mapping.addPeriph( 'TTY', base = tty_base + offset, size = tty_size, 
@@ -266 +269 @@
                 mapping.addIrq( pic, index = 7,  isrtype = 'ISR_CMA'   , channel = 3 )
 
-                mapping.addIrq( pic, index = 8,  isrtype = 'ISR_BDV'   , channel = 0 )
+                if ( ioc_type == 'BDV' ): isr_ioc = 'ISR_BDV'
+                if ( ioc_type == 'HBA' ): isr_ioc = 'ISR_HBA'
+                if ( ioc_type == 'SDC' ): isr_ioc = 'ISR_SDC'
+
+                mapping.addIrq( pic, index = 8,  isrtype = isr_ioc     , channel = 0 )
 
                 mapping.addIrq( pic, index = 16, isrtype = 'ISR_TTY_RX', channel = 0 )
@@ -310 +317 @@
 
     ### global vsegs kernel_code, kernel_init : big / local
-    ### replicated in all clusters with the same name & same vbase
-    for x in xrange( x_size ):
-        for y in xrange( y_size ):
-            mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
+    ### replicated in all clusters with indexed name & same vbase
+    for x in xrange( x_size ):
+        for y in xrange( y_size ):
+            mapping.addGlobal( 'seg_kernel_code_%d_%d' %(x,y), 
+                               kernel_code_vbase, kernel_code_size,
                                'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
                                binpath = 'build/kernel/kernel.elf', 
                                local = True, big = True )
 
-            mapping.addGlobal( 'seg_kernel_init', kernel_init_vbase, kernel_init_size,
+            mapping.addGlobal( 'seg_kernel_init_%d_%d' %(x,y), 
+                               kernel_init_vbase, kernel_init_size,
                                'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
                                binpath = 'build/kernel/kernel.elf', 
@@ -358 +367 @@
                        local = False, big = True )
 
-    mapping.addGlobal( 'seg_bdv', bdv_base, bdv_size, '__W_',
-                       vtype = 'PERI', x = 0, y = 0, pseg = 'BDV',
+    mapping.addGlobal( 'seg_ioc', ioc_base, ioc_size, '__W_',
+                       vtype = 'PERI', x = 0, y = 0, pseg = 'IOC',
                        local = False, big = True )