Changeset 388 for trunk/softs/tsar_boot/src

Timestamp:

May 16, 2013, 3:01:37 PM (12 years ago)

Author:

cfuguet

Message:

Modifications in tsar/trunk/softs/tsar_boot:

• Improving the boot_ioc_read when using a SD card in FPGA platform.
• Adding some instrumentation on the SD card driver (under preprocessor conditional directives).
• Including Doxyfile for generate documentation using doxygen.
• Improving the Makefile to include doc generation.

Location:

trunk/softs/tsar_boot/src

Files:

• boot_elf_loader.c (modified) (3 diffs)
• boot_ioc.c (modified) (7 diffs)
• exceptions.c (modified) (1 diff)
• sdcard.c (modified) (2 diffs)
• spi.c (modified) (4 diffs)

trunk/softs/tsar_boot/src/boot_elf_loader.c

@@ -73 +73 @@
             {
                 boot_puts (
-                                        "ERROR: "
-                                        "IOC_FAILED"
-                                        "\n"
-                                );
+                    "ERROR: "
+                    "IOC_FAILED"
+                    "\n"
+                );
 
                 boot_exit();
             }
-           
+
             nb_block    += 1;
             nb_available = 512;
@@ -102 +102 @@
                     nb_rest = elf_header_ptr->e_phnum * elf_header_ptr->e_phentsize;
 
-                                        /* Verification of ELF Magic Number */
-                                        if (
-                                                (elf_header_ptr->e_ident[EI_MAG0] != ELFMAG0) ||
-                                                (elf_header_ptr->e_ident[EI_MAG1] != ELFMAG1) ||
-                                                (elf_header_ptr->e_ident[EI_MAG2] != ELFMAG2) ||
-                                                (elf_header_ptr->e_ident[EI_MAG3] != ELFMAG3) )
-                                        {
-                                                boot_puts(
-                                                        "ERROR: "
-                                                        "Input file does not use ELF format"
-                                                        "\n"
-                                                );      
-
-                                                boot_exit();
-                                        }
-
-                                        /* 
-                                         * Verification of Program Headers table size. It must be
-                                         * smaller than the work size allocated for the 
-                                         * elf_pht[PHDR_ARRAY_SIZE] array
-                                         **/
+                    /* Verification of ELF Magic Number */
+                    if (
+                        (elf_header_ptr->e_ident[EI_MAG0] != ELFMAG0) ||
+                        (elf_header_ptr->e_ident[EI_MAG1] != ELFMAG1) ||
+                        (elf_header_ptr->e_ident[EI_MAG2] != ELFMAG2) ||
+                        (elf_header_ptr->e_ident[EI_MAG3] != ELFMAG3) )
+                    {
+                        boot_puts(
+                            "ERROR: "
+                            "Input file does not use ELF format"
+                            "\n"
+                        );  
+
+                        boot_exit();
+                    }
+
+                    /* 
+                     * Verification of Program Headers table size. It must be
+                     * smaller than the work size allocated for the 
+                     * elf_pht[PHDR_ARRAY_SIZE] array
+                     **/
                     if (elf_header_ptr->e_phnum > PHDR_ARRAY_SIZE)
                     {
                         boot_puts(
-                                                        "ERROR: "
-                                                        "ELF PHDR table size is bigger than "
-                                                        "the allocated work space"
-                                                        "\n"
-                                                );
+                            "ERROR: "
+                            "ELF PHDR table size is bigger than "
+                            "the allocated work space"
+                            "\n"
+                        );
 
                         boot_exit();
@@ -257 +257 @@
 
     boot_puts (
-                "Finishing boot_elf_loader function.\n"
-                "Entry point address: "
-        );
+        "Finishing boot_elf_loader function.\n"
+        "Entry point address: "
+    );
     boot_putx(elf_header_ptr->e_entry);
     boot_puts("\n");

trunk/softs/tsar_boot/src/boot_ioc.c

@@ -2 +2 @@
 
 #ifndef SOCLIB_IOC
+
+static struct sdcard_dev  _sdcard_device;
+static struct spi_dev   * _spi_device   = ( struct spi_dev * )IOC_BASE;
 
 #ifndef SYSCLK_FREQ
 #warning "Using default value for SYSCLK_FREQ = 50000000"
 #define SYSCLK_FREQ 50000000U
