From 66aa860be765c06cd8355c8250602907a05ef3d2 Mon Sep 17 00:00:00 2001 From: Simon Southwell Date: Wed, 24 Jul 2019 10:56:45 +0100 Subject: [PATCH] ELGIP-64 adding zero-gap support with flagging destination data output port writes with a last word bit --- generic_ip/data_streamer/7/src/data_streamer_7.vhd | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 12fc5c4..6e7805f 100644 --- a/generic_ip/data_streamer/7/src/data_streamer_7.vhd +++ b/generic_ip/data_streamer/7/src/data_streamer_7.vhd @@ -80,6 +80,7 @@ entity data_streamer_7 is dest_port_wr : out std_logic_vector(NUM_EXT_DSTS-1 downto 0); dest_port_wr_data : out std_logic_vector(31 downto 0); dest_port_rdy : in std_logic_vector(NUM_EXT_DSTS-1 downto 0); + dest_port_last_word : out std_logic; ld_q_redirect_addr : in std_logic_vector(31 downto 0); @@ -107,7 +108,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"02"; + constant CONST_IP_VER_MINOR : std_logic_vector(7 downto 0) := 8x"03"; constant CONST_IP_VER_MAJOR : std_logic_vector(7 downto 0) := 8x"07"; subtype CMD_BITS is natural range 3 downto 0; @@ -122,6 +123,7 @@ architecture rtl of data_streamer_7 is subtype CMD_PARAM0_LOOP_CNT is natural range 19 downto 12; constant CMD_REDIRECT_BIT : integer := 7; + constant CMD_LAST_BIT : integer := 7; constant CMD_RD_DATA_PADDR : std_logic_vector := 4x"0"; constant CMD_RD_DATA_VADDR : std_logic_vector := 4x"1"; @@ -202,6 +204,7 @@ architecture rtl of data_streamer_7 is signal update_addr : std_logic; signal use_redirect_addr : std_logic; + signal last_rd_block : std_logic; signal cmd_port_wr_int : std_logic; signal cmd_port_int : std_logic_vector(31 downto 0); @@ -365,6 +368,7 @@ begin use_latched_addr <= '0'; irq <= '0'; dest_port_wr_int <= (others => '0'); + dest_port_last_word <= '0'; read_committed <= '0'; multi_burst_last <= '0'; tlb_cmd_active <= '0'; @@ -375,6 +379,7 @@ begin loop_is_first <= '0'; update_addr <= '0'; use_redirect_addr <= '0'; + last_rd_block <= '0'; cmd_port_wr_int <= '0'; elsif (clk'event and clk = '1') then @@ -387,6 +392,7 @@ begin tlb_read <= '0'; tlb_read_last <= tlb_read; tlb_write_last <= tlb_write; + dest_port_last_word <= '0'; var_remaining_burst := remaining_burst; cmd_port_wr_int <= cmd_port_wr; @@ -427,6 +433,7 @@ begin -- Destination index for command queue is one above the defined number of external destinations. dst_sel <= std_logic_vector(to_unsigned(NUM_EXT_DSTS, 4)); use_redirect_addr <= cmd_data(CMD_REDIRECT_BIT); + last_rd_block <= '0'; update_addr <= not cmd_data(CMD_REDIRECT_BIT); -- Flag that auto-loading commands are now active whenever a LD_CMD_Q is written. @@ -436,6 +443,7 @@ begin else use_redirect_addr <= '0'; + last_rd_block <= cmd_data(CMD_LAST_BIT); -- Latch the destination index dst_sel <= cmd_data(CMD_DEST_BITS); @@ -688,6 +696,9 @@ begin -- Last transfer of burst if avm_rx_burstcount = 12x"1" then + + -- Flag the last word of this block if block flagged as the last and also the last transfer of a looped command + dest_port_last_word <= last_rd_block and loop_count_is_zero; -- Clear the strip active flag data_cmd_active <= '0'; @@ -713,7 +724,6 @@ begin checked_tlb <= '0'; end if; - end if; -- Decrement the burst count