Changeset 412 for trunk/softs/tsar_boot/src/boot_ioc.c

Timestamp:

Jun 17, 2013, 7:10:20 PM (11 years ago)

Author:

porquet

Message:

boot_tsar: bug fix and more debug

File:

• trunk/softs/tsar_boot/src/boot_ioc.c (modified) (13 diffs)

trunk/softs/tsar_boot/src/boot_ioc.c

@@ -21 +21 @@
 }
 
-#if INSTRUMENTATION
+#if (BOOT_DEBUG == 1 && BOOT_DEBUG_IOC == 1)
 inline unsigned int boot_proctime()
 {
@@ -28 +28 @@
     return ret;
 }
-#endif // end if INSTRUMENTATION
+#endif
 
 #ifndef SOCLIB_IOC
@@ -47 +47 @@
       SPI_TX_NEGEDGE,
       SPI_RX_POSEDGE
-    ); 
+    );
 
     /**
@@ -53 +53 @@
      */
     unsigned int iter = 0;
-    while(1) 
+    while(1)
     {
         boot_puts("Trying to initialize SD card... ");
@@ -118 +118 @@
 
 
-    unsigned int * ioc_address = ( unsigned int * )VCIBD_BASE;
-  
+    unsigned int * ioc_address = ( unsigned int * )IOC_BASE;
+
     while ( 1 )
-    { 
+    {
         status = ioread32(&ioc_address[BLOCK_DEVICE_STATUS]);
 
@@ -128 +128 @@
         break;
     }
-    
+
     return status;
 }
@@ -135 +135 @@
 /**
  * boot_ioc_read()
- * 
+ *
  * Transfer data from a file on the block device to a memory buffer.
  *
@@ -153 +153 @@
 {
 
-    unsigned int * ioc_address  = (unsigned int*)VCIBD_BASE;
-
-    // block_device configuration
-    iowrite32( &ioc_address[BLOCK_DEVICE_BUFFER],
-            ( unsigned int ) buffer );
-
-    iowrite32( &ioc_address[BLOCK_DEVICE_COUNT],
-            ( unsigned int ) count );
-
-    iowrite32( &ioc_address[BLOCK_DEVICE_LBA],
-            ( unsigned int ) lba );
-
-    iowrite32( &ioc_address[BLOCK_DEVICE_IRQ_ENABLE],
-            ( unsigned int ) 0 );
-
-    iowrite32( &ioc_address[BLOCK_DEVICE_OP],
-            ( unsigned int ) BLOCK_DEVICE_READ );
-
-    _boot_ioc_completed();
-
-#if (CACHE_COHERENCE == 0)
-    boot_dbuf_invalidate(buffer, CACHE_LINE_SIZE, count * 512);
-#endif
-    return 0;
-}
-
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// FPGA version of the boot_ioc_read function
-
-int boot_ioc_read(unsigned int lba, void* buffer, unsigned int count)
-{
-    unsigned int sdcard_rsp;
-    unsigned int i;
-
-    sdcard_dev_lseek(&_sdcard_device, lba);
-
-#if INSTRUMENTATION
+    unsigned int * ioc_address  = (unsigned int*)IOC_BASE;
+
+#if (BOOT_DEBUG == 1 && BOOT_DEBUG_IOC == 1)
     unsigned int start_time;
     unsigned int end_time;
@@ -202 +166 @@
 #endif
 
+    // block_device configuration
+    iowrite32( &ioc_address[BLOCK_DEVICE_BUFFER],
+            ( unsigned int ) buffer );
+
+    iowrite32( &ioc_address[BLOCK_DEVICE_COUNT],
+            ( unsigned int ) count );
+
+    iowrite32( &ioc_address[BLOCK_DEVICE_LBA],
+            ( unsigned int ) lba );
+
+    iowrite32( &ioc_address[BLOCK_DEVICE_IRQ_ENABLE],
+            ( unsigned int ) 0 );
+
+    iowrite32( &ioc_address[BLOCK_DEVICE_OP],
+            ( unsigned int ) BLOCK_DEVICE_READ );
+
+    _boot_ioc_completed();
+
+#if (CACHE_COHERENCE == 0)
+    boot_dbuf_invalidate(buffer, CACHE_LINE_SIZE, count * 512);
+#endif
+
+#if (BOOT_DEBUG == 1 && BOOT_DEBUG_IOC == 1)
+    end_time = boot_proctime();
+
+    boot_puts(" / cycles for transfert: ");
+    boot_putd(end_time - start_time);
+    boot_puts("\n");
+#endif
+
+    return 0;
+}
+
+#else
+
+///////////////////////////////////////////////////////////////////////////////
+// FPGA version of the boot_ioc_read function
+
+int boot_ioc_read(unsigned int lba, void* buffer, unsigned int count)
+{
+    unsigned int sdcard_rsp;
+    unsigned int i;
+
+    sdcard_dev_lseek(&_sdcard_device, lba);
+
+#if (BOOT_DEBUG ==1 && BOOT_DEBUG_IOC == 1)
+    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++)
     {
@@ -208 +228 @@
                         (unsigned char *) buffer + (512 * i),
                         512
-                        ) 
+                        )
             ))
         {
-            boot_puts("ERROR during read on the SDCARD device. Code: "); 
+            boot_puts("ERROR during read on the SDCARD device. Code: ");
             boot_putx(sdcard_rsp);
             boot_puts("\n\r");
@@ -219 +239 @@
     }
 
-#if INSTRUMENTATION
+#if (BOOT_DEBUG == 1 && BOOT_DEBUG_IOC == 1)
     end_time = boot_proctime();
 
@@ -234 +254 @@
  * _dcache_buf_invalidate()
  *
- * Invalidate all data cache lines corresponding to a memory 
+ * Invalidate all data cache lines corresponding to a memory
  * buffer (identified by an address and a size).
  */
@@ -245 +265 @@
     unsigned int i;
 
-    // iterate on cache lines 
+    // iterate on cache lines
     for (i = 0; i < size; i += line_size) {
         asm volatile(