Changeset 654 for trunk/hal/tsar_mips32/drivers/soclib_mmc.c

Timestamp:

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

Author:

alain

Message:

euh...

File:

• trunk/hal/tsar_mips32/drivers/soclib_mmc.c (modified) (1 diff)

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()