Ignore:
Timestamp:
Feb 3, 2014, 4:42:00 PM (11 years ago)
Author:
cfuguet
Message:

Introducing last changes of trunk into branch.

Location:
branch/giet_vm_ioc_drivers
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branch/giet_vm_ioc_drivers

  • branch/giet_vm_ioc_drivers/giet_xml/mapping_info.h

    r286 r288  
    146146    unsigned int vspaces;            // number of virtual spaces
    147147    unsigned int increment;          // vseg cluster increment for replicated periphs
     148    unsigned int irq_per_proc;       // number of IRQ per processor
    148149
    149150    unsigned int cma_cluster;        // index of cluster containing CMA controler

  • branch/giet_vm_ioc_drivers/giet_xml/xml_driver.c

    r286 r288  
    4545        "HARD",
    4646        "SOFT",
     47        "TIME",
    4748    };
    4849
    … …  
    235236    fprintf(fpout, "<?xml version = \"1.0\"?>\n\n");
    236237
    237     fprintf(fpout, "<mapping_info signature = \"0x%x\" \n", header->signature);
    238     fprintf(fpout, "              name      = \"%s\"   \n", header->name);
    239     fprintf(fpout, "              x_size    = \"%d\"   \n", header->x_size);
    240     fprintf(fpout, "              y_size    = \"%d\"   \n", header->y_size);
    241     fprintf(fpout, "              x_width   = \"%d\"   \n", header->x_width);
    242     fprintf(fpout, "              y_width   = \"%d\"   \n", header->y_width);
    243     fprintf(fpout, "              vspaces   = \"%d\"   \n", header->vspaces);
    244     fprintf(fpout, "              increment = \"%d\" >\n\n", header->vspaces);
     238    fprintf(fpout, "<mapping_info signature    = \"0x%x\" \n" , header->signature);
     239    fprintf(fpout, "              name         = \"%s\"   \n" , header->name);
     240    fprintf(fpout, "              x_size       = \"%d\"   \n" , header->x_size);
     241    fprintf(fpout, "              y_size       = \"%d\"   \n" , header->y_size);
     242    fprintf(fpout, "              x_width      = \"%d\"   \n" , header->x_width);
     243    fprintf(fpout, "              y_width      = \"%d\"   \n" , header->y_width);
     244    fprintf(fpout, "              vspaces      = \"%d\"   \n" , header->vspaces);
     245    fprintf(fpout, "              increment    = \"%d\"   \n" , header->vspaces);
     246    fprintf(fpout, "              irq_per_proc = \"%d\" >\n\n", header->irq_per_proc);
    245247
    246248    ///////////////////// clusters ///////////////////////////////////////////////

  • branch/giet_vm_ioc_drivers/giet_xml/xml_parser.c

    r286 r288  
    115115unsigned int dma_channels     = 0; // max number of DMA channels (per cluster)
    116116
    117 unsigned int icu_channels     = 0; // total number of IRQ per processor
     117unsigned int icu_channels     = 0; // total number of channels  in ICU/XICU
    118118unsigned int tty_channels     = 0; // total number of terminals in TTY
    119119unsigned int hba_channels     = 0; // total number of channels  in HBA
    … …  
    128128unsigned int use_bdv          = 0; // using SoCLIB block device
    129129unsigned int use_spi          = 0; // using SD Card-SPI
    130 
    131130
    132131////////////////////////////////////////////////////////////////
    … …  
    20932092            }
    20942093
     2094            // the number of ICU channels must be NB_PROCS * irq_per_proc
     2095            if (icu_channels != (header->irq_per_proc * proc_loc_index))
     2096            {
     2097                printf("[XML ERROR] illegal ICU number of channels. "
     2098                       "It must be equal to NB_PROCS * IRQ_PER_PROC\n");
     2099                exit(1);
     2100            }
     2101
    20952102#if XML_PARSER_DEBUG
    20962103            printf("  end cluster set\n\n");
    … …  
    23232330    {
    23242331        printf("[XML ERROR] illegal or missing <increment> attribute in mapping\n");
     2332        exit(1);
     2333    }
     2334
     2335    ///////// get increment attribute
     2336    value = getIntValue(reader, "irq_per_proc", &ok);
     2337    if (ok)
     2338    {
     2339#if XML_PARSER_DEBUG
     2340        printf("  irq_per_proc = %d\n", value);
     2341#endif
     2342        header->irq_per_proc = value;
     2343    }
     2344    else
     2345    {
     2346        printf("[XML ERROR] illegal or missing <irq_per_proc> attribute in mapping\n");
    23252347        exit(1);
    23262348    }
    … …  
    25982620    file_write(fdout, "\n");
    25992621
    2600     def_int_write(fdout, "IRQ_PER_PROCESSOR ", icu_channels);
     2622    def_int_write(fdout, "IRQ_PER_PROCESSOR ", header->irq_per_proc);
    26012623
    26022624    file_write(fdout, epil);

  • branch/giet_vm_ioc_drivers/mappings/4c_1p_four.xml

    r283 r288  
    88              y_width      = "4"
    99              vspaces      = "4"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "4" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment
    … …  
    5051
    5152            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1"  />
    52             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6"  />
     53            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4"  />
    5354            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
    5455            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1" subtype = "BDV" />
    … …  
    7374
    7475            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    75             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     76            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    7677            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    7778        </cluster>
    … …  
    8990
    9091            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    91             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     92            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    9293            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    9394        </cluster>
    … …  
    105106
    106107            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    107             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     108            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    108109            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    109110        </cluster>

  • branch/giet_vm_ioc_drivers/mappings/4c_1p_iob_four.xml

    r283 r288  
    88              y_width      = "4"
    99              vspaces      = "4"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "1" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment

  • branch/giet_vm_ioc_drivers/mappings/4c_1p_iob_sort.xml

    r283 r288  
    88              y_width      = "4"
    99              vspaces      = "1"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "1" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment

  • branch/giet_vm_ioc_drivers/mappings/4c_1p_sort.xml

    r271 r288  
    88              y_width      = "4"
    99              vspaces      = "1"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "1" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment

  • branch/giet_vm_ioc_drivers/mappings/4c_1p_sort_chiplet.xml

    r285 r288  
    88              y_width      = "4"
    99              vspaces      = "1"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "4" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment
    … …  
    3536            </proc>
    3637
    37             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6"  />
     38            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4"  />
    3839            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
    3940            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1" subtype = "SPI" />
    … …  
    5354            </proc>
    5455
    55             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     56            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    5657            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    5758        </cluster>
    … …  
    6768            </proc>
    6869
    69             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     70            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    7071            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    7172        </cluster>
    … …  
    8182            </proc>
    8283
    83             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     84            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "4" />
    8485            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    8586        </cluster>

  • branch/giet_vm_ioc_drivers/mappings/4c_2p_four.xml

    r282 r288  
    88              y_width      = "4"
    99              vspaces      = "4"
    10               increment    = "0x10000" >
     10                          increment    = "0x10000"
     11                          irq_per_proc = "1" >
    1112
    1213*** The "increment" parameter is the virtual address cluster increment
    … …  
    5455
    5556            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1"  />
    56             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6"  />
     57            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2"  />
    5758            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
    5859            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1"  />
    … …  
    8182
    8283            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    83             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     84            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
    8485            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    8586        </cluster>
    … …  
    101102
    102103            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    103             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     104            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
    104105            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    105106        </cluster>
    … …  
    121122
    122123            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
    123             <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
     124            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
    124125            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    125126        </cluster>
Note: See TracChangeset for help on using the changeset viewer.