Merge branch…

Merge branch '26-rmq-tx-interface-erroneously-fetches-next-data-from-out-slot-when-client-is-not-ready' into 'master' Resolve "RMQ TX interface erroneously fetches next data from out slot when client is not ready" Closes #26 See merge request be-cem-edl/common/mockturtle!18

Merge branch…
Merge branch '26-rmq-tx-interface-erroneously-fetches-next-data-from-out-slot-when-client-is-not-ready' into 'master' Resolve "RMQ TX interface erroneously fetches next data from out slot when client is not ready" Closes #26 See merge request be-cem-edl/common/mockturtle!18
958f1d43 · Tristan Gingold · b2fe5302 · fec2696a · 958f1d43 · 958f1d43
Commit 958f1d43 authored Feb 28, 2023 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

CHANGELOG.rst CHANGELOG.rst +6 -0

mt_rmq_tx.vhd hdl/rtl/mqueue/mt_rmq_tx.vhd +8 -2

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,12 @@ Change Log
 Format: `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
 Versioning: `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_

+Unreleased
+==========
+Fixed
+-----
+- [hdl] RMQ TX interface flow control (#26)
+
 [4.1.0] - 2023-01-12
 ====================
 Added

--- a/hdl/rtl/mqueue/mt_rmq_tx.vhd
+++ b/hdl/rtl/mqueue/mt_rmq_tx.vhd
@@ -175,9 +175,9 @@ begin

        when SEND_PAYLOAD_ODD =>

-          --  Read next payload
+          --  By default, if not overriden below, keep requesting the same payload
          inb_o <= (sel   => '1',
-                    adr   => std_logic_vector(state.addr + 4),
+                    adr   => std_logic_vector(state.addr),
                    dat   => (others => 'X'),
                    we    => '0',
                    wmask => "XXXX");
@@ -202,6 +202,12 @@ begin
                          addr          => (others => 'X'),
                          pkt_last_addr => (others => 'X'));
            else
+              --  Request next payload
+              inb_o <= (sel   => '1',
+                        adr   => std_logic_vector(state.addr + 4),
+                        dat   => (others => 'X'),
+                        we    => '0',
+                        wmask => "XXXX");
              n_state <= (state         => SEND_PAYLOAD_EVEN,
                          addr          => state.addr + 4,
                          pkt_last_addr => state.pkt_last_addr);