Changeset 1018 for trunk

Timestamp:

Oct 1, 2015, 11:17:10 AM (9 years ago)

Author:

alain

Message:

Increase the number of CMA channels.

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch.py (modified) (5 diffs)
• top.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -62 +62 @@
           nb_ttys   = 1,
           fbf_width = 128,
-          ioc_type  = 'HBA' ):
+          ioc_type  = 'BDV' ):
 
     ### define architecture constants
 
     nb_nics         = 1 
-    nb_cmas         = 2
+    nb_cmas         = 4
     x_io            = 0
     y_io            = 0
@@ -76 +76 @@
     irq_per_proc    = 4          
     peri_increment  = 0x10000  
-    mwr_type        = 'CPY'
+    mwr_type        = 'GCD'
 
     ### constructor parameters checking
@@ -105 +105 @@
 
     ram_base = 0x0000000000
-    ram_size = 0x1000000                   # 16 Mbytes
+    ram_size = 0x4000000                   # 64 Mbytes
 
     xcu_base = 0x00B0000000
@@ -129 +129 @@
 
     cma_base  = 0x00B6000000
-    cma_size  = 0x1000 * 2 * nb_nics       # 4 kbytes * 2 * nb_nics
+    cma_size  = 0x1000 * nb_cmas           # 4 kbytes * nb_cmas
 
     fbf_base  = 0x00B7000000
-    fbf_size  = fbf_width * fbf_width     # fbf_width * fbf_width bytes
+    fbf_size  = fbf_width * fbf_width      # fbf_width * fbf_width bytes
 
     pic_base  = 0x00B8000000
@@ -176 +176 @@
 
     kernel_heap_vbase    = 0xD0000000
-    kernel_heap_size     = 0x00200000           # 2 Mbytes per cluster
+    kernel_heap_size     = 0x00400000           # 4 Mbytes per cluster
 
     kernel_sched_vbase   = 0xA0000000   

trunk/platforms/tsar_generic_iob/top.cpp

@@ -1793 +1793 @@
 //              signal_vci_tgt_iob0.print_trace("[SIG]IOB0_IOX_TGT");
 
-//              cdma->print_trace();
-//              signal_vci_tgt_cdma.print_trace("[SIG]CDMA_TGT");
-//              signal_vci_ini_cdma.print_trace("[SIG]CDMA_INI");
+                cdma->print_trace();
+                signal_vci_tgt_cdma.print_trace("[SIG]CDMA_TGT");
+                signal_vci_ini_cdma.print_trace("[SIG]CDMA_INI");
 
 //              brom->print_trace();
@@ -1803 +1803 @@
 //              signal_vci_tgt_mtty.print_trace("[SIG]MTTY_TGT");
 
-                disk->print_trace();
-                signal_vci_tgt_disk.print_trace("[SIG]DISK_TGT");
-                signal_vci_ini_disk.print_trace("[SIG]DISK_INI");
+//              disk->print_trace();
+//              signal_vci_tgt_disk.print_trace("[SIG]DISK_TGT");
+//              signal_vci_ini_disk.print_trace("[SIG]DISK_INI");
 
 #if ( USE_IOC_SDC )
-                card->print_trace();
+//              card->print_trace();
 #endif
 
@@ -1814 +1814 @@
 //              signal_vci_tgt_mnic.print_trace("[SIG]MNIC_TGT");
 
-//              fbuf->print_trace();
-//              signal_vci_tgt_fbuf.print_trace("[SIG]FBUF_TGT");
+                fbuf->print_trace();
+                signal_vci_tgt_fbuf.print_trace("[SIG]FBUF_TGT");
 
 //              iopi->print_trace();