Merge branch 'kondys_cocotb_mfb_monitor' into 'devel'

Add error checking for a EOF without SOF (or duplicate EOF) See merge request ndk/ndk-fpga!100
CESNET · Nov 8, 2024 · d0e7bcb · d0e7bcb
2 parents abcb471 + f1423f3
commit d0e7bcb
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/python/cocotbext/cocotbext/ofm/mfb/monitors.py b/python/cocotbext/cocotbext/ofm/mfb/monitors.py
@@ -78,16 +78,19 @@ async def _monitor_recv(self):
                     self.log.debug(f"ee_idx {str(ee_idx)}")
                     self.log.debug(f"ss_idx {str(ss_idx)}")
 
-                    if (self._eof_arr[rr] == 1) and (in_frame):
-                        # Checks if there is a packet that is being processed and if it ends in this region.
-                        self.log.debug("Frame End")
-                        in_frame = False
-                        eof_done = True
-                        frame += data_bytes[rs_inx:ee_idx]
-                        self.item_cnt += len(data_bytes[rs_inx:ee_idx])*8 // self._item_width
-                        self.log.debug(f"frame done {frame.hex()}")
-                        self._recv(frame)
-                        self.frame_cnt += 1
+                    if self._eof_arr[rr] == 1:
+                        if in_frame:
+                            # Checks if there is a packet that is being processed and if it ends in this region.
+                            self.log.debug("Frame End")
+                            in_frame = False
+                            eof_done = True
+                            frame += data_bytes[rs_inx:ee_idx]
+                            self.item_cnt += len(data_bytes[rs_inx:ee_idx])*8 // self._item_width
+                            self.log.debug(f"frame done {frame.hex()}")
+                            self._recv(frame)
+                            self.frame_cnt += 1
+                        elif self._sof_arr[rr] == 1 and (self._eof_pos_arr[rr] < self._sof_pos_arr[rr]):
+                            raise MFBProtocolError("MFB error: an end-of-frame received before a start-of-frame!")
 
                     if in_frame:
                         # Region with a valid 'middle of packet'.
@@ -99,15 +102,15 @@ async def _monitor_recv(self):
                         # Checking for beginning of a packet.
                         self.log.debug("Frame Start")
                         if in_frame:
-                            raise MFBProtocolError("Duplicate start-of-frame received on MFB bus!")
+                            raise MFBProtocolError("MFB error: a start-of-frame received without an end-of-frame!")
                         in_frame = True
                         frame = b""
 
                         if (self._eof_arr[rr] == 1) and (not eof_done):
                             # Checking if the packet ends in the same regions where it began.
                             self.log.debug("Frame End in single region")
                             if not in_frame:
-                                raise MFBProtocolError("Duplicate end-of-frame received on MFB bus!")
+                                raise MFBProtocolError("MFB error: an end-of-frame received without a start-of-frame!")
                             in_frame = False
                             frame += data_bytes[ss_idx:ee_idx]
                             self.item_cnt += len(data_bytes[ss_idx:ee_idx])*8 // self._item_width