Skip to content

W
White Rabbit core collection
Commit 4d822eb6 authored by Maciej Lipinski's avatar Maciej Lipinski Committed by Grzegorz Daniluk
Browse files
Options

added abort of RTU request - in case of error in the input frame, receiving of… 

added abort of RTU request - in case of error in the input frame, receiving of frame is aborted, error status sent to SWcore, and the RTU request needs to be aborted as well, otherwise SWcore gets lost
parent f9e9cdce
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 2 deletions
modules/wr_endpoint/endpoint_pkg.vhd
View file @ 4d822eb6
......@@ -114,6 +114,7 @@ package endpoint_pkg is
rtu_full_i : in std_logic := '0';
rtu_almost_full_i : in std_logic := '0';
rtu_rq_strobe_p1_o : out std_logic;
rtu_rq_abort_o : out std_logic;
rtu_rq_smac_o : out std_logic_vector(48 - 1 downto 0);
rtu_rq_dmac_o : out std_logic_vector(48 - 1 downto 0);
rtu_rq_vid_o : out std_logic_vector(12 - 1 downto 0);
......@@ -220,6 +221,7 @@ package endpoint_pkg is
rtu_full_i : in std_logic;
rtu_almost_full_i : in std_logic;
rtu_rq_strobe_p1_o : out std_logic;
rtu_rq_abort_o : out std_logic;
rtu_rq_smac_o : out std_logic_vector(48 - 1 downto 0);
rtu_rq_dmac_o : out std_logic_vector(48 - 1 downto 0);
rtu_rq_vid_o : out std_logic_vector(12 - 1 downto 0);
......
modules/wr_endpoint/ep_rtu_header_extract.vhd
View file @ 4d822eb6
......@@ -27,6 +27,7 @@ entity ep_rtu_header_extract is
rtu_rq_o : out t_ep_internal_rtu_request;
rtu_full_i : in std_logic;
rtu_rq_abort_o : out std_logic;
rtu_rq_valid_o : out std_logic
);
......@@ -36,9 +37,11 @@ architecture rtl of ep_rtu_header_extract is
signal hdr_offset : std_logic_vector(11 downto 0);
signal in_packet : std_logic;
signal in_header : std_logic;
signal rtu_rq_valid_basic : std_logic;
signal rtu_rq_valid_tagged : std_logic;
signal rtu_rq_valid_out : std_logic;
signal rtu_rq_abort : std_logic;
procedure f_extract_rtu(signal q : out std_logic_vector;
......@@ -75,11 +78,14 @@ begin -- rtl
in_packet <= '0';
rtu_rq_valid_basic<= '0';
rmon_drp_at_rtu_full_o <='0';
rtu_rq_abort <= '0';
in_header <= '0';
else
rmon_drp_at_rtu_full_o <='0';
if(snk_fab_i.sof = '1' and rtu_full_i = '0') then
in_packet <= '1';
in_header <= '1';
elsif(snk_fab_i.sof = '1' and rtu_full_i = '1') then
rmon_drp_at_rtu_full_o <='1';
end if;
......@@ -88,7 +94,12 @@ begin -- rtl
snk_fab_i.error = '1') then
in_packet <= '0';
end if;
if(snk_fab_i.error = '1' or rtu_rq_valid_out = '1') then
in_header <= '0';
end if;
f_extract_rtu(rtu_rq_o.dmac(47 downto 32), snk_fab_i, hdr_offset(0));
f_extract_rtu(rtu_rq_o.dmac(31 downto 16), snk_fab_i, hdr_offset(1));
f_extract_rtu(rtu_rq_o.dmac(15 downto 0), snk_fab_i, hdr_offset(2));
......@@ -107,10 +118,18 @@ begin -- rtl
rtu_rq_valid_basic <= '0';
end if;
if(in_packet = '1' and in_header = '0' and -- if we have packet and the header is already processed
snk_fab_i.error = '1' and rtu_rq_abort = '0') then
rtu_rq_abort <= '1';
else
rtu_rq_abort <= '0';
end if;
end if;
end if;
end process;
rtu_rq_abort_o <= rtu_rq_abort;
src_fab_o.sof <= snk_fab_i.sof and not rtu_full_i; -- null dev
rtu_rq_valid_tagged <= rtu_rq_valid_basic and vlan_tag_done_i;
......
modules/wr_endpoint/ep_rx_path.vhd
View file @ 4d822eb6
......@@ -104,6 +104,7 @@ entity ep_rx_path is
rtu_rq_o : out t_ep_internal_rtu_request;
rtu_full_i : in std_logic;
rtu_rq_valid_o : out std_logic;
rtu_rq_abort_o : out std_logic;
dbg_o : out std_logic_vector(29 downto 0)
);
end ep_rx_path;
......@@ -128,6 +129,7 @@ architecture behavioral of ep_rx_path is
rmon_drp_at_rtu_full_o: out std_logic;
rtu_rq_o : out t_ep_internal_rtu_request;
rtu_full_i : in std_logic;
rtu_rq_abort_o : out std_logic;
rtu_rq_valid_o : out std_logic);
end component;
......@@ -496,6 +498,7 @@ begin -- behavioral
rtu_rq_o => rtu_rq_o,
rtu_full_i => rtu_full_i,
rtu_rq_abort_o => rtu_rq_abort_o,
rtu_rq_valid_o => rtu_rq_valid);
gen_with_rx_buffer : if g_with_rx_buffer generate
......
modules/wr_endpoint/wr_endpoint.vhd
View file @ 4d822eb6
......@@ -192,6 +192,8 @@ entity wr_endpoint is
-- request strobe, single HI pulse begins evaluation of the request.
rtu_rq_strobe_p1_o : out std_logic;
rtu_rq_abort_o : out std_logic;
-- source and destination MAC addresses extracted from the packet header
rtu_rq_smac_o : out std_logic_vector(48 - 1 downto 0);
......@@ -389,6 +391,7 @@ architecture syn of wr_endpoint is
rtu_rq_o : out t_ep_internal_rtu_request;
rtu_full_i : in std_logic;
rtu_rq_valid_o : out std_logic;
rtu_rq_abort_o : out std_logic;
dbg_o : out std_logic_vector(29 downto 0));
end component;
......@@ -797,6 +800,7 @@ begin
rtu_full_i => rtu_full_i,
rtu_rq_o => rtu_rq,
rtu_rq_valid_o => rtu_rq_strobe_p1_o,
rtu_rq_abort_o => rtu_rq_abort_o,
src_wb_o => src_out,
src_wb_i => src_in,
dbg_o => dbg_o(29 downto 0)
......
modules/wr_endpoint/xwr_endpoint.vhd
View file @ 4d822eb6
......@@ -166,6 +166,7 @@ entity xwr_endpoint is
-- request strobe, single HI pulse begins evaluation of the request.
rtu_rq_strobe_p1_o : out std_logic;
rtu_rq_abort_o : out std_logic;
-- source and destination MAC addresses extracted from the packet header
rtu_rq_smac_o : out std_logic_vector(48 - 1 downto 0);
......@@ -330,6 +331,7 @@ begin
rtu_full_i => rtu_full_i,
rtu_almost_full_i => rtu_almost_full_i,
rtu_rq_strobe_p1_o => rtu_rq_strobe_p1_o,
rtu_rq_abort_o => rtu_rq_abort_o,
rtu_rq_smac_o => rtu_rq_smac_o,
rtu_rq_dmac_o => rtu_rq_dmac_o,
rtu_rq_vid_o => rtu_rq_vid_o,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment