Skip to content

W
White Rabbit Switch - Gateware
Commit 23e65dd4 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

wrsw_nic/nic_tx_fsm: native support of pipelined WB fabric 

Instead of old fabtic converted to Pipelined WB using ep_rx_wb_master
module from endpoint_private_pkg
parent 16e02069
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 122 deletions
modules/wrsw_nic/nic_tx_fsm.vhd
View file @ 23e65dd4
...@@ -27,13 +27,13 @@ use IEEE.NUMERIC_STD.all; ...@@ -27,13 +27,13 @@ use IEEE.NUMERIC_STD.all;
use work.nic_constants_pkg.all; use work.nic_constants_pkg.all;
use work.nic_descriptors_pkg.all; use work.nic_descriptors_pkg.all;
use work.wr_fabric_pkg.all; use work.wr_fabric_pkg.all;
use work.endpoint_private_pkg.all; -- dirty hack
use work.nic_wbgen2_pkg.all; use work.nic_wbgen2_pkg.all;
entity nic_tx_fsm is entity nic_tx_fsm is
generic( generic(
g_port_mask_bits : integer := 32); g_port_mask_bits : integer := 32;
g_cyc_on_stall : boolean := false);
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
rst_n_i : in std_logic; rst_n_i : in std_logic;
...@@ -110,18 +110,6 @@ architecture behavioral of nic_tx_fsm is ...@@ -110,18 +110,6 @@ architecture behavioral of nic_tx_fsm is
signal cur_tx_desc : t_tx_descriptor; signal cur_tx_desc : t_tx_descriptor;
component ep_rx_wb_master
generic (
g_ignore_ack : boolean);
port (
clk_sys_i : in std_logic;
rst_n_i : in std_logic;
snk_fab_i : in t_ep_internal_fabric;
snk_dreq_o : out std_logic;
src_wb_i : in t_wrf_source_in;
src_wb_o : out t_wrf_source_out);
end component;
function f_buf_swap_endian_32 function f_buf_swap_endian_32
( (
data : std_logic_vector(31 downto 0) data : std_logic_vector(31 downto 0)
...@@ -152,11 +140,12 @@ architecture behavioral of nic_tx_fsm is ...@@ -152,11 +140,12 @@ architecture behavioral of nic_tx_fsm is
signal rtu_valid_int : std_logic; signal rtu_valid_int : std_logic;
signal rtu_valid_int_d0 : std_logic; signal rtu_valid_int_d0 : std_logic;
signal fab_dreq : std_logic;
signal fab_out : t_ep_internal_fabric;
signal tx_err : std_logic; signal tx_err : std_logic;
signal default_status_reg : t_wrf_status_reg; signal default_status_reg : t_wrf_status_reg;
signal ack_count : unsigned(3 downto 0);
signal src_stb_int : std_logic;
begin -- behavioral begin -- behavioral
...@@ -173,19 +162,20 @@ begin -- behavioral ...@@ -173,19 +162,20 @@ begin -- behavioral
tx_cntr_expired <= '1' when (tx_remaining = 0) else '0'; tx_cntr_expired <= '1' when (tx_remaining = 0) else '0';
txdesc_new_o <= cur_tx_desc; txdesc_new_o <= cur_tx_desc;
src_o.stb <= src_stb_int;
count_acks: process(clk_sys_i)
U_WB_Master : ep_rx_wb_master begin
generic map( if rising_edge(clk_sys_i) then
g_ignore_ack => true) if(rst_n_i='0') then
port map ( ack_count <= (others=>'0');
clk_sys_i => clk_sys_i, elsif(src_stb_int = '1' and src_i.stall = '0' and src_i.ack = '0') then
rst_n_i => rst_n_i, ack_count <= ack_count + 1;
snk_fab_i => fab_out, elsif(src_i.ack = '1' and not(src_stb_int = '1' and src_i.stall = '0')) then
snk_dreq_o => fab_dreq, ack_count <= ack_count - 1;
src_wb_i => src_i, end if;
src_wb_o => src_o); end if;
end process;
p_gen_tcomp_irq : process(clk_sys_i, rst_n_i) p_gen_tcomp_irq : process(clk_sys_i, rst_n_i)
begin begin
...@@ -231,13 +221,12 @@ begin -- behavioral ...@@ -231,13 +221,12 @@ begin -- behavioral
txdesc_write_o <= '0'; txdesc_write_o <= '0';
txdesc_reload_current_o <= '0'; txdesc_reload_current_o <= '0';
fab_out.sof <= '0'; src_o.cyc <= '0';
fab_out.eof <= '0'; src_stb_int <= '0';
fab_out.dvalid <= '0'; src_o.we <= '1';
fab_out.bytesel <= '0'; src_o.adr <= (others => '0');
fab_out.data <= (others => '0'); src_o.dat <= (others => '0');
fab_out.addr <= (others => '0'); src_o.sel <= (others => '0');
fab_out.error <= '0';
tx_done <= '0'; tx_done <= '0';
rtu_valid_int <= '0'; rtu_valid_int <= '0';
...@@ -290,9 +279,11 @@ begin -- behavioral ...@@ -290,9 +279,11 @@ begin -- behavioral
rtu_valid_int <= '1'; rtu_valid_int <= '1';
-- check if the memory is ready, read the 1st word of the payload -- check if the memory is ready, read the 1st word of the payload
if(fab_dreq = '1' and buf_grant_i = '0') then if( ( (src_i.stall = '0' and g_cyc_on_stall = false) or g_cyc_on_stall = true)
and buf_grant_i = '0') then
tx_data_reg <= buf_data_i; tx_data_reg <= buf_data_i;
fab_out.sof <= '1'; src_o.cyc <= '1';
tx_buf_addr <= tx_buf_addr + 1; tx_buf_addr <= tx_buf_addr + 1;
ignore_first_hword <= '1'; ignore_first_hword <= '1';
...@@ -314,15 +305,15 @@ begin -- behavioral ...@@ -314,15 +305,15 @@ begin -- behavioral
end if; end if;
when TX_STATUS => when TX_STATUS =>
fab_out.sof <= '0'; src_o.adr <= c_WRF_STATUS;
src_o.sel <= "11";
src_o.dat <= f_marshall_wrf_status(default_status_reg);
if(fab_dreq = '1' and buf_grant_i = '0') then if( src_i.stall = '0' and buf_grant_i = '0') then
fab_out.dvalid <= '1'; src_stb_int <= '1';
fab_out.addr <= c_WRF_STATUS; state <= TX_HWORD;
fab_out.data <= f_marshall_wrf_status(default_status_reg); else
state <= TX_HWORD; src_stb_int <= '0';
else
fab_out.dvalid <= '0';
end if; end if;
when TX_HWORD => when TX_HWORD =>
...@@ -330,15 +321,20 @@ begin -- behavioral ...@@ -330,15 +321,20 @@ begin -- behavioral
-- generate the control value depending on the packet type, OOB and the current -- generate the control value depending on the packet type, OOB and the current
-- transmission offset. -- transmission offset.
fab_out.addr <= c_WRF_DATA;
fab_out.data <= tx_data_reg(31 downto 16);
if(tx_err = '1') then if(tx_err = '1') then
state <= TX_UPDATE_DESCRIPTOR; state <= TX_UPDATE_DESCRIPTOR;
cur_tx_desc.error <= '1'; cur_tx_desc.error <= '1';
elsif(fab_dreq = '1') then elsif( src_i.stall = '0' ) then
src_o.adr <= c_WRF_DATA;
src_o.dat <= tx_data_reg(31 downto 16);
ignore_first_hword <= '0';
src_stb_int <= not ignore_first_hword;
if(tx_cntr_expired = '1') then if(tx_cntr_expired = '1') then
fab_out.bytesel <= odd_length and (not needs_padding); -- we are at the end of transmitted frame
src_o.sel(1) <= '1';
src_o.sel(0) <= (not odd_length) or needs_padding;
if(needs_padding = '1' and padding_size /= 0) then if(needs_padding = '1' and padding_size /= 0) then
state <= TX_PAD; state <= TX_PAD;
...@@ -347,70 +343,52 @@ begin -- behavioral ...@@ -347,70 +343,52 @@ begin -- behavioral
else else
state <= TX_END_PACKET; state <= TX_END_PACKET;
end if; end if;
fab_out.dvalid <= '1';
else else
src_o.sel <= "11";
if(ignore_first_hword = '1') then tx_remaining <= tx_remaining - 1;
ignore_first_hword <= '0';
fab_out.dvalid <= '0';
tx_remaining <= tx_remaining - 1;
else
fab_out.dvalid <= '1';
tx_remaining <= tx_remaining - 1;
end if;
state <= TX_LWORD; state <= TX_LWORD;
end if; end if;
else
fab_out.dvalid <= '0';
end if; end if;
fab_out.sof <= '0';
-- check for errors
when TX_LWORD => when TX_LWORD =>
fab_out.addr <= c_WRF_DATA;
fab_out.data <= tx_data_reg (15 downto 0);
-- the TX fabric is ready, the memory is ready and we haven't reached the end -- the TX fabric is ready, the memory is ready and we haven't reached the end
-- of the packet yet: -- of the packet yet:
if(tx_err = '1') then if(tx_err = '1') then
state <= TX_UPDATE_DESCRIPTOR; state <= TX_UPDATE_DESCRIPTOR;
cur_tx_desc.error <= '1'; cur_tx_desc.error <= '1';
elsif(fab_dreq = '1' and buf_grant_i = '0') then elsif( src_i.stall='0' and buf_grant_i = '0') then
if(tx_cntr_expired = '0') then src_o.adr <= c_WRF_DATA;
fab_out.dvalid <= '1'; src_o.dat <= tx_data_reg(15 downto 0);
src_stb_int <= '1';
tx_data_reg <= f_buf_swap_endian_32(buf_data_i);
if(tx_cntr_expired = '0') then
src_o.sel <= "11";
tx_remaining <= tx_remaining - 1; tx_remaining <= tx_remaining - 1;
tx_buf_addr <= tx_buf_addr + 1;
state <= TX_HWORD; state <= TX_HWORD;
tx_data_reg <= f_buf_swap_endian_32(buf_data_i);
tx_buf_addr <= tx_buf_addr + 1;
-- We're at the end of the packet. Generate an end-of-packet condition on the -- We're at the end of the packet. Generate an end-of-packet condition on the
-- fabric I/F -- fabric I/F
else else
-- (tx_cntr_expired=1) we are at the end of transmitted frame
fab_out.bytesel <= odd_length and (not needs_padding); src_o.sel(1) <= '1';
fab_out.dvalid <= '1'; src_o.sel(0) <= (not odd_length) or needs_padding;
if(needs_padding = '1' and padding_size /= 0) then if(needs_padding = '1' and padding_size /= 0) then
state <= TX_PAD; state <= TX_PAD;
elsif(cur_tx_desc.ts_e = '1') then elsif(cur_tx_desc.ts_e = '1') then
state <= TX_OOB1; state <= TX_OOB1;
else else
state <= TX_END_PACKET; state <= TX_END_PACKET;
fab_out.eof <= '0';
end if; end if;
end if; end if;
else
-- the fabric is not ready, don't send anything elsif( src_i.stall='0' and buf_grant_i = '1') then
fab_out.dvalid <= '0'; --if we wait for buffer then drop stb so that we don't retransmit last data word
src_stb_int <= '0';
end if; end if;
when TX_PAD => when TX_PAD =>
...@@ -418,60 +396,55 @@ begin -- behavioral ...@@ -418,60 +396,55 @@ begin -- behavioral
if(tx_err = '1') then if(tx_err = '1') then
state <= TX_UPDATE_DESCRIPTOR; state <= TX_UPDATE_DESCRIPTOR;
cur_tx_desc.error <= '1'; cur_tx_desc.error <= '1';
elsif(fab_dreq = '1') then elsif( src_i.stall='0' ) then
fab_out.data <= x"0000"; src_o.dat <= x"0000";
fab_out.addr <= c_WRF_DATA; src_o.adr <= c_WRF_DATA;
fab_out.dvalid <= '1'; src_o.sel <= "11";
src_stb_int <= '1';
padding_size <= padding_size - 1; padding_size <= padding_size - 1;
if(padding_size = 0) then if(padding_size = 0) then
fab_out.dvalid <= '0'; src_stb_int <= '0';
if(cur_tx_desc.ts_e = '1')then if(cur_tx_desc.ts_e = '1') then
state <= TX_OOB1; state <= TX_OOB1;
else else
fab_out.eof <= '0'; state <= TX_END_PACKET;
state <= TX_END_PACKET;
end if; end if;
end if; end if;
else
fab_out.dvalid <= '0';
end if; end if;
when TX_OOB1 => when TX_OOB1 =>
fab_out.bytesel <= '0'; src_o.sel <= "11";
if(fab_dreq = '1') then if( src_i.stall='0' ) then
fab_out.data <= c_WRF_OOB_TYPE_TX & x"000"; src_o.dat <= c_WRF_OOB_TYPE_TX & x"000";
fab_out.addr <= c_WRF_OOB; src_o.adr <= c_WRF_OOB;
fab_out.dvalid <= '1'; src_stb_int <= '1';
fab_out.eof <= '0'; state <= TX_OOB2;
state <= TX_OOB2;
end if; end if;
when TX_OOB2 => when TX_OOB2 =>
fab_out.bytesel <= '0'; src_o.sel <= "11";
if(fab_dreq = '1') then if( src_i.stall='0' ) then
fab_out.data <= cur_tx_desc.ts_id; src_o.dat <= cur_tx_desc.ts_id;
fab_out.addr <= c_WRF_OOB; src_o.adr <= c_WRF_OOB;
fab_out.dvalid <= '1'; src_stb_int <= '1';
fab_out.eof <= '0'; state <= TX_END_PACKET;
state <= TX_END_PACKET;
end if; end if;
when TX_END_PACKET => when TX_END_PACKET =>
fab_out.dvalid <= '0'; src_stb_int <= '0';
fab_out.bytesel <= '0'; src_o.sel <= "11";
if(fab_dreq = '1') then if( src_i.stall='0' and ack_count = 0) then
fab_out.eof <= '1'; state <= TX_UPDATE_DESCRIPTOR;
state <= TX_UPDATE_DESCRIPTOR;
end if; end if;
when TX_UPDATE_DESCRIPTOR => when TX_UPDATE_DESCRIPTOR =>
fab_out.eof <= '0'; src_o.cyc <= '0';
txdesc_write_o <= '1'; txdesc_write_o <= '1';
txdesc_reload_current_o <= cur_tx_desc.error; txdesc_reload_current_o <= cur_tx_desc.error;
cur_tx_desc.ready <= '0'; cur_tx_desc.ready <= '0';
...@@ -490,7 +463,6 @@ begin -- behavioral ...@@ -490,7 +463,6 @@ begin -- behavioral
if(irq_txerr_mask_i = '1') then -- clear the error status in if(irq_txerr_mask_i = '1') then -- clear the error status in
-- interrupt-driver mode -- interrupt-driver mode
irq_txerr_o <= '1'; irq_txerr_o <= '1';
if(irq_txerr_ack_i = '1') then if(irq_txerr_ack_i = '1') then
irq_txerr_o <= '0'; irq_txerr_o <= '0';
...@@ -499,7 +471,6 @@ begin -- behavioral ...@@ -499,7 +471,6 @@ begin -- behavioral
end if; end if;
regs_o.sr_tx_error_i <= '1'; regs_o.sr_tx_error_i <= '1';
if(regs_i.sr_tx_error_o = '1' and regs_i.sr_tx_error_load_o = '1') then -- if(regs_i.sr_tx_error_o = '1' and regs_i.sr_tx_error_load_o = '1') then --
-- or in status register mode -- or in status register mode
irq_txerr_o <= '0'; irq_txerr_o <= '0';
......
modules/wrsw_nic/wrsw_nic.vhd
View file @ 23e65dd4
...@@ -11,6 +11,7 @@ entity wrsw_nic is ...@@ -11,6 +11,7 @@ entity wrsw_nic is
( (
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_src_cyc_on_stall : boolean := false;
g_port_mask_bits : integer := 32); --should be num_ports+1 g_port_mask_bits : integer := 32); --should be num_ports+1
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
...@@ -77,6 +78,7 @@ architecture rtl of wrsw_nic is ...@@ -77,6 +78,7 @@ architecture rtl of wrsw_nic is
generic ( generic (
g_interface_mode : t_wishbone_interface_mode; g_interface_mode : t_wishbone_interface_mode;
g_address_granularity : t_wishbone_address_granularity; g_address_granularity : t_wishbone_address_granularity;
g_src_cyc_on_stall : boolean := false;
g_port_mask_bits : integer := 32); g_port_mask_bits : integer := 32);
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
...@@ -110,6 +112,7 @@ begin ...@@ -110,6 +112,7 @@ begin
generic map ( generic map (
g_interface_mode => g_interface_mode, g_interface_mode => g_interface_mode,
g_address_granularity => g_address_granularity, g_address_granularity => g_address_granularity,
g_src_cyc_on_stall => g_src_cyc_on_stall,
g_port_mask_bits => g_port_mask_bits) g_port_mask_bits => g_port_mask_bits)
port map ( port map (
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
......
modules/wrsw_nic/xwrsw_nic.vhd
View file @ 23e65dd4
...@@ -17,6 +17,7 @@ entity xwrsw_nic is ...@@ -17,6 +17,7 @@ entity xwrsw_nic is
( (
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_src_cyc_on_stall : boolean := false;
g_port_mask_bits : integer := 32); --should be num_ports+1 g_port_mask_bits : integer := 32); --should be num_ports+1
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
...@@ -163,7 +164,8 @@ architecture rtl of xwrsw_nic is ...@@ -163,7 +164,8 @@ architecture rtl of xwrsw_nic is
component nic_tx_fsm component nic_tx_fsm
generic( generic(
g_port_mask_bits : integer := 32); g_port_mask_bits : integer := 32;
g_cyc_on_stall : boolean := false);
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
rst_n_i : in std_logic; rst_n_i : in std_logic;
...@@ -495,6 +497,7 @@ begin -- rtl ...@@ -495,6 +497,7 @@ begin -- rtl
U_TX_FSM : nic_tx_fsm U_TX_FSM : nic_tx_fsm
generic map( generic map(
g_cyc_on_stall => g_src_cyc_on_stall,
g_port_mask_bits => g_port_mask_bits) g_port_mask_bits => g_port_mask_bits)
port map ( port map (
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
......
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