bslathi19/cocotbext-eth
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

Handle dropped transmit frames during reset

Browse Source
This commit is contained in:
Alex Forencich
2021-03-21 14:08:27 -07:00
parent f4054cfd65
commit 63e6eafc07
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cocotbext/eth/gmii.py
View File

@@ -153,6 +153,7 @@ class GmiiSource(Reset):
self.active = False self.active = False
self.queue = Queue() self.queue = Queue()
self.current_frame = None
self.idle_event = Event() self.idle_event = Event()
self.idle_event.set() self.idle_event.set()
@@ -223,6 +224,11 @@ class GmiiSource(Reset):
self.er <= 0 self.er <= 0
self.dv <= 0 self.dv <= 0
if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
self.current_frame.handle_tx_complete()
self.current_frame = None
if self.queue.empty(): if self.queue.empty():
self.idle_event.set() self.idle_event.set()
else: else:
@@ -248,6 +254,7 @@ class GmiiSource(Reset):
frame = self.queue.get_nowait() frame = self.queue.get_nowait()
self.queue_occupancy_bytes -= len(frame) self.queue_occupancy_bytes -= len(frame)
self.queue_occupancy_frames -= 1 self.queue_occupancy_frames -= 1
self.current_frame = frame
frame.sim_time_start = get_sim_time() frame.sim_time_start = get_sim_time()
frame.sim_time_sfd = None frame.sim_time_sfd = None
frame.sim_time_end = None frame.sim_time_end = None
@@ -284,6 +291,7 @@ class GmiiSource(Reset):
frame.sim_time_end = get_sim_time() frame.sim_time_end = get_sim_time()
frame.handle_tx_complete() frame.handle_tx_complete()
frame = None frame = None
self.current_frame = None
else: else:
self.data <= 0 self.data <= 0
if self.er is not None: if self.er is not None:

8
cocotbext/eth/mii.py
View File

@@ -55,6 +55,7 @@ class MiiSource(Reset):
self.active = False self.active = False
self.queue = Queue() self.queue = Queue()
self.current_frame = None
self.idle_event = Event() self.idle_event = Event()
self.idle_event.set() self.idle_event.set()
@@ -124,6 +125,11 @@ class MiiSource(Reset):
self.er <= 0 self.er <= 0
self.dv <= 0 self.dv <= 0
if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
self.current_frame.handle_tx_complete()
self.current_frame = None
if self.queue.empty(): if self.queue.empty():
self.idle_event.set() self.idle_event.set()
else: else:
@@ -149,6 +155,7 @@ class MiiSource(Reset):
frame = self.queue.get_nowait() frame = self.queue.get_nowait()
self.queue_occupancy_bytes -= len(frame) self.queue_occupancy_bytes -= len(frame)
self.queue_occupancy_frames -= 1 self.queue_occupancy_frames -= 1
self.current_frame = frame
frame.sim_time_start = get_sim_time() frame.sim_time_start = get_sim_time()
frame.sim_time_sfd = None frame.sim_time_sfd = None
frame.sim_time_end = None frame.sim_time_end = None
@@ -181,6 +188,7 @@ class MiiSource(Reset):
frame.sim_time_end = get_sim_time() frame.sim_time_end = get_sim_time()
frame.handle_tx_complete() frame.handle_tx_complete()
frame = None frame = None
self.current_frame = None
else: else:
self.data <= 0 self.data <= 0
if self.er is not None: if self.er is not None:

8
cocotbext/eth/rgmii.py
View File

@@ -57,6 +57,7 @@ class RgmiiSource(Reset):
self.active = False self.active = False
self.queue = Queue() self.queue = Queue()
self.current_frame = None
self.idle_event = Event() self.idle_event = Event()
self.idle_event.set() self.idle_event.set()
@@ -122,6 +123,11 @@ class RgmiiSource(Reset):
self.data <= 0 self.data <= 0
self.ctrl <= 0 self.ctrl <= 0
if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
self.current_frame.handle_tx_complete()
self.current_frame = None
if self.queue.empty(): if self.queue.empty():
self.idle_event.set() self.idle_event.set()
else: else:
@@ -154,6 +160,7 @@ class RgmiiSource(Reset):
frame = self.queue.get_nowait() frame = self.queue.get_nowait()
self.queue_occupancy_bytes -= len(frame) self.queue_occupancy_bytes -= len(frame)
self.queue_occupancy_frames -= 1 self.queue_occupancy_frames -= 1
self.current_frame = frame
frame.sim_time_start = get_sim_time() frame.sim_time_start = get_sim_time()
frame.sim_time_sfd = None frame.sim_time_sfd = None
frame.sim_time_end = None frame.sim_time_end = None
@@ -189,6 +196,7 @@ class RgmiiSource(Reset):
frame.sim_time_end = get_sim_time() frame.sim_time_end = get_sim_time()
frame.handle_tx_complete() frame.handle_tx_complete()
frame = None frame = None
self.current_frame = None
else: else:
d = 0 d = 0
er = 0 er = 0

8
cocotbext/eth/xgmii.py
View File

@@ -154,6 +154,7 @@ class XgmiiSource(Reset):
self.active = False self.active = False
self.queue = Queue() self.queue = Queue()
self.current_frame = None
self.idle_event = Event() self.idle_event = Event()
self.idle_event.set() self.idle_event.set()
@@ -227,6 +228,11 @@ class XgmiiSource(Reset):
self.data <= 0 self.data <= 0
self.ctrl <= 0 self.ctrl <= 0
if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
self.current_frame.handle_tx_complete()
self.current_frame = None
if self.queue.empty(): if self.queue.empty():
self.idle_event.set() self.idle_event.set()
else: else:
@@ -259,6 +265,7 @@ class XgmiiSource(Reset):
frame = self.queue.get_nowait() frame = self.queue.get_nowait()
self.queue_occupancy_bytes -= len(frame) self.queue_occupancy_bytes -= len(frame)
self.queue_occupancy_frames -= 1 self.queue_occupancy_frames -= 1
self.current_frame = frame
frame.sim_time_start = get_sim_time() frame.sim_time_start = get_sim_time()
frame.sim_time_sfd = None frame.sim_time_sfd = None
frame.sim_time_end = None frame.sim_time_end = None
@@ -310,6 +317,7 @@ class XgmiiSource(Reset):
frame.sim_time_end = get_sim_time() frame.sim_time_end = get_sim_time()
frame.handle_tx_complete() frame.handle_tx_complete()
frame = None frame = None
self.current_frame = None
else: else:
d_val |= XgmiiCtrl.IDLE << k*8 d_val |= XgmiiCtrl.IDLE << k*8
c_val |= 1 << k c_val |= 1 << k