-#endif
-
-static struct sdcard_dev  _sdcard_device;
-static struct spi_dev   * _spi_device   = ( struct spi_dev * )IOC_BASE;
-#endif
-
-
+#endif // end ifndef SYSCLK_FREQ
+
+#endif // end ifndef SOCLIB_IOC
+
+#define SDCARD_RESET_ITER_MAX 4
+
+inline void boot_sleep(int cycles)
+{
+    int i;
+    for (i = 0; i < cycles; i++);
+}
+
+#if INSTRUMENTATION
+inline unsigned int boot_proctime()
+{
+    unsigned int ret;
+    asm volatile ("mfc0 %0, $9":"=r" (ret));
+    return ret;
+}
+#endif // end if INSTRUMENTATION
+
+#ifndef SOCLIB_IOC
 int boot_ioc_init()
 {
-#ifdef SOCLIB_IOC
-    return 0;
-#else
     unsigned char sdcard_rsp;
 
@@ -37 +52 @@
      * Initializing the SD Card
      */
-    if ( (sdcard_rsp = sdcard_dev_open(&_sdcard_device, _spi_device, 0)) )
-        return sdcard_rsp;
-
-    if ( (sdcard_rsp = sdcard_dev_set_blocklen(&_sdcard_device, 512)) )
-        return sdcard_rsp;
+    unsigned int iter = 0;
+    while(1) 
+    {
+        boot_puts("Trying to initialize SD card... ");
+
+        sdcard_rsp = sdcard_dev_open(&_sdcard_device, _spi_device, 0);
+        if (sdcard_rsp == 0)
+        {
+            boot_puts("OK\n");
+            break;
+        }
+
+        boot_puts("KO\n");
+        boot_sleep(1000);
+        if (++iter >= SDCARD_RESET_ITER_MAX)
+        {
+            boot_puts("\nERROR: During SD card reset to IDLE state\n"
+                      "/ card response = ");
+            boot_putx(sdcard_rsp);
+            boot_puts("\n");
+            boot_exit();
+        }
+    }
+
+    /**
+     * Set the block length of the SD Card
+     */
+    sdcard_rsp = sdcard_dev_set_blocklen(&_sdcard_device, 512);
+    if (sdcard_rsp)
+    {
+        boot_puts("ERROR: During SD card blocklen initialization\n");
+        boot_exit();
+    }
 
     /**
@@ -48 +91 @@
     spi_dev_config (
         _spi_device ,
-        10000000    , /**< SPI_clkL 10 Mhz */
-        SYSCLK_FREQ , /**< Sys_clk         */
-        -1          , /**< Charlen: 8      */
+        10000000    , /**< SPI_clk 10 Mhz */
+        SYSCLK_FREQ , /**< Sys_clk        */
+        -1          , /**< Charlen: 8     */
         -1          ,
         -1
@@ -58 +101 @@
 
     return 0;
-#endif
-}
+}
+#endif // end ifndef SOCLIB_IOC
 
 /**
@@ -137 +180 @@
 
 #else
+
 ///////////////////////////////////////////////////////////////////////////////
 // FPGA version of the boot_ioc_read function
@@ -143 +187 @@
 {
     unsigned int sdcard_rsp;
+    unsigned int i;
 
     sdcard_dev_lseek(&_sdcard_device, lba);
 
-    unsigned int i;
+#if INSTRUMENTATION
+    unsigned int start_time;
+    unsigned int end_time;
+    boot_puts("[ DEBUG ] Reading blocks ");
+    boot_putd(lba);
+    boot_puts(" to ");
+    boot_putd(lba + count - 1);
+
+    start_time = boot_proctime();
+#endif
+
     for(i = 0; i < count; i++)
     {
@@ -161 +216 @@
 
             return 1;
-        }   
-    }
+        }
+    }
+
+#if INSTRUMENTATION
+    end_time = boot_proctime();
+
+    boot_puts(" / cycles for transfert: ");
+    boot_putd(end_time - start_time);
+    boot_puts("\n");
+#endif
 
     return 0;

trunk/softs/tsar_boot/src/exceptions.c

@@ -4 +4 @@
  * \author  : Manuel Bouyer
  *
- * This file defines a simple exeptions handler
+ * This file defines a simple exceptions handler
  */
 

trunk/softs/tsar_boot/src/sdcard.c

@@ -43 +43 @@
 static void _sdcard_gen_tick(struct sdcard_dev * sdcard, unsigned int tick_count)
 {
-    volatile register int i = 0;
+    register int i = 0;
     while(i++ < tick_count) spi_put_tx(sdcard->spi, 0xFF, 0);
 }
@@ -213 +213 @@
 
     for (i = 0; i < 4; i++)
+    {
         args[i] = (sdcard->access_pointer >> (32 - (i+1)*8)) & 0xFF;
+    }
 
     _sdcard_enable(sdcard);

trunk/softs/tsar_boot/src/spi.c

@@ -1 @@
-/*
+/**
  * \file    spi.c
- * \data    31 August 2012
+ * \date    31 August 2012
  * \author  Cesar Fuguet <cesar.fuguet-tortolero@lip6.fr>
  */
@@ -15 +15 @@
 static void _spi_wait_if_busy(struct spi_dev * spi)
 {
-    volatile register int delay;
+    register int delay;
 
     while(SPI_IS_BUSY(spi))
     {
-        for (delay = 0; delay < 10000; delay++);
+        for (delay = 0; delay < 100; delay++);
     }
 }
@@ -58 +58 @@
         iowrite8(&spi->rx_tx[index % 4], byte);
         _spi_init_transfer(spi);
-
-        asm volatile("sync");
     }
     _spi_wait_if_busy(spi);
@@ -104 +102 @@
     if (spi_freq > 0 && sys_freq > 0)
         iowrite32(&spi->divider, _spi_calc_divider_value(spi_freq, sys_freq));
-
 }