Changeset 498 for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_iob/top.cpp

    r493 r498  
    1313// - MTTY : multi TTY (up to 15 channels)
    1414// - MNIC : Network controller (up to 2 channels)
    15 // - CDMA : Chained Buffer controller (up to 4 channels)
     15// - CDMA : Chained Buffer DMA controller (up to 4 channels)
    1616// - BDEV : Dlock Device controler (1 channel)
    1717//
     
    671671    maptab_iox.add(Segment("iox_seg_mtty_0", MTTY_BASE + iob0_base, MTTY_SIZE,
    672672                   IntTab(cluster_iob0,IOX_MTTY_TGT_ID), false));
    673 
    674673    maptab_iox.add(Segment("iox_seg_mtty_1", MTTY_BASE + iob1_base, MTTY_SIZE,
    675674                   IntTab(cluster_iob1,IOX_MTTY_TGT_ID), false));
     
    677676    maptab_iox.add(Segment("iox_seg_fbuf_0", FBUF_BASE + iob0_base, FBUF_SIZE,
    678677                   IntTab(cluster_iob0,IOX_FBUF_TGT_ID), false));
    679 
    680678    maptab_iox.add(Segment("iox_seg_fbuf_1", FBUF_BASE + iob1_base, FBUF_SIZE,
    681679                   IntTab(cluster_iob1,IOX_FBUF_TGT_ID), false));
     
    683681    maptab_iox.add(Segment("iox_seg_bdev_0", BDEV_BASE + iob0_base, BDEV_SIZE,
    684682                   IntTab(cluster_iob0,IOX_BDEV_TGT_ID), false));
    685 
    686683    maptab_iox.add(Segment("iox_seg_bdev_1", BDEV_BASE + iob1_base, BDEV_SIZE,
    687684                   IntTab(cluster_iob1,IOX_BDEV_TGT_ID), false));
     
    689686    maptab_iox.add(Segment("iox_seg_mnic_0", MNIC_BASE + iob0_base, MNIC_SIZE,
    690687                   IntTab(cluster_iob0,IOX_MNIC_TGT_ID), false));
    691 
    692688    maptab_iox.add(Segment("iox_seg_mnic_1", MNIC_BASE + iob1_base, MNIC_SIZE,
    693689                   IntTab(cluster_iob1,IOX_MNIC_TGT_ID), false));
     
    695691    maptab_iox.add(Segment("iox_seg_cdma_0", CDMA_BASE + iob0_base, CDMA_SIZE,
    696692                   IntTab(cluster_iob0,IOX_CDMA_TGT_ID), false));
    697 
    698693    maptab_iox.add(Segment("iox_seg_cdma_1", CDMA_BASE + iob1_base, CDMA_SIZE,
    699694                   IntTab(cluster_iob1,IOX_CDMA_TGT_ID), false));
     
    701696    maptab_iox.add(Segment("iox_seg_brom_0", BROM_BASE + iob0_base, BROM_SIZE,
    702697                   IntTab(cluster_iob0,IOX_BROM_TGT_ID), false));
    703 
    704698    maptab_iox.add(Segment("iox_seg_brom_1", BROM_BASE + iob1_base, BROM_SIZE,
    705699                   IntTab(cluster_iob1,IOX_BROM_TGT_ID), false));
     
    11161110
    11171111    // IRQ connexions (for cluster_iob0 only)
     1112    // IRQ_MNIC_RX  -> IRQ[08] to IRQ[09]
     1113    // IRQ_MNIC_TX  -> IRQ[10] to IRQ[11]
     1114    // IRQ_CDMA     -> IRQ[12] to IRQ[15]
     1115    // IRQ_MTTY     -> IRQ[16] to IRQ[30]
     1116    // IRQ_BDEV     -> IRQ[31]
     1117
    11181118    size_t mx = 16 + NB_TTY_CHANNELS;
    11191119    for ( size_t n=0 ; n<32 ; n++ )
     
    13341334      // Monitor a specific address for L1 & L2 caches
    13351335      // clusters[1][1]->proc[0]->cache_monitor(0x8ba4ULL);
    1336       // clusters[0][0]->memc->cache_monitor(   0x25000ULL);
     1336      // clusters[0][0]->memc->cache_monitor(   0x12180ULL);
    13371337
    13381338      if (debug_ok and (n > debug_from) and (n % debug_period == 0))
     
    13851385        if ( debug_memc_id < XMAX*YMAX )
    13861386        {
     1387
    13871388        size_t x = debug_memc_id / YMAX;
    13881389        size_t y = debug_memc_id % YMAX;
     
    14361437        {
    14371438        clusters[0][0]->iob->print_trace();
    1438         clusters[0][0]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB0 INT" );
    1439         clusters[0][0]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB0 INT CMD");
    1440         clusters[0][0]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB0 INT RSP");
     1439        clusters[0][0]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB0 INT TGT" );
     1440//      clusters[0][0]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB0 INT CMD");
     1441//      clusters[0][0]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB0 INT RSP");
    14411442
    14421443        clusters[XMAX-1][YMAX-1]->iob->print_trace();
    1443         clusters[XMAX-1][YMAX-1]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB1 INT" );
    1444         clusters[XMAX-1][YMAX-1]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB1 INT CMD");
    1445         clusters[XMAX-1][YMAX-1]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB1 INT RSP");
     1444        clusters[XMAX-1][YMAX-1]->signal_int_vci_tgt_iobx.print_trace( "[SIG]IOB1 INT TGT" );
     1445//      clusters[XMAX-1][YMAX-1]->signal_int_dspin_cmd_iobx_t.print_trace("[SIG]IOB1 INT CMD");
     1446//      clusters[XMAX-1][YMAX-1]->signal_int_dspin_rsp_iobx_t.print_trace("[SIG]IOB1 INT RSP");
    14461447        }
    14471448
     
    14491450        iox_network->print_trace();
    14501451
    1451         signal_vci_ini_iob0.print_trace("[SIG]IOB0 INI IOX");
    1452         signal_vci_tgt_iob0.print_trace("[SIG]IOB0 TGT IOX");
    1453         signal_vci_ini_iob1.print_trace("[SIG]IOB1 INI IOX");
    1454         signal_vci_tgt_iob1.print_trace("[SIG]IOB1 TGT IOX");
    1455 
    1456         iox_brom->print_trace();
    1457         signal_vci_tgt_brom.print_trace("[SIG]BROM");
    1458 
    1459 //      iox_mtty->print_trace();
    1460 //      signal_vci_tgt_mtty.print_trace("[SIG]MTTY");
    1461 
    1462 //      iox_bdev->print_trace();
    1463 //      signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
    1464 //      signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
     1452        signal_vci_ini_iob0.print_trace("[SIG]IOB0 IOX INI");
     1453        signal_vci_tgt_iob0.print_trace("[SIG]IOB0 IOX TGT");
     1454        signal_vci_ini_iob1.print_trace("[SIG]IOB1 IOX INI");
     1455        signal_vci_tgt_iob1.print_trace("[SIG]IOB1 IOX TGT");
     1456
     1457        iox_cdma->print_trace();
     1458        signal_vci_tgt_cdma.print_trace("[SIG]CDMA_TGT");
     1459        signal_vci_ini_cdma.print_trace("[SIG]CDMA_INI");
     1460
     1461//      iox_brom->print_trace();
     1462//      signal_vci_tgt_brom.print_trace("[SIG]BROM");
     1463
     1464        iox_mtty->print_trace();
     1465        signal_vci_tgt_mtty.print_trace("[SIG]MTTY");
     1466
     1467        iox_bdev->print_trace();
     1468        signal_vci_tgt_bdev.print_trace("[SIG]BDEV_TGT");
     1469        signal_vci_ini_bdev.print_trace("[SIG]BDEV_INI");
    14651470
    14661471//      iox_fbuf->print_trace();
  • trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

    r468 r498  
    611611    {
    612612        if (cluster_id == cluster_iob0)
    613             xicu->p_hwi[i]                       (*(this->p_irq[i]));
     613        xicu->p_hwi[i]                           (*(this->p_irq[i]));
    614614        else 
    615             xicu->p_hwi[i]                       (signal_false);
     615        xicu->p_hwi[i]                           (signal_false);
    616616    }                     
    617617
Note: See TracChangeset for help on using the changeset viewer.