Changeset 1061 for trunk/modules/vci_cc_vcache_wrapper/caba/source/include

Timestamp:

Oct 10, 2019, 11:35:53 AM (5 years ago)

Author:

alain

Message:

Fix a bug in the LLSC reservation FSM: the r_llsc_count (lifetime counter)
was not properly updated, resulting in an unexpected reservation invalidation.
This caused an abnormal failure in the NON BLOCKING hal_remote_atomic_cas()
function in ALMOS-MKH.

File:

• trunk/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (modified) (4 diffs)

trunk/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h

@@ -47 +47 @@
 #include "iss2.h"
 
-#define LLSC_TIMEOUT    10000
+#define LLSC_TIMEOUT   1000000
 
 namespace soclib {
@@ -343 +343 @@
     bool                                m_debug_cmd_fsm;
     uint32_t                            m_previous_status;
+    uint32_t                            m_debug_previous_mmu;
 
 
@@ -587 +588 @@
     //////////////////////////////////////////////////////////////////
 
-    sc_signal<paddr_t>                     r_dcache_llsc_paddr;
-    sc_signal<uint32_t>                    r_dcache_llsc_key;
-    sc_signal<uint32_t>                    r_dcache_llsc_count;
-    sc_signal<bool>                        r_dcache_llsc_valid;
+    sc_signal<paddr_t>                     r_llsc_paddr;
+    sc_signal<uint32_t>                    r_llsc_key;
+    sc_signal<uint32_t>                    r_llsc_count;
 
     ////////////////////////////////
@@ -754 +754 @@
     void print_frozen_stats();
     void print_trace(size_t mode = 0);
+    void mmu_monitor();
     void cache_monitor(paddr_t addr);
     void start_monitor(paddr_t,paddr_t);