Changeset 1017 for trunk

Timestamp:

Sep 30, 2015, 4:53:16 PM (9 years ago)

Author:

alain

Message:

Introduce a soft reset, caused by a write in BLOCK_DEVICE_STATUS register.

Location:

trunk/modules/vci_block_device_tsar/caba/source

Files:

• include/vci_block_device_tsar.h (modified) (1 diff)
• src/vci_block_device_tsar.cpp (modified) (15 diffs)

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

@@ -168 +168 @@
     T_WRITE_LBA         = 7,
     T_READ_LBA          = 8,
-    T_WRITE_OP          = 9,
+    T_WRITE_STATUS      = 9,
     T_READ_STATUS       = 10,
     T_WRITE_IRQEN       = 11,
     T_READ_IRQEN        = 12,
-    T_READ_SIZE         = 13,
-    T_READ_BLOCK        = 14,
-    T_READ_ERROR        = 15,
-    T_WRITE_ERROR       = 16,
-    };
-
-    // Error codes values
-    enum {
-    VCI_READ_OK         = 0,
-    VCI_READ_ERROR      = 1,
-    VCI_WRITE_OK        = 2,
-    VCI_WRITE_ERROR     = 3,
+    T_WRITE_OP          = 13,
+    T_READ_SIZE         = 14,
+    T_READ_BLOCK        = 15,
+    T_ERROR             = 16,
     };
 

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

@@ -77 +77 @@
             bool     read = (p_vci_target.cmd.read() == vci_param::CMD_READ);
             uint32_t cell = (uint32_t)((address & 0x3F)>>2);
-            bool     pending = (r_initiator_fsm.read() != M_IDLE);
-
-            if     ( !read && not found )                         r_target_fsm = T_WRITE_ERROR;
-            else if(  read && not found )                         r_target_fsm = T_READ_ERROR;
-            else if( !read && not p_vci_target.eop.read() )       r_target_fsm = T_WRITE_ERROR;
-            else if(  read && not p_vci_target.eop.read() )       r_target_fsm = T_READ_ERROR;
-            else if( !read && pending )                           r_target_fsm = T_WRITE_ERROR;
+            bool     running = (r_initiator_fsm.read() != M_IDLE);
+
+            if     ( not found )                                  r_target_fsm = T_ERROR;
+            else if( not p_vci_target.eop.read() )                r_target_fsm = T_ERROR;
+            else if( running && (cell != BLOCK_DEVICE_STATUS) )   r_target_fsm = T_ERROR;
             else if( !read && (cell == BLOCK_DEVICE_BUFFER) )     r_target_fsm = T_WRITE_BUFFER;
             else if(  read && (cell == BLOCK_DEVICE_BUFFER) )     r_target_fsm = T_READ_BUFFER;
@@ -92 +90 @@
             else if( !read && (cell == BLOCK_DEVICE_LBA) )        r_target_fsm = T_WRITE_LBA;
             else if(  read && (cell == BLOCK_DEVICE_LBA) )        r_target_fsm = T_READ_LBA;
-            else if( !read && (cell == BLOCK_DEVICE_OP) )         r_target_fsm = T_WRITE_OP;
+            else if( !read && (cell == BLOCK_DEVICE_STATUS) )     r_target_fsm = T_WRITE_STATUS;
             else if(  read && (cell == BLOCK_DEVICE_STATUS) )     r_target_fsm = T_READ_STATUS;
             else if( !read && (cell == BLOCK_DEVICE_IRQ_ENABLE) ) r_target_fsm = T_WRITE_IRQEN;
             else if(  read && (cell == BLOCK_DEVICE_IRQ_ENABLE) ) r_target_fsm = T_READ_IRQEN;
+            else if( !read && (cell == BLOCK_DEVICE_OP) )         r_target_fsm = T_WRITE_OP;
             else if(  read && (cell == BLOCK_DEVICE_SIZE) )       r_target_fsm = T_READ_SIZE;
             else if(  read && (cell == BLOCK_DEVICE_BLOCK_SIZE) ) r_target_fsm = T_READ_BLOCK;
