Changeset 1025

Timestamp:

Dec 3, 2015, 4:50:09 PM (9 years ago)

Author:

alain

Message:

Modify the mapping of the kernel_init_segment in arch.py
to have only one vseg per BPP.

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch.py (modified) (7 diffs)
• top.cpp (modified) (2 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -28 +28 @@
 #  - fbf_width      : frame_buffer width = frame_buffer heigth
 #  - ioc_type       : can be 'BDV','HBA','SDC', 'SPI' but not 'RDK'
-#   
+#  - mwr_type       : coprocessor type / can be 'GCD','DCT','CPY','NONE'
 #
 #  The other hardware parameters (defined in this script) are:
@@ -37 +37 @@
 #  - x_width        : number of bits for x coordinate
 #  - y_width        : number of bits for y coordinate
+#  - p_width        : number of bits for processor local index
 #  - paddr_width    : number of bits for physical address
 #  - irq_per_proc   : number of input IRQs per processor
-#  - use_ramdisk    : use a ramdisk when True
-#  - vseg_increment : address increment for replicated vsegs
-#  - mwr_type       : coprocessor type / can be 'GCD','DCT','NOPE'
-#  - use_dma        : one single channel DMA per cluster if non zero
+#  - peri_increment : address increment for replicated peripherals
 #
 #  Regarding the boot and kernel vsegs mapping :
@@ -62 +60 @@
           nb_ttys   = 1,
           fbf_width = 128,
-          ioc_type  = 'BDV' ):
+          ioc_type  = 'BDV',
+          mwr_type  = 'CPY' ):
 
     ### define architecture constants
@@ -76 +75 @@
     irq_per_proc    = 4          
     peri_increment  = 0x10000  
-    mwr_type        = 'GCD'
 
     ### constructor parameters checking
@@ -88 +86 @@
              or (y_size == 8) or (y_size == 16) )
 
-    assert( (nb_ttys >= 1) and (nb_ttys <= 8) )
+    assert( (nb_ttys >= 1) and (nb_ttys <= 16) )
 
     assert( ((x_io == 0) and (y_io == 0)) or
@@ -95 +93 @@
     assert( ioc_type in [ 'BDV' , 'HBA' , 'SDC' , 'SPI' ] )
 
-    assert( mwr_type in [ 'GCD' , 'DCT' , 'CPY' , 'NONE' ] )
+    assert( mwr_type in [ 'GCD' , 'DCT' , 'CPY' ] )
  
     ### 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 )
+    platform_name += '_%d_%d_%s_%s' % ( fbf_width , nb_ttys , ioc_type , mwr_type )
 
     ### define physical segments replicated in all clusters
@@ -166 +164 @@
     kernel_code_size     = 0x00100000           # 1 Mbytes per cluster
 
-    kernel_init_vbase    = 0x80100000
+    kernel_init_vbase    = 0x88000000
     kernel_init_size     = 0x00100000           # 1 Mbytes per cluster
 

trunk/platforms/tsar_generic_iob/top.cpp

@@ -12 +12 @@
 // - FBUF : Frame Buffer
 // - MTTY : multi TTY (one channel)
-// - MNIC : Network controller (up to 2 channels)
+// - MNIC : Network controller (up to 16 channels)
 // - CDMA : Chained Buffer DMA controller (up to 4 channels)
 // - DISK : Block device controler (BDV / HBA / SDC)
@@ -1719 +1719 @@
 
                 // coprocessor in cluster(x,y)
-//              clusters[x][y]->mwmr->print_trace();
-//              std::ostringstream mwmr_tgt_signame;
-//              mwmr_tgt_signame << "[SIG]MWMR_TGT_" << x << "_" << y;
-//              clusters[x][y]->signal_int_vci_tgt_mwmr.print_trace(mwmr_tgt_signame.str());
-//              std::ostringstream mwmr_ini_signame;
-//              mwmr_ini_signame << "[SIG]MWMR_INI_" << x << "_" << y;
-//              clusters[x][y]->signal_int_vci_ini_mwmr.print_trace(mwmr_ini_signame.str());
-//              if ( USE_MWR_CPY ) clusters[x][y]->cpy->print_trace();
-//              if ( USE_MWR_DCT ) clusters[x][y]->dct->print_trace();
-//              if ( USE_MWR_GCD ) clusters[x][y]->gcd->print_trace();
+                clusters[x][y]->mwmr->print_trace();
+                std::ostringstream mwmr_tgt_signame;
+                mwmr_tgt_signame << "[SIG]MWMR_TGT_" << x << "_" << y;
+                clusters[x][y]->signal_int_vci_tgt_mwmr.print_trace(mwmr_tgt_signame.str());
+                std::ostringstream mwmr_ini_signame;
+                mwmr_ini_signame << "[SIG]MWMR_INI_" << x << "_" << y;
+                clusters[x][y]->signal_int_vci_ini_mwmr.print_trace(mwmr_ini_signame.str());
+                if ( USE_MWR_CPY ) clusters[x][y]->cpy->print_trace();
+                if ( USE_MWR_DCT ) clusters[x][y]->dct->print_trace();
+                if ( USE_MWR_GCD ) clusters[x][y]->gcd->print_trace();
 
                 // local interrupts in cluster(x,y)