Changeset 5 for trunk/modules

Timestamp:

Mar 29, 2010, 6:13:12 PM (15 years ago)

Author:

guthmull

Message:

Fix a deadlock issue on the coherency network

File:

• trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp (modified) (2 diffs)

trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp

@@ -1291 +1291 @@
 
           if ( no_update )      r_write_fsm = WRITE_RSP;
-          else                  r_write_fsm = WRITE_UPT_LOCK;
+          else                  
+            if( !r_write_to_init_cmd_multi_req.read() && 
+              !r_write_to_init_cmd_brdcast_req.read()  )
+                r_write_fsm = WRITE_UPT_LOCK;
+            else
+                r_write_fsm = WRITE_WAIT;
           break;
         }
@@ -2728 +2733 @@
             std::cout << "SC, shared line" << std::endl;
 #endif
-            r_llsc_fsm = SC_UPT_LOCK;
+
+            if( !r_llsc_to_init_cmd_multi_req.read() && 
+                !r_llsc_to_init_cmd_brdcast_req.read()  )
+                r_llsc_fsm = SC_UPT_LOCK;
+            else
+                r_llsc_fsm = SC_WAIT;
           } else {
             r_llsc_fsm = SC_RSP_TRUE;