Changeset 1051 for trunk/platforms/tsar_generic_iob/arch_info.py

Timestamp:

Apr 11, 2017, 11:50:57 PM (7 years ago)

Author:

alain

Message:

Replace the vci_mwmr_dma hardware component by the vci_multi_dma component.

File:

• trunk/platforms/tsar_generic_iob/arch_info.py (modified) (7 diffs)

trunk/platforms/tsar_generic_iob/arch_info.py

@@ -31 +31 @@
 #  - fbf_width      : frame_buffer width = frame_buffer heigth
 #  - ioc_type       : can be 'IOC_BDV','IOC_HBA','IOC_SDC', 'IOC_SPI','NONE'
-#  - mwr_type       : can be 'MWR_GCD','MWR_DCT','MWR_CPY','NONE'
 #  - io_cxy         : IO cluster identifier
 #  - boot_cxy       : boot cluster identifier
@@ -53 +52 @@
           fbf_width     = 128,
           ioc_type      = 'IOC_BDV',
-          mwr_type      = 'MWR_CPY',
           io_cxy        = 0,
           boot_cxy      = 0, 
@@ -83 +81 @@
     assert( ioc_type in ['IOC_BDV','IOC_HBA','IOC_SDC','IOC_SPI','IOC_RDK'] )
 
-    assert( mwr_type in ['MWR_GCD','MWR_DCT','MWR_CPY'] )
-
     assert( (io_cxy == 0) or (io_cxy == ((x_size-1)<<y_width) + (y_size-1)) ) 
 
@@ -103 +99 @@
     xcu_size = 0x1000                      # 4 Kbytes
 
-    mwr_base = 0x00B1000000
-    mwr_size = 0x1000                      # 4 Kbytes 
+    dma_base = 0x00B1000000
+    dma_size = 0x1000                      # 4 Kbytes 
 
     mmc_base = 0x00B2000000
@@ -170 +166 @@
                                    size     = xcu_size,
                                    channels = 1, 
-                                   arg0     = 16, 
-                                   arg1     = 16,
-                                   arg2     = 16,
-                                   arg3     = 16 )
+                                   arg0     = 16,              # number of HWIs
+                                   arg1     = 16,              # number of WTIs
+                                   arg2     = 16,              # number of PTIs
+                                   arg3     = 16 )             # number of output IRQs
 
             mmc = archi.addDevice( ptype    = 'MMC_TSR',
@@ -181 +177 @@
             archi.addIrq( dstdev = xcu, port = 0, srcdev = mmc )
 
-            if ( mwr_type == 'MWR_GCD' ):
-                mwr = archi.addDevice( ptype = 'MWR_GCD',
-                                       base  = mwr_base + offset,
-                                       size  = mwr_size,
-                                       arg0  = 2, 
-                                       arg1  = 1,
-                                       arg2  = 1, 
-                                       arg3  = 0 )
-                archi.addIrq( dstdev = xcu, port = 1, srcdev = mwr )
-
-            if ( mwr_type == 'MWR_DCT' ):
-                mwr = archi.addDevice( ptype = 'MWR_DCT',
-                                       base  = mwr_base + offset,
-                                       size  = mwr_size,
-                                       arg0  = 1, 
-                                       arg1  = 1,
-                                       arg2  = 1, 
-                                       arg3  = 0 )
-                archi.addIrq( dstdev = xcu, port = 1, srcdev = mwr )
-
-            if ( mwr_type == 'MWR_CPY' ):
-                mwr = archi.addDevice( ptype = 'MWR_CPY',
-                                       base  = mwr_base + offset,
-                                       size  = mwr_size,
-                                       arg0  = 1, 
-                                       arg1  = 1,
-                                       arg2  = 1, 
-                                       arg3  = 0 )
-                archi.addIrq( dstdev = xcu, port = 1, srcdev = mwr )
+            dma = archi.addDevice( ptype    = 'DMA_SCL',
+                                   base     = dma_base + offset,
+                                   size     = dma_size,
+                                   channels = nb_cores )
+
+            archi.addIrq( dstdev = xcu, port = 1, srcdev = dma, channel = 0 )
+            archi.addIrq( dstdev = xcu, port = 2, srcdev = dma, channel = 1 )
+            archi.addIrq( dstdev = xcu, port = 3, srcdev = dma, channel = 2 )
+            archi.addIrq( dstdev = xcu, port = 4, srcdev = dma, channel = 3 )
 
             # define external devices
             if( cxy == io_cxy ):
+
+                pic = archi.addDevice( ptype    ='PIC_TSR',
+                                       base     = pic_base + offset,
+                                       size     = pic_size, 
+                                       arg0     = 32 )         # number of input IRQs
 
                 iob = archi.addDevice( ptype    = 'IOB_TSR', 
@@ -241 +222 @@
                                        base     = rom_base + offset, 
                                        size     = rom_size )
-
-                pic = archi.addDevice( ptype    ='PIC_TSR',
-                                       base     = pic_base + offset,
-                                       size     = pic_size, 
-                                       arg0     = 32 )
 
                 archi.addIrq( dstdev = pic, port = 0 , srcdev = nic, channel = 0 , is_rx = True )