Changeset 545 for soft


Ignore:
Timestamp:
Apr 4, 2015, 11:32:20 PM (10 years ago)
Author:
alain
Message:

Cosmetic

Location:
soft/giet_vm/giet_drivers
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/giet_drivers/bdv_driver.c

    r529 r545  
    1515#include <bdv_driver.h>
    1616#include <xcu_driver.h>
     17#include <mmc_driver.h>
    1718#include <kernel_locks.h>
    1819#include <utils.h>
    … …  
    9697    _bdv_set_register( BLOCK_DEVICE_COUNT     , count );
    9798    _bdv_set_register( BLOCK_DEVICE_LBA       , lba );
     99
     100#if USE_IOB    // software L2/L3 cache coherence
     101    if ( to_mem )  _mmc_inval( buf_paddr, count<<9 );
     102    else           _mmc_sync( buf_paddr, count<<9 );
     103#endif     // end software L2/L3 cache coherence
    98104
    99105    /////////////////////////////////////////////////////////////////////
    … …  
    151157        if ( USE_PIC ) _ext_irq_alloc( ISR_BDV , 0 , &wti_index );
    152158
     159        // set _bdv_gtid
     160        _bdv_gtid = (procid<<16) + ltid;
     161
    153162        // enters critical section
    154163        _it_disable( &save_sr );
    155164
    156         // set _bdv_gtid and reset runnable
    157         _bdv_gtid = (procid<<16) + ltid;
     165        // reset runnable
    158166        _set_task_slot( x, y, p, ltid, CTX_RUN_ID, 0 ); 
    159167       

  • soft/giet_vm/giet_drivers/hba_driver.c

    r540 r545  
    1515#include <hba_driver.h>
    1616#include <xcu_driver.h>
     17#include <mmc_driver.h>
    1718#include <kernel_locks.h>
    1819#include <utils.h>
    … …  
    3637// command list : up to 32 commands
    3738__attribute__((section(".kdata")))
    38 hba_cmd_desc_t  _hba_cmd_list[32] __attribute__((aligned(0x10)));   
     39hba_cmd_desc_t  _hba_cmd_list[32] __attribute__((aligned(0x40)));   
    3940
    4041// command tables array : one command table per entry in command list
    4142__attribute__((section(".kdata")))
    42 hba_cmd_table_t _hba_cmd_table[32] __attribute__((aligned(0x1000)));
     43hba_cmd_table_t _hba_cmd_table[32] __attribute__((aligned(0x40)));
    4344
    4445// command list write index : next slot to register a command
    … …  
    9091
    9192#if GIET_DEBUG_IOC_DRIVER
    92 _printf("\n[HBA DEBUG] P[%d,%d,%d] enters _hba_access at cycle %d\n"
     93_printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] enters at cycle %d\n"
    9394        "  use_irq = %d / to_mem = %d / lba = %x / paddr = %l / count = %d\n",
    9495        x , y , p , _get_proctime() , use_irq , to_mem , lba , buf_paddr, count );
    9596#endif
    9697
    97     unsigned int       pxci;           // HBA_PXCI register value
    98     unsigned int       ptw;            // command list write pointer
    99     unsigned int       pxis;           // HBA_PXIS register value
    100     hba_cmd_desc_t*    cmd_desc;       // command descriptor pointer   
    101     hba_cmd_table_t*   cmd_table;      // command table pointer
     98    unsigned int       pxci;              // HBA_PXCI register value
     99    unsigned int       ptw;               // command list write pointer
     100    unsigned int       pxis;              // HBA_PXIS register value
     101    hba_cmd_desc_t*    cmd_desc;          // command descriptor pointer   
     102    hba_cmd_table_t*   cmd_table;         // command table pointer
    102103
    103104    // check buffer alignment
    104     if( buf_paddr & 0x1FF )
    105     {
    106         _printf("\n[HBA ERROR] in _hba_access() : buffer not block aligned\n");
     105    if( buf_paddr & 0x3F )
     106    {
     107        _printf("\n[HBA ERROR] in _hba_access() : buffer not 64 bytes aligned\n");
    107108        return -1;
    108109    }
    109110
    110     // get pointer on the next possible entry in command list
    111     ptw = _atomic_increment( &_hba_cmd_ptw , 1 );
    112 
    113     // poll PXCI register until pointed entry empty
     111    // get one entry in Command List
     112    // atomic increment on the _hba_cmd_ptw allocator
     113    // only the 5 LSB bits are used to index the Command List
     114    ptw = _atomic_increment( &_hba_cmd_ptw , 1 ) & 0x1F;
     115
     116    // blocked until allocated entry in Command List is empty
    114117    do
    115118    {
    … …  
    118121    }
    119122    while ( pxci & (1<<ptw) );
    120    
     123
    121124    // compute pointers on command descriptor and command table   
    122125    cmd_desc  = &_hba_cmd_list[ptw];
    … …  
    141144    if( to_mem ) cmd_desc->flag[0] = 0x00;
    142145    else         cmd_desc->flag[0] = 0x40;     
    143    
    144     // set command in PXCI[ptw]
    145     _hba_set_register( HBA_PXCI, pxci + (1<<ptw) );
    146 
     146
     147#if USE_IOB    // software L2/L3 cache coherence
     148
     149    // compute physical addresses
     150    unsigned long long cmd_desc_paddr;    // command descriptor physical address
     151    unsigned long long cmd_table_paddr;   // command table header physical address
     152    unsigned int       flags;             // unused
     153
     154    if ( _get_mmu_mode() & 0x4 )
     155    {
     156        cmd_desc_paddr  = _v2p_translate( (unsigned int)cmd_desc  , &flags );
     157        cmd_table_paddr = _v2p_translate( (unsigned int)cmd_table , &flags );
     158    }
     159    else
     160    {
     161        cmd_desc_paddr  = (unsigned int)cmd_desc;
     162        cmd_table_paddr = (unsigned int)cmd_table;
     163    }
     164
     165    // update external memory for command table
     166    _mmc_sync( cmd_table_paddr & (~0x3F) , sizeof(hba_cmd_table_t) );
     167
     168    // update external memory for command descriptor
     169    _mmc_sync( cmd_desc_paddr & (~0x3F) , sizeof(hba_cmd_desc_t) );
     170
     171    // inval or synchronize memory buffer
     172    if ( to_mem )  _mmc_inval( buf_paddr, count<<9 );
     173    else           _mmc_sync( buf_paddr, count<<9 );
     174
     175#endif     // end software L2/L3 cache coherence
    147176
    148177    /////////////////////////////////////////////////////////////////////
    … …  
    151180    if ( use_irq == 0 )
    152181    {
    153 
    154 #if GIET_DEBUG_IOC_DRIVER
    155 _printf("\n[HBA DEBUG] _hba_access() : P[%d,%d,%d] launch transfer"
    156         " in polling mode at cycle %d\n",
    157         x , y , p , _get_proctime() );
     182        // start HBA transfer
     183        _hba_set_register( HBA_PXCI, (1<<ptw) );
     184
     185#if GIET_DEBUG_IOC_DRIVER
     186_printf("\n[DEBUG HBA] _hba_access() : command %d for P[%d,%d,%d]"
     187        " at cycle %d / polling\n",
     188        ptw , x , y , p , _get_proctime() );
    158189#endif
    159190        // disable IRQs in PXIE register
    … …  
    163194        do
    164195        {
    165             pxci = _hba_get_register( HBA_PXCI ) & (1<<ptw);
    166 
    167 #if GIET_DEBUG_IOC_DRIVER
    168 _printf("\n[HBA DEBUG] _hba_access() : P[%d,%d,%d] wait on HBA_STATUS ...\n",
    169         x , y , p );
     196            pxci = _hba_get_register( HBA_PXCI );
     197
     198#if GIET_DEBUG_IOC_DRIVER
     199_printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] wait on HBA_PXCI / pxci = %x\n",
     200        x , y , p , pxci );
    170201#endif
    171202        }
    … …  
    190221
    191222#if GIET_DEBUG_IOC_DRIVER
    192 _printf("\n[HBA DEBUG] _hba_access() : P[%d,%d,%d] launch transfer"
    193         " in descheduling mode at cycle %d\n",
    194         x , y , p , _get_proctime() );
     223_printf("\n[DEBUG HBA] _hba_access() : command %d for P[%d,%d,%d] "
     224        "at cycle %d / descheduling\n",
     225        ptw , x , y , p , _get_proctime() );
    195226#endif
    196227        unsigned int save_sr;
    … …  
    209240        _set_task_slot( x, y, p, ltid, CTX_RUN_ID, 0 ); 
    210241
     242        // start HBA transfer
     243        _hba_set_register( HBA_PXCI, (1<<ptw) );
     244
    211245        // deschedule task
    212246        _ctx_switch();                     
    213247
    214248#if GIET_DEBUG_IOC_DRIVER
    215 _printf("\n[HBA DEBUG] _hba_access() : P[%d,%d,%d] resume execution at cycle %d\n",
    216         x , y , p , _get_proctime() );
     249_printf("\n[DEBUG HBA] _hba_access() : task %d on P[%d,%d,%d] resume at cycle %d\n",
     250        ltid , x , y , p , _get_proctime() );
    217251#endif
    218252
    … …  
    225259
    226260#if GIET_DEBUG_IOC_DRIVER
    227 _printf("\n[HBA DEBUG] _hba_access() : P[%d,%d,%d] exit at cycle %d\n",
     261_printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] exit at cycle %d\n",
    228262        x , y , p , _get_proctime() );
    229263#endif
    … …  
    238272unsigned int _hba_init()
    239273{
    240     unsigned int       flags;
    241     unsigned int       vaddr;
    242     unsigned long long paddr;
    243     unsigned int       c;     
    244     unsigned int       pxclb;
    245     unsigned int       pxclbu;
    246 
    247     // command list pointers
     274    unsigned int       cmd_list_vaddr;
     275    unsigned int       cmd_table_vaddr;
     276    unsigned long long cmd_list_paddr;
     277    unsigned long long cmd_table_paddr;
     278    unsigned int       flags;            // unused
     279
     280    // compute Command list & command table physical addresses
     281    cmd_list_vaddr  = (unsigned int)(&_hba_cmd_list[0]);
     282    cmd_table_vaddr = (unsigned int)(&_hba_cmd_table[0]);
     283    if ( _get_mmu_mode() & 0x4 )
     284    {
     285        cmd_list_paddr  = _v2p_translate( cmd_list_vaddr  , &flags );
     286        cmd_table_paddr = _v2p_translate( cmd_table_vaddr , &flags );
     287    }
     288    else
     289    {
     290        cmd_list_paddr  = (unsigned long long)cmd_list_vaddr;
     291        cmd_table_paddr = (unsigned long long)cmd_table_vaddr;
     292    }
     293
     294    // initialise Command List pointers
    248295    _hba_cmd_ptw = 0;
    249296    _hba_cmd_ptr = 0;
    250297
    251     // Command list physical addresse
    252     vaddr  = (unsigned int)(_hba_cmd_list);
    253     paddr  = _v2p_translate( vaddr , &flags );
    254     pxclb  = (unsigned int)paddr;
    255     pxclbu = (unsigned int)(paddr>>32);
    256 
    257     // Command tables physical addresses
     298    // initialise Command Descriptors in Command List
     299    unsigned int         c;     
     300    unsigned long long   paddr;
    258301    for( c=0 ; c<32 ; c++ )
    259302    {
    260         // compute command table physical address
    261         // for one entry in the command list
    262         vaddr = (unsigned int)(&_hba_cmd_table[c]);
    263         paddr = _v2p_translate( vaddr , &flags );
    264 
    265         // initialise the corresponding command descriptor
    266         _hba_cmd_list[c].ctba  = (unsigned int)paddr;
     303        paddr = cmd_table_paddr + c * sizeof(hba_cmd_table_t);
     304        _hba_cmd_list[c].ctba  = (unsigned int)(paddr);
    267305        _hba_cmd_list[c].ctbau = (unsigned int)(paddr>>32);
    268306    }
    269307
    270     // set HBA registers
    271     _hba_set_register( HBA_PXCLB , pxclb );
    272     _hba_set_register( HBA_PXCLBU, pxclbu );
    273     _hba_set_register( HBA_PXIE  , 0      );
    274     _hba_set_register( HBA_PXIS  , 0      );
    275     _hba_set_register( HBA_PXCI  , 0      );
    276     _hba_set_register( HBA_PXCMD , 1      );
     308    // initialise HBA registers
     309    _hba_set_register( HBA_PXCLB  , (unsigned int)(cmd_list_paddr) );
     310    _hba_set_register( HBA_PXCLBU , (unsigned int)(cmd_list_paddr>>32) );
     311    _hba_set_register( HBA_PXIE   , 0 );
     312    _hba_set_register( HBA_PXIS   , 0 );
     313    _hba_set_register( HBA_PXCI   , 0 );
     314    _hba_set_register( HBA_PXCMD  , 1 );
    277315
    278316    return 0;
    … …  
    280318
    281319
    282 /////////////////////////////////////
     320/////////////////////////////////////////////////////
    283321void _hba_isr( unsigned int irq_type,   // HWI / WTI
    284322               unsigned int irq_id,     // index returned by ICU
    … …  
    288326    unsigned int pxci = _hba_get_register( HBA_PXCI );
    289327
    290     // scan active commands from (_hba_cmd_ptr) to (_hba_cmd_ptw-1)
    291     unsigned int c;
    292     for ( c = _hba_cmd_ptr ;
    293           c != _hba_cmd_ptw ;
    294           c = (c + 1) % 32 )
    295     {
    296         if ( (pxci & (1<<c)) == 0 )    // command completed
     328    // we must handle all completed commands
     329    // active commands are between  (_hba_cmd_ptr) and (_hba_cmd_ptw-1)
     330    unsigned int current;
     331    for ( current = _hba_cmd_ptr ; current != _hba_cmd_ptw ; current++ )
     332    {
     333        unsigned int ptr = current & 0x1F;
     334       
     335        if ( (pxci & (1<<ptr)) == 0 )    // command completed
    297336        {
    298             // increment read pointer;
    299             _hba_cmd_ptr++;
     337            // increment the 32 bits variable _hba_cmd_ptr
     338            _hba_cmd_ptr = (_hba_cmd_ptr + 1);
    300339
    301340            // save PXIS register
    302             _hba_status[c] = _hba_get_register( HBA_PXIS );
     341            _hba_status[ptr] = _hba_get_register( HBA_PXIS );
    303342
    304343            // reset PXIS register
    … …  
    306345 
    307346            // identify waiting task
    308             unsigned int remote_procid  = _hba_gtid[c]>>16;
    309             unsigned int ltid           = _hba_gtid[c] & 0xFFFF;
     347            unsigned int remote_procid  = _hba_gtid[ptr]>>16;
     348            unsigned int ltid           = _hba_gtid[ptr] & 0xFFFF;
    310349            unsigned int remote_cluster = remote_procid >> P_WIDTH;
    311350            unsigned int remote_x       = remote_cluster >> Y_WIDTH;
    … …  
    327366
    328367#if GIET_DEBUG_IOC_DRIVER 
    329 unsigned int procid  = _get_procid();
    330 unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
    331 unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
    332 unsigned int p       = procid & ((1<<P_WIDTH)-1);
    333 _printf("\n[HBA DEBUG] Processor[%d,%d,%d] executes _hba_isr() :\n"
    334         "  resume task %d running on P[%d,%d,%d] / status = %x at cyle %d\n",
    335         x , y , p ,
    336         ltid , remote_x , remote_y , remote_p , _hba_status[c] , _get_proctime() );
     368_printf("\n[DEBUG HBA] _hba_isr() : command %d completed at cycle %d\n"
     369        "  resume task %d running on P[%d,%d,%d] / status = %x\n",
     370        ptr , _get_proctime() ,
     371        ltid , remote_x , remote_y , remote_p , _hba_status[ptr] );
    337372#endif
    338373        }

  • soft/giet_vm/giet_drivers/hba_driver.h

    r540 r545  
    1313//
    1414// 2. This HBA component support split memory buffers (several physical
    15 //    buffers for one single command), but this driver supports only
     15//    buffers for one single command), but this driver supports only one
    1616//    single buffer commands.
    1717//
    … …  
    6565///////////////////////////////////////////////////////////////////////////////////
    6666
    67 typedef struct hba_cmd_header_s // size = 128 bytes
     67///////////////////////////////
     68typedef struct hba_cmd_header_s // size = 16 bytes
    6869{
    6970    // WORD 0
    … …  
    8283    unsigned char           res2;           // reserved
    8384 
    84     // WORD 3 to 31
    85     unsigned int        res[29];    // reserved
     85    // WORD 3
     86    unsigned int        res3;       // reserved
    8687
    8788} hba_cmd_header_t;
    8889
     90///////////////////////////////
    8991typedef struct hba_cmd_buffer_s  // size = 16 bytes
    9092{
    … …  
    9698} hba_cmd_buffer_t;
    9799
    98 typedef struct hba_cmd_table_s  // size = 256 bytes
     100//////////////////////////////
     101typedef struct hba_cmd_table_s  // size = 32 bytes
    99102{
    100103
    101104    hba_cmd_header_t   header;      // contains LBA
    102105    hba_cmd_buffer_t   buffer;      // only one physical buffer
    103     char               res[112];    // for 256 bytes alignment
    104106
    105107} hba_cmd_table_t;
    … …  
    109111///////////////////////////////////////////////////////////////////////////////////
    110112
     113/////////////////////////////
    111114typedef struct hba_cmd_desc_s  // size = 16 bytes
    112115{

  • soft/giet_vm/giet_drivers/mmc_driver.c

    r496 r545  
    9898    }
    9999
     100    if ( buf_paddr & 0x3F )
     101    {
     102        _puts("\n[GIET ERROR] in _mmc_inval() : paddr not 64 bytes aligned\n");
     103        _exit();
     104    }
     105
    100106    // get the lock protecting exclusive access to MEMC
    101107    _spin_lock_acquire( &_mmc_lock[x][y] );
    … …  
    124130    {
    125131        _puts( "\n[GIET ERROR] in _mmc_sync() : illegal cluster coordinates");
     132        _exit();
     133    }
     134
     135    if ( buf_paddr & 0x3F )
     136    {
     137        _puts("\n[GIET ERROR] in _mmc_sync() : paddr not 64 bytes aligned\n");
    126138        _exit();
    127139    }

  • soft/giet_vm/giet_drivers/sdc_driver.c

    r529 r545  
    1414#define SDCARD_RESET_ITER_MAX 4
    1515
     16///////////////////////////////////////////////////////////////////////////////
     17//   Global variables
     18///////////////////////////////////////////////////////////////////////////////
     19
     20__attribute__((section(".kdata")))
    1621static struct sdcard_dev sdcard;
     22
     23__attribute__((section(".kdata")))
    1724static struct spi_dev*   spi;
    1825
    … …  
    451458}  // _end sdc_access()
    452459
     460///////////////////////////////////////////////////////////////////////////////
     461// This ISR handles the IRQ generated by a SDC controler
     462///////////////////////////////////////////////////////////////////////////////
     463void _sdc_isr( unsigned int irq_type,
     464               unsigned int irq_id,
     465               unsigned int channel )
     466{
     467    _puts("\n[GIET ERROR] _sdc_isr() not implemented\n");
     468    _exit();
     469}
     470
    453471// Local Variables:
    454472// tab-width: 4

  • soft/giet_vm/giet_drivers/sdc_driver.h

    r536 r545  
    5858                          unsigned long long buf_vaddr,
    5959                          unsigned int       count);
     60
     61///////////////////////////////////////////////////////////////////////////////
     62// This ISR handles the IRQ generated by a SDC controler
     63///////////////////////////////////////////////////////////////////////////////
     64void _sdc_isr( unsigned int irq_type,
     65               unsigned int irq_id,
     66               unsigned int channel );
    6067
    6168///////////////////////////////////////////////////////////////////////////////

  • soft/giet_vm/giet_drivers/spi_driver.c

    r456 r545  
    253253}
    254254
    255 ///////////////////////////////////////////////////////////////////////////////
    256 // This ISR handles the IRQ generated by a SPI controler
    257 ///////////////////////////////////////////////////////////////////////////////
    258 void _spi_isr( unsigned int irq_type,
    259                unsigned int irq_id,
    260                unsigned int channel )
    261 {
    262     _puts("\n[GIET ERROR] _spi_isr() not implemented\n");
    263     _exit();
    264 }
    265255
    266256// Local Variables:

  • soft/giet_vm/giet_drivers/spi_driver.h

    r320 r545  
    5151                 int rx_edge         );
    5252
    53 extern void _spi_isr( unsigned int irq_type,
    54                       unsigned int irq_id,
    55                       unsigned int channel );
    56 
    5753///////////////////////////////////////////////////////////////////////////////
    5854// SPI macros and constants
Note: See TracChangeset for help on using the changeset viewer.