Skip to content

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

wrsw_nic: count acks only when frame is being sent 

Otherwise, counter gets crazy when watchdog resets the swcore and feeds all the
endpoints and NIC with ack=1.
parent 09e4d489
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
modules/wrsw_nic/nic_tx_fsm.vhd
View file @ 76cc74b7
...@@ -161,6 +161,7 @@ architecture behavioral of nic_tx_fsm is ...@@ -161,6 +161,7 @@ architecture behavioral of nic_tx_fsm is
signal ack_count : unsigned(3 downto 0); signal ack_count : unsigned(3 downto 0);
signal src_stb_int : std_logic; signal src_stb_int : std_logic;
signal ackcnt_nrst : std_logic;
begin -- behavioral begin -- behavioral
...@@ -188,7 +189,7 @@ begin -- behavioral ...@@ -188,7 +189,7 @@ begin -- behavioral
count_acks: process(clk_sys_i) count_acks: process(clk_sys_i)
begin begin
if rising_edge(clk_sys_i) then if rising_edge(clk_sys_i) then
if(rst_n_i='0') then if(rst_n_i='0' or ackcnt_nrst='0') then
ack_count <= (others=>'0'); ack_count <= (others=>'0');
elsif(src_stb_int = '1' and src_i.stall = '0' and src_i.ack = '0') then elsif(src_stb_int = '1' and src_i.stall = '0' and src_i.ack = '0') then
ack_count <= ack_count + 1; ack_count <= ack_count + 1;
...@@ -260,6 +261,7 @@ begin -- behavioral ...@@ -260,6 +261,7 @@ begin -- behavioral
regs_o.sr_tx_error_i <= '0'; regs_o.sr_tx_error_i <= '0';
irq_txerr_o <= '0'; irq_txerr_o <= '0';
txdesc_request_next_o <= '0'; txdesc_request_next_o <= '0';
ackcnt_nrst <= '0';
if(regs_i.cr_tx_en_o = '1') then if(regs_i.cr_tx_en_o = '1') then
state <= TX_REQUEST_DESCRIPTOR; state <= TX_REQUEST_DESCRIPTOR;
...@@ -268,6 +270,7 @@ begin -- behavioral ...@@ -268,6 +270,7 @@ begin -- behavioral
when TX_REQUEST_DESCRIPTOR => when TX_REQUEST_DESCRIPTOR =>
tx_done <= '0'; tx_done <= '0';
txdesc_request_next_o <= '1'; txdesc_request_next_o <= '1';
ackcnt_nrst <= '0';
if(txdesc_grant_i = '1') then if(txdesc_grant_i = '1') then
cur_tx_desc <= txdesc_current_i; cur_tx_desc <= txdesc_current_i;
...@@ -281,6 +284,7 @@ begin -- behavioral ...@@ -281,6 +284,7 @@ begin -- behavioral
-- read from the buffer -- read from the buffer
when TX_MEM_FETCH => when TX_MEM_FETCH =>
txdesc_request_next_o <= '0'; txdesc_request_next_o <= '0';
ackcnt_nrst <= '0';
if(txdesc_current_i.len(0) = '1') then if(txdesc_current_i.len(0) = '1') then
tx_remaining <= tx_remaining + 1; tx_remaining <= tx_remaining + 1;
end if; end if;
...@@ -289,6 +293,7 @@ begin -- behavioral ...@@ -289,6 +293,7 @@ begin -- behavioral
when TX_START_PACKET => when TX_START_PACKET =>
regs_o.sr_tx_error_i <= '0'; regs_o.sr_tx_error_i <= '0';
ackcnt_nrst <= '0';
rtu_valid_int <= '1'; rtu_valid_int <= '1';
ignore_first_hword <= '1'; ignore_first_hword <= '1';
...@@ -309,6 +314,7 @@ begin -- behavioral ...@@ -309,6 +314,7 @@ begin -- behavioral
end if; end if;
when TX_STATUS => when TX_STATUS =>
ackcnt_nrst <= '1';
src_o.adr <= c_WRF_STATUS; src_o.adr <= c_WRF_STATUS;
src_o.sel <= "11"; src_o.sel <= "11";
src_o.dat <= f_marshall_wrf_status(default_status_reg); src_o.dat <= f_marshall_wrf_status(default_status_reg);
...@@ -448,6 +454,7 @@ begin -- behavioral ...@@ -448,6 +454,7 @@ begin -- behavioral
if( src_i.stall='0' and ack_count = 0) then if( src_i.stall='0' and ack_count = 0) then
state <= TX_UPDATE_DESCRIPTOR; state <= TX_UPDATE_DESCRIPTOR;
ackcnt_nrst <= '0';
end if; end if;
when TX_UPDATE_DESCRIPTOR => when TX_UPDATE_DESCRIPTOR =>
......
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