+            else                                                  r_target_fsm = T_ERROR;
 
             // get write data value for both 32 bits and 64 bits data width
@@ -185 +185 @@
                 r_read = false;
                 r_go   = true;
-            }
-            else
-            {
-
-#if SOCLIB_MODULE_DEBUG
-std::cout << "  <BDEV_TGT WRITE_OP> value = SOFT RESET" << std::endl;
-#endif
-                r_go   = false;
             }
             r_target_fsm = T_IDLE;
@@ -220 +212 @@
     case T_READ_SIZE:
     case T_READ_BLOCK:
-    case T_READ_ERROR:
-    case T_WRITE_ERROR:
+    case T_ERROR:
     {
         if ( p_vci_target.rspack.read() ) r_target_fsm = T_IDLE;
@@ -236 +227 @@
                 (r_initiator_fsm == M_WRITE_SUCCESS) ||
                 (r_initiator_fsm == M_WRITE_ERROR  ) ) r_go = false;
+        }
+        break;
+    }
+    ////////////////////
+    case T_WRITE_STATUS:
+    {
+        if ( p_vci_target.rspack.read() )
+        {
+            r_target_fsm = T_IDLE;
+            r_go         = false;
         }
         break;
@@ -323 +324 @@
                         // in case of 8 bytes flits...
     {
+        if ( r_go.read() == false )   // soft reset
+        {
+            r_initiator_fsm = M_IDLE;
+            break;
+        }
+
         uint32_t nwords;
         uint32_t offset = r_burst_offset.read();
@@ -435 +442 @@
     case M_WRITE_BURST:  // Compute the number of words in the burst
     {
+        if ( r_go.read() == false )   // soft reset
+        {
+            r_initiator_fsm = M_IDLE;
+            break;
+        }
+
         uint32_t nwords;
         uint32_t offset = r_burst_offset.read();
@@ -584 +597 @@
         else if(r_initiator_fsm == M_WRITE_ERROR)   p_vci_target.rdata = BLOCK_DEVICE_WRITE_ERROR;
         else                                        p_vci_target.rdata = BLOCK_DEVICE_BUSY;
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_BUFFER:
@@ -590 +603 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = (uint32_t)r_buf_address.read();
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_BUFFER_EXT:
@@ -596 +609 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = (uint32_t)(r_buf_address.read()>>32);
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_COUNT:
@@ -602 +615 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = r_nblocks.read();
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_LBA:
@@ -608 +621 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = r_lba.read();
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_IRQEN:
@@ -614 +627 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = r_irq_enable.read();
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_SIZE:
@@ -620 +633 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = m_device_size;
-        p_vci_target.rerror = VCI_READ_OK;
+        p_vci_target.rerror = 0;
         break;
     case T_READ_BLOCK:
@@ -626 +639 @@
         p_vci_target.rspval = true;
         p_vci_target.rdata  = m_words_per_block*4;
-        p_vci_target.rerror = VCI_READ_OK;
-        break;
-    case T_READ_ERROR:
+        p_vci_target.rerror = 0;
+        break;
+    case T_ERROR:
         p_vci_target.cmdack = false;
         p_vci_target.rspval = true;
         p_vci_target.rdata  = 0;
-        p_vci_target.rerror = VCI_READ_ERROR;
-        break;
-    case T_WRITE_ERROR:
+        p_vci_target.rerror = 1;
+        break;
+    default:      // all write
         p_vci_target.cmdack = false;
         p_vci_target.rspval = true;
         p_vci_target.rdata  = 0;
-        p_vci_target.rerror = VCI_WRITE_ERROR;
-        break;
-    default:
-        p_vci_target.cmdack = false;
-        p_vci_target.rspval = true;
-        p_vci_target.rdata  = 0;
-        p_vci_target.rerror = VCI_WRITE_OK;
+        p_vci_target.rerror = 0;
         break;
     } // end switch target fsm