diff --git a/generic_ip/data_streamer/7/src/data_streamer_7.vhd b/generic_ip/data_streamer/7/src/data_streamer_7.vhd index 4b3f880..1caed7f 100644 --- a/generic_ip/data_streamer/7/src/data_streamer_7.vhd +++ b/generic_ip/data_streamer/7/src/data_streamer_7.vhd @@ -94,11 +94,17 @@ entity data_streamer_7 is ip_id_mfr_number : out std_logic_vector( 7 downto 0); ip_ver_minor_number : out std_logic_vector( 7 downto 0); ip_ver_major_number : out std_logic_vector( 7 downto 0); + + diag_step_mode : in std_logic := '0'; + diag_step : in std_logic := '0'; diag_dst0_count : out std_logic_vector(31 downto 0); debug_out : out std_logic_vector(19 downto 0); diag_1 : out std_logic_vector(31 downto 0); - diag_2 : out std_logic_vector(31 downto 0) + diag_2 : out std_logic_vector(31 downto 0); + + diag_cmd_q_write : out std_logic; + diag_cmd_q_write_data : out std_logic_vector(31 downto 0) ); @@ -108,7 +114,7 @@ architecture rtl of data_streamer_7 is constant CONST_IP_ID_NUMBER : std_logic_vector(7 downto 0) := 8x"0d"; constant CONST_IP_ID_MFR_NUMBER: std_logic_vector(7 downto 0) := 8x"04"; - constant CONST_IP_VER_MINOR : std_logic_vector(7 downto 0) := 8x"04"; + constant CONST_IP_VER_MINOR : std_logic_vector(7 downto 0) := 8x"05"; constant CONST_IP_VER_MAJOR : std_logic_vector(7 downto 0) := 8x"07"; subtype CMD_BITS is natural range 3 downto 0; @@ -210,6 +216,8 @@ architecture rtl of data_streamer_7 is signal cmd_port_int : std_logic_vector(31 downto 0); signal is_slim : std_logic; + + signal cmd_available_step : std_logic; begin @@ -306,7 +314,7 @@ begin -- Pop the command word from the queue if able to process. -- Pop parameters if pop_parameter asserted. Pop error values when cmd_gobble asserted. - cmd_read <= (cmd_available and not cmd_pending and not data_cmd_active and not tlb_cmd_active and loop_count_is_zero) or + cmd_read <= (cmd_available_step and not cmd_pending and not data_cmd_active and not tlb_cmd_active and loop_count_is_zero) or cmd_gobble or pop_parameter; -- Flag when there is enough space in the command queue for a LD_CMD_Q transfer @@ -357,6 +365,7 @@ begin overrun_err <= '0'; cmd_gobble <= '0'; cmd_available <= '0'; + cmd_available_step <= '0'; cmd_data <= (others => '0'); fetch_vaddr <= '0'; tlb_write <= '0'; @@ -383,6 +392,9 @@ begin cmd_port_wr_int <= '0'; elsif (clk'event and clk = '1') then + + diag_cmd_q_write_data <= cmd_q_write_data; + diag_cmd_q_write <= cmd_q_write; -- Default pulse signals avm_rx_read <= '0'; @@ -405,8 +417,10 @@ begin if to_integer(unsigned(usedw(CMD_QUEUE_DEPTH_LOG2-1 downto 1))) /= 0 or cmd_full = '1' or loop_count_is_zero = '0' or (cmd_pending = '0' and cmd_is_nop = '1' and cmd_empty = '0') then cmd_available <= not control_disable; + cmd_available_step <= not control_disable and not (diag_step_mode and not diag_step); else cmd_available <= '0'; + cmd_available_step <= '0'; end if; -- Latch the command value when not pending for use in processing any subsequent parameters @@ -415,7 +429,7 @@ begin end if; -- If idle, and there's a command ready to process... - if (cmd_available = '1' or cmd_pending = '1') and data_cmd_active = '0' and tlb_cmd_active = '0' and cmd_error = '0' then + if (cmd_available_step = '1' or cmd_pending = '1') and data_cmd_active = '0' and tlb_cmd_active = '0' and cmd_error = '0' then case cmd_data(CMD_BITS) is @@ -783,6 +797,7 @@ begin if control_clear_cmd = '1' then cmd_pending <= '0'; cmd_available <= '0'; + cmd_available_step <= '0'; data_cmd_active <= '0'; if is_slim ='0' then read_committed <= '0';