Changeset 654 for trunk/hal/tsar_mips32/drivers

Timestamp:

Nov 14, 2019, 4:03:25 PM (4 years ago)

Author:

alain

Message:

euh...

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_fbf.c (modified) (3 diffs)
• soclib_fbf.h (modified) (1 diff)
• soclib_mmc.c (modified) (1 diff)

trunk/hal/tsar_mips32/drivers/soclib_fbf.c

@@ -72 +72 @@
 #if (DEBUG_HAL_FBF|| DEBUG_HAL_FBF)
 uint32_t    cycle        = (uint32_t)hal_get_cycles();
-thread_t  * this         = CURRENT_THREAD;
 process_t * process      = hal_remote_lpt( XPTR( th_cxy , &th_ptr->process ) );
 pid_t       client_pid   = hal_remote_l32( XPTR( th_cxy , &process->pid ) );
@@ -98 +97 @@
 #if DEBUG_HAL_FBF 
 if( DEBUG_HAL_FBF < cycle )
-printk("\n[%s] thread[%x,%x] / client[%x,%x] / READ / offset / length / buffer %x / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid,  client_pid, client_trdid,
-offset, length, buffer, cycle );
+printk("\n[%s] client thread[%x,%x] / READ / offset %d / length %d / buffer %x / fbf (%x,%x)\n",
+__FUNCTION__ , client_pid, client_trdid,
+offset, length, buffer, GET_CXY(base_xp), GET_PTR(base_xp) );
 #endif
         hal_copy_to_uspace( buffer,
                             base_xp + offset,
                             length );
+#if DEBUG_HAL_FBF 
+if( DEBUG_HAL_FBF < cycle )
+printk("\n[%s] client thread[%x,%x] / READ successful / cycle %d\n",
+__FUNCTION__ , client_pid, client_trdid , cycle );
+#endif
 
     }
@@ -112 +116 @@
 #if DEBUG_HAL_FBF 
 if( DEBUG_HAL_FBF < cycle )
-printk("\n[%s] thread[%x,%x] / client[%x,%x] / WRITE / offset / length / buffer %x / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid, client_pid, client_trdid,
-offset, length, buffer, cycle );
+printk("\n[%s] client thread[%x,%x] / WRITE / offset %d / length %d / buffer %x / fbf (%x,%x)\n",
+__FUNCTION__ , client_pid, client_trdid, 
+offset, length, buffer, GET_CXY(base_xp), GET_PTR(base_xp) );
 #endif
         hal_copy_from_uspace( base_xp + offset,
                               buffer,
                               length );
+#if DEBUG_HAL_FBF 
+if( DEBUG_HAL_FBF < cycle )
+printk("\n[%s] client thread[%x,%x] / WRITE successful / cycle %d\n",
+__FUNCTION__ , client_pid, client_trdid , cycle );
+#endif
+
     }
 

trunk/hal/tsar_mips32/drivers/soclib_fbf.h

@@ -32 +32 @@
  *
  * This hardware component supports both a frame buffer, and a set of addressable
- * configuration status registers.
+ * configuration/status registers.
  ***************************************************************************************/
 
 /****************************************************************************************
  *                    SOCLIB_FBF registers offsets
- * The three addressables registers are on top  of the 4 Mbytes allocated
- * to the frame buffer itself.
+ * The three addressables registers are on top  of the 4 Mbytes containing 
+ * the frame buffer itself.
  ***************************************************************************************/
 

trunk/hal/tsar_mips32/drivers/soclib_mmc.c

@@ -116 +116 @@
 
     // get faulty ADDRESS and SRCID from MMC registers
-    uint32_t paddr_lo = *(base + (SOCLIB_MMC_ERROR_FUNC << 7) + SOCLIB_MMC_ERROR_ADDR_LO);
-    uint32_t paddr_hi = *(base + (SOCLIB_MMC_ERROR_FUNC << 7) + SOCLIB_MMC_ERROR_ADDR_HI);
-    uint32_t srcid    = *(base + (SOCLIB_MMC_ERROR_FUNC << 7) + SOCLIB_MMC_ERROR_SRCID);
+    uint32_t paddr_lo = *(base + MMC_REG( SOCLIB_MMC_ERROR_FUNC , SOCLIB_MMC_ERROR_ADDR_LO ) );
+    uint32_t paddr_hi = *(base + MMC_REG( SOCLIB_MMC_ERROR_FUNC , SOCLIB_MMC_ERROR_ADDR_HI ) );
+    uint32_t srcid    = *(base + MMC_REG( SOCLIB_MMC_ERROR_FUNC , SOCLIB_MMC_ERROR_SRCID ) );
 
-    paddr_t paddr = (((paddr_t)paddr_hi)<<32) + ((paddr_t)paddr_lo);
+    // print an error message on kernel terminal 
+    printk("\n[ERROR] reported from MMC : cxy %x / cycle %d / bad address [%x,%x] / srcid %x\n",
+    local_cxy , (uint32_t)hal_get_cycles() , paddr_hi , paddr_lo , srcid );
+
+    // reset MMC IRQ
+    *(base + MMC_REG(SOCLIB_MMC_ERROR_FUNC , SOCLIB_MMC_ERROR_IRQ_RESET) ) = 0;
     
-    // reset MMC IRQ
-    *(base + (SOCLIB_MMC_ERROR_FUNC << 7) + SOCLIB_MMC_ERROR_IRQ_RESET) = 0;
-    
-    // print an error message on kernel terminal TODO : should be improved
-    printk("\n[ERROR] reported from MMC in cluster %x : faulty address = %l / srcid = %x\n",
-           paddr , srcid );
-
 } // end soclib_mmc_isr()