Changeset 550 for trunk/hal/tsar_mips32

Timestamp:

Sep 21, 2018, 10:24:15 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Add SD card driver in kernel

Location:

trunk/hal/tsar_mips32

Files:

• core/hal_drivers.c (modified) (2 diffs)
• drivers/soclib_pic.c (modified) (3 diffs)
• drivers/soclib_sdc.c (modified) (8 diffs)
• drivers/soclib_sdc.h (modified) (3 diffs)

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -31 +31 @@
 #include <soclib_bdv.h>
 #include <soclib_hba.h>
+#include <soclib_sdc.h>
 #include <soclib_mmc.h>
 #include <soclib_nic.h>
@@ -125 +126 @@
                 soclib_hba_init( ioc );
         }
+        else if (impl == IMPL_IOC_SPI)
+    {
+                soclib_sdc_init( ioc );
+        }
     else 
     {

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -371 +371 @@
     bool_t   is_rx   = src_chdev->is_rx;
 
-    if( (func == DEV_FUNC_IOC) || (func == DEV_FUNC_NIC) ||
+    if( (func == DEV_FUNC_IOC && impl == IMPL_IOC_BDV) || (func == DEV_FUNC_NIC) ||
         (func == DEV_FUNC_TXT && impl == IMPL_TXT_TTY) || (func == DEV_FUNC_IOB) )          // external IRQ => WTI
     {
@@ -417 +417 @@
     }
     else if( (func == DEV_FUNC_DMA) || (func == DEV_FUNC_MMC) ||
-             (func == DEV_FUNC_TXT && impl == IMPL_TXT_MTY) )   // internal IRQ => HWI
+             (func == DEV_FUNC_TXT && impl == IMPL_TXT_MTY) ||
+             (func == DEV_FUNC_IOC && impl == IMPL_IOC_SPI) )   // internal IRQ => HWI
     {
         // get internal IRQ index
@@ -423 +424 @@
         if( func == DEV_FUNC_DMA ) hwi_id = lapic_input.dma[channel];
         else if (func == DEV_FUNC_TXT ) hwi_id = lapic_input.mtty;
+        else if (func == DEV_FUNC_IOC ) hwi_id = lapic_input.sdcard;
         else                       hwi_id = lapic_input.mmc;
 

trunk/hal/tsar_mips32/drivers/soclib_sdc.c

@@ -6 +6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-//#include <hard_config.h>
+// #include <hard_config.h>
 #include <soclib_sdc.h>
 //#include <tty0.h>
 //#include <utils.h>
+#include <hal_kernel_types.h>
+#include <chdev.h>
+#include <dev_ioc.h>
+#include <thread.h>
 #include <printk.h>
 
@@ -334 +338 @@
 
 ////////////////////////
-unsigned int _sdc_init()
+void soclib_sdc_init( chdev_t* chdev )
 {
     spi = (struct spi_dev*)SEG_IOC_BASE;
@@ -393 +397 @@
     printk("[SDC WARNING] Finish SD card initialization\n\r");
 
-    return 0;
-} // end _sdc_init()
-
+    /* Initialize the chdev */
+    // get extended pointer on SOCLIB_BDV peripheral base address
+        xptr_t  sdc_xp = chdev->base;
+
+    // set driver specific fields
+    chdev->cmd = &soclib_sdc_cmd;
+    chdev->isr = &soclib_sdc_isr;
+
+} // end soclib_sdc_init()
 
 /////////////////////////////////////////////////////
-unsigned int _sdc_access( unsigned int       use_irq,  // unused
-                          unsigned int       to_mem,
-                          unsigned int       lba,
-                          unsigned long long buf_paddr,
-                          unsigned int       count )
-{
+void __attribute__ ((noinline)) soclib_sdc_cmd( xptr_t th_xp )
+{
+    cxy_t      th_cxy = GET_CXY( th_xp );
+    thread_t * th_ptr = GET_PTR( th_xp );
+
+    // get command arguments and extended pointer on IOC device
+    uint32_t        cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
+    unsigned int    lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba ) );
+    xptr_t          buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
+    unsigned int    count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
+
     unsigned char args[4];
     unsigned char sdcard_rsp;
@@ -410 +425 @@
     unsigned int last = lba + count;
 
-    if ( to_mem )  // read access
+    if ( cmd_type == IOC_SYNC_READ )  // read access
     {
         for ( ; curr < last ; curr++ )
@@ -432 +447 @@
             _sdc_wait_data_block();
 
-            if (spi_get_data(sdcard.spi, buf_paddr, 512 ))
+            if (spi_get_data(sdcard.spi, buf_xp, 512 ))
             {
                 _sdc_disable();
@@ -444 +459 @@
             _sdc_disable();
 
-            buf_paddr += 512;
+            buf_xp += 512;
         }
     }
@@ -451 +466 @@
         assert( false, __FUNCTION__, "[SDC ERROR] function _sdc_write() not iplemented yet\n");
     }
-
-    return 0;
 }  // _end sdc_access()
 
@@ -458 +471 @@
 // This ISR handles the IRQ generated by a SDC controler
 ///////////////////////////////////////////////////////////////////////////////
-void _sdc_isr( unsigned int irq_type,
-               unsigned int irq_id,
-               unsigned int channel )
+void __attribute__ ((noinline)) soclib_sdc_isr( chdev_t * chdev )
 {
     assert( false, __FUNCTION__, "\n[GIET ERROR] _sdc_isr() not implemented\n");

trunk/hal/tsar_mips32/drivers/soclib_sdc.h

@@ -10 +10 @@
 
 
+#include <chdev.h>
 #include <soclib_spi.h>
 #include <hard_config.h>
@@ -43 +44 @@
 // Returns 0 if success, other value if failure
 ///////////////////////////////////////////////////////////////////////////////
-unsigned int _sdc_init();
+// unsigned int _sdc_init();
+extern void soclib_sdc_init( chdev_t* chdev );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -54 +56 @@
 // Returns 0 if success, > 0 if error.
 ///////////////////////////////////////////////////////////////////////////////
-unsigned int _sdc_access( unsigned int       use_irq,  
-                          unsigned int       to_mem,
-                          unsigned int       lba,
-                          unsigned long long buf_vaddr,
-                          unsigned int       count);
+extern void soclib_sdc_cmd( xptr_t thread_xp );
 
 ///////////////////////////////////////////////////////////////////////////////
 // This ISR handles the IRQ generated by a SDC controler
 ///////////////////////////////////////////////////////////////////////////////
-void _sdc_isr( unsigned int irq_type,
-               unsigned int irq_id,
-               unsigned int channel );
+extern void soclib_sdc_isr( chdev_t* chdev );
 
 ///////////////////////////////////////////////////////////////////////////////