Changeset 498 for trunk

Timestamp:

Aug 27, 2013, 5:38:13 PM (11 years ago)

Author:

alain

Message:

Fixing few bugs to support DISPLAY_CMA application.

Location:

trunk/platforms/tsar_generic_iob

Files:

• top.cpp (modified) (12 diffs)
• tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (1 diff)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -13 +13 @@
 // - MTTY : multi TTY (up to 15 channels)
 // - MNIC : Network controller (up to 2 channels)
-// - CDMA : Chained Buffer controller (up to 4 channels)
+// - CDMA : Chained Buffer DMA controller (up to 4 channels)
 // - BDEV : Dlock Device controler (1 channel)
 // 
@@ -671 +671 @@
     maptab_iox.add(Segment("iox_seg_mtty_0", MTTY_BASE + iob0_base, MTTY_SIZE, 
                    IntTab(cluster_iob0,IOX_MTTY_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_mtty_1", MTTY_BASE + iob1_base, MTTY_SIZE, 
                    IntTab(cluster_iob1,IOX_MTTY_TGT_ID), false));
@@ -677 +676 @@
     maptab_iox.add(Segment("iox_seg_fbuf_0", FBUF_BASE + iob0_base, FBUF_SIZE, 
                    IntTab(cluster_iob0,IOX_FBUF_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_fbuf_1", FBUF_BASE + iob1_base, FBUF_SIZE, 
                    IntTab(cluster_iob1,IOX_FBUF_TGT_ID), false));
@@ -683 +681 @@
     maptab_iox.add(Segment("iox_seg_bdev_0", BDEV_BASE + iob0_base, BDEV_SIZE, 
                    IntTab(cluster_iob0,IOX_BDEV_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_bdev_1", BDEV_BASE + iob1_base, BDEV_SIZE, 
                    IntTab(cluster_iob1,IOX_BDEV_TGT_ID), false));
@@ -689 +686 @@
     maptab_iox.add(Segment("iox_seg_mnic_0", MNIC_BASE + iob0_base, MNIC_SIZE, 
                    IntTab(cluster_iob0,IOX_MNIC_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_mnic_1", MNIC_BASE + iob1_base, MNIC_SIZE, 
                    IntTab(cluster_iob1,IOX_MNIC_TGT_ID), false));
@@ -695 +691 @@
     maptab_iox.add(Segment("iox_seg_cdma_0", CDMA_BASE + iob0_base, CDMA_SIZE, 
                    IntTab(cluster_iob0,IOX_CDMA_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_cdma_1", CDMA_BASE + iob1_base, CDMA_SIZE, 
                    IntTab(cluster_iob1,IOX_CDMA_TGT_ID), false));
@@ -701 +696 @@
     maptab_iox.add(Segment("iox_seg_brom_0", BROM_BASE + iob0_base, BROM_SIZE, 
                    IntTab(cluster_iob0,IOX_BROM_TGT_ID), false));
-
     maptab_iox.add(Segment("iox_seg_brom_1", BROM_BASE + iob1_base, BROM_SIZE, 
                    IntTab(cluster_iob1,IOX_BROM_TGT_ID), false));
@@ -1116 +1110 @@
 
     // IRQ connexions (for cluster_iob0 only)
+    // IRQ_MNIC_RX  -> IRQ[08] to IRQ[09]
+    // IRQ_MNIC_TX  -> IRQ[10] to IRQ[11]
+    // IRQ_CDMA     -> IRQ[12] to IRQ[15]
+    // IRQ_MTTY     -> IRQ[16] to IRQ[30]
+    // IRQ_BDEV     -> IRQ[31]
+
     size_t mx = 16 + NB_TTY_CHANNELS;
     for ( size_t n=0 ; n<32 ; n++ )
@@ -1334 +1334 @@
       // Monitor a specific address for L1 & L2 caches
       // clusters[1][1]->proc[0]->cache_monitor(0x8ba4ULL);
-      // clusters[0][0]->memc->cache_monitor(   0x25000ULL);
+      // clusters[0][0]->memc->cache_monitor(   0x12180ULL);
 
       if (debug_ok and (n > debug_from) and (n % debug_period == 0))
@@ -1385 +1385 @@
         if ( debug_memc_id < XMAX*YMAX )
         {
+
         size_t x = debug_memc_id / YMAX;
         size_t y = debug_memc_id % YMAX;
@@ -1436 +1437 @@
         {
         clusters[0][0]->iob->print_trace();
-        clusters[0][0]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB0 INT" );
-        clusters[0][0]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB0 INT CMD");
-        clusters[0][0]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB0 INT RSP");
+        clusters[0][0]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB0 INT TGT" );
+//      clusters[0][0]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB0 INT CMD");
+//      clusters[0][0]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB0 INT RSP");
 
         clusters[XMAX-1][YMAX-1]->iob->print_trace();
-        clusters[XMAX-1][YMAX-1]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB1 INT" );
-        clusters[XMAX-1][YMAX-1]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB1 INT CMD");
-        clusters[XMAX-1][YMAX-1]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB1 INT RSP");
+        clusters[XMAX-1][YMAX-1]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB1 INT TGT" );
+//      clusters[XMAX-1][YMAX-1]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB1 INT CMD");
+//      clusters[XMAX-1][YMAX-1]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB1 INT RSP");
         } 
 
@@ -1449 +1450 @@
         iox_network->print_trace();
 
-        signal_vci_ini_iob0.print_trace("[SIG]IOB0 INI IOX");
-        signal_vci_tgt_iob0.print_trace("[SIG]IOB0 TGT IOX");
-        signal_vci_ini_iob1.print_trace("[SIG]IOB1 INI IOX");
-        signal_vci_tgt_iob1.print_trace("[SIG]IOB1 TGT IOX");
-
-        iox_brom->print_trace();
-        signal_vci_tgt_brom.print_trace("[SIG]BROM");
-
-//      iox_mtty->print_trace();
-//      signal_vci_tgt_mtty.print_trace("[SIG]MTTY");
-
-//      iox_bdev->print_trace();
-//      signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
-//      signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
+        signal_vci_ini_iob0.print_trace("[SIG]IOB0 IOX INI");
+        signal_vci_tgt_iob0.print_trace("[SIG]IOB0 IOX TGT");
+        signal_vci_ini_iob1.print_trace("[SIG]IOB1 IOX INI");
+        signal_vci_tgt_iob1.print_trace("[SIG]IOB1 IOX TGT");
+
+        iox_cdma->print_trace();
+        signal_vci_tgt_cdma.print_trace("[SIG]CDMA_TGT");
+        signal_vci_ini_cdma.print_trace("[SIG]CDMA_INI");
+
+//      iox_brom->print_trace();
+//      signal_vci_tgt_brom.print_trace("[SIG]BROM");
+
+        iox_mtty->print_trace();
+        signal_vci_tgt_mtty.print_trace("[SIG]MTTY");
+
+        iox_bdev->print_trace();
+        signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
+        signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
 
 //      iox_fbuf->print_trace();

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -611 +611 @@
     {
         if (cluster_id == cluster_iob0) 
-            xicu->p_hwi[i]                       (*(this->p_irq[i]));
+        xicu->p_hwi[i]                           (*(this->p_irq[i]));
         else  
-            xicu->p_hwi[i]                       (signal_false);
+        xicu->p_hwi[i]                           (signal_false);
     }