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

Timestamp:

Apr 6, 2017, 5:01:31 PM (7 years ago)

Author:

alain

Message:

Introduce the vci_master_nic component in the TSAR IOB architecture.

File:

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

trunk/platforms/tsar_generic_iob/arch.py

@@ -65 +65 @@
     ### define architecture constants
 
-    nb_nics         = 1 
-    nb_cmas         = 4
+    if   ( x_size * y_size >= 4 ) : nb_nics = 4 
+    elif ( x_size * y_size == 2 ) : nb_nics = 2
+    else                          : nb_nics = 1
+
+    nb_cmas         = 1
     x_io            = 0
     y_io            = 0
@@ -124 +127 @@
 
     nic_base  = 0x00B5000000
-    nic_size  = 0x80000                    # 512 kbytes
+    nic_size  = 0x1000                     # 4 Kkbytes
 
     cma_base  = 0x00B6000000
@@ -171 +174 @@
 
     kernel_heap_vbase    = 0xD0000000
-    kernel_heap_size     = 0x00400000           # 4 Mbytes per cluster
+    kernel_heap_size     = 0x00200000           # 2 Mbytes per cluster
 
     kernel_sched_vbase   = 0xA0000000   
@@ -267 +270 @@
                                          ptype = 'PIC', channels = 32 )
 
+                if ( ioc_type == 'BDV' ): isr_ioc = 'ISR_BDV'
+                if ( ioc_type == 'HBA' ): isr_ioc = 'ISR_HBA'
+                if ( ioc_type == 'SDC' ): isr_ioc = 'ISR_SDC'
+                if ( ioc_type == 'SPI' ): isr_ioc = 'ISR_SPI'
+
                 mapping.addIrq( pic, index = 0, src = nic,
                                 isrtype = 'ISR_NIC_RX', channel = 0 )
                 mapping.addIrq( pic, index = 1, src = nic,
                                 isrtype = 'ISR_NIC_RX', channel = 1 )
-
                 mapping.addIrq( pic, index = 2, src = nic,
+                                isrtype = 'ISR_NIC_RX', channel = 2 )
+                mapping.addIrq( pic, index = 3, src = nic,
+                                isrtype = 'ISR_NIC_RX', channel = 3 )
+
+                mapping.addIrq( pic, index = 4, src = nic,
                                 isrtype = 'ISR_NIC_TX', channel = 0 )
-                mapping.addIrq( pic, index = 3, src = nic,
+                mapping.addIrq( pic, index = 5, src = nic,
                                 isrtype = 'ISR_NIC_TX', channel = 1 )
-
-                mapping.addIrq( pic, index = 4, src = cma,
+                mapping.addIrq( pic, index = 6, src = nic,
+                                isrtype = 'ISR_NIC_TX', channel = 2 )
+                mapping.addIrq( pic, index = 7, src = nic,
+                                isrtype = 'ISR_NIC_TX', channel = 3 )
+
+                mapping.addIrq( pic, index = 8 , src = cma,
                                 isrtype = 'ISR_CMA', channel = 0 )
-                mapping.addIrq( pic, index = 5, src = cma,
+                mapping.addIrq( pic, index = 9 , src = cma,
                                 isrtype = 'ISR_CMA', channel = 1 )
-                mapping.addIrq( pic, index = 6, src = cma,
+                mapping.addIrq( pic, index = 10, src = cma,
                                 isrtype = 'ISR_CMA', channel = 2 )
-                mapping.addIrq( pic, index = 7, src = cma,
+                mapping.addIrq( pic, index = 11, src = cma,
                                 isrtype = 'ISR_CMA', channel = 3 )
 
-                if ( ioc_type == 'BDV' ): isr_ioc = 'ISR_BDV'
-                if ( ioc_type == 'HBA' ): isr_ioc = 'ISR_HBA'
-                if ( ioc_type == 'SDC' ): isr_ioc = 'ISR_SDC'
-                if ( ioc_type == 'SPI' ): isr_ioc = 'ISR_SPI'
-
-                mapping.addIrq( pic, index = 8, src = ioc,
+                mapping.addIrq( pic, index = 12, src = ioc,
                                 isrtype = isr_ioc, channel = 0 )
+
                 mapping.addIrq( pic, index = 16, src = tty,
                                 isrtype = 'ISR_TTY_RX', channel = 0 )