From 5ffa10fefca7c92a2e0d057fce39128460cb8386 Mon Sep 17 00:00:00 2001 From: Larry Ruckman Date: Fri, 20 Sep 2024 08:30:08 -0700 Subject: [PATCH] cherry picking the surf AxiStreamFifoV2 changes up to v2.50.0 --- axi/axi-stream/rtl/AxiStreamFifoV2.vhd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/axi/axi-stream/rtl/AxiStreamFifoV2.vhd b/axi/axi-stream/rtl/AxiStreamFifoV2.vhd index f05e6acc99..23b695a791 100644 --- a/axi/axi-stream/rtl/AxiStreamFifoV2.vhd +++ b/axi/axi-stream/rtl/AxiStreamFifoV2.vhd @@ -313,7 +313,12 @@ begin -- Start output when a block or end of frame is available elsif fifoValidLast = '1' or (VALID_THOLD_G /= 0 and fifoRdCount >= VALID_THOLD_G) then fifoInFrame <= '1' after TPD_G; + + -- Prevent the FIFO from locking up when frame deeper than what the U_Fifo can hold + elsif (fifoAFull = '1') then + fifoInFrame <= '1' after TPD_G; end if; + end if; end process;