Changeset 481 for trunk/modules/vci_mem_cache/caba/source/include

Timestamp:

Aug 2, 2013, 2:38:51 PM (11 years ago)

Author:

devigne

Message:

Fixing deadlock with MULTI_ACK FSM and TGT_RSP FSM, and CLEANUP_FSM and TGT_FSM
TGT_RSP FSM is now a client of UPT and IVT.

File:

• trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (modified) (8 diffs)

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

@@ -104 +104 @@
         TGT_RSP_XRAM,
         TGT_RSP_MULTI_ACK,
-        TGT_RSP_CLEANUP
+        TGT_RSP_CLEANUP,
+        TGT_RSP_UPT_LOCK,
+        TGT_RSP_IVT_LOCK
       };
 
@@ -333 +335 @@
         ALLOC_UPT_WRITE,
         ALLOC_UPT_CAS,
-        ALLOC_UPT_MULTI_ACK
+        ALLOC_UPT_MULTI_ACK,
+        ALLOC_UPT_TGT_RSP
       };
 
@@ -343 +346 @@
         ALLOC_IVT_CLEANUP,
         ALLOC_IVT_CAS,
-        ALLOC_IVT_CONFIG
+        ALLOC_IVT_CONFIG,
+        ALLOC_IVT_TGT_RSP
       };
 
@@ -492 +496 @@
       void genMoore();
       void check_monitor(addr_t addr, data_t data, bool read);
+      bool hit_cleanup_req(size_t *index);
+      bool hit_multi_ack_req(size_t *index);
 
       // Component attributes
@@ -510 +516 @@
       TransactionTab                     m_trt;              // xram transaction table
       uint32_t                           m_upt_lines;
+      uint32_t                           m_ivt_lines;
       UpdateTab                          m_upt;              // pending update
       UpdateTab                          m_ivt;              // pending invalidate
@@ -736 +743 @@
 
       // Buffer between MULTI_ACK fsm and TGT_RSP fsm (complete write/update transaction)
-      sc_signal<bool>     r_multi_ack_to_tgt_rsp_req;   // valid request
+      sc_signal<bool>     *r_multi_ack_to_tgt_rsp_req;  // valid request
       sc_signal<size_t>   r_multi_ack_to_tgt_rsp_srcid; // Transaction srcid
       sc_signal<size_t>   r_multi_ack_to_tgt_rsp_trdid; // Transaction trdid
@@ -784 +791 @@
        
       // Buffer between CLEANUP fsm and TGT_RSP fsm (acknowledge a write command from L1)
-      sc_signal<bool>     r_cleanup_to_tgt_rsp_req;   // valid request
+      sc_signal<bool>     *r_cleanup_to_tgt_rsp_req;   // valid request
       sc_signal<size_t>   r_cleanup_to_tgt_rsp_srcid; // transaction srcid
       sc_signal<size_t>   r_cleanup_to_tgt_rsp_trdid; // transaction trdid
@@ -919 +926 @@
       sc_signal<int>      r_tgt_rsp_fsm;
       sc_signal<size_t>   r_tgt_rsp_cpt;
+      sc_signal<size_t>   r_tgt_rsp_prio_multi_ack;
+      sc_signal<size_t>   r_tgt_rsp_prio_cleanup;
       sc_signal<bool>     r_tgt_rsp_key_sent;