Skip to content

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

swcore: little cleanup

parent a68d4d2b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 32 deletions
modules/wrsw_swcore/mpm/mpm_rpath_io_block.vhd
View file @ 95d3a332
......@@ -283,8 +283,6 @@ begin -- behavioral
end if;
-----
words_xmitted <= to_unsigned(1, words_xmitted'length);
-- ML
-- last_int <= '0';
d_counter_equal <= '0';
else
if(df_rd_int = '1') then
......@@ -292,8 +290,6 @@ begin -- behavioral
end if;
if(fetch_ack = '1' and pre_fetch = '0') then
--if(fetch_valid = '1') then
--if(fetch_first = '1') then -- ML : prefetching
if(fetch_first = '1' ) then
words_total <= resize(fetch_pg_words, words_total'length);
else
......@@ -301,10 +297,7 @@ begin -- behavioral
end if;
end if;
-- ML:
-- last_int <= counters_equal;
d_counter_equal <= counters_equal;
---------
end if;
end if;
end process;
......@@ -390,22 +383,6 @@ begin -- behavioral
end if;
end process;
-- p_delay_pg_req : process(clk_io_i)
-- begin
-- if rising_edge(clk_io_i) then
-- if rst_n_io_i = '0' then
-- allow_rport_pg_req <= '0';
-- else
-- if(words_xmitted >= last_pg_start_ptr ) then
-- allow_rport_pg_req <='1';
-- elsif(page_state = NEXT_LINK ) then
-- allow_rport_pg_req <='0';
-- end if;
--
-- end if;
-- end if;
-- end process;
p_page_fsm : process(clk_io_i)
begin
if rising_edge(clk_io_i) then
......@@ -498,10 +475,11 @@ begin -- behavioral
when WAIT_ACK =>
if(fetch_ack = '1') then
--ll_req_int <= '1';
fetch_first <= '0';
fvalid_int <= '0';
if(pre_fetch = '1' and last_int = '0') then
-- this is the situation when we passed first page to FBM, but
-- the previous frame is still being transmitted to OB
ll_req_int <= '0';
page_state <= NASTY_WAIT;
else
......@@ -512,12 +490,6 @@ begin -- behavioral
when WAIT_LAST_ACK =>
if(fetch_ack = '1') then
-- if(words_xmitted >= last_pg_start_ptr) then -- ML: to delay req -- only during last page
-- rport_pg_req <= '1';
-- else
-- rport_pg_req <= '0';
-- end if;
fetch_first <= '0';
fvalid_int <= '0';
page_state <= FIRST_PAGE;
......
modules/wrsw_swcore/swc_pck_pg_free_module.vhd
View file @ 95d3a332
......@@ -274,10 +274,10 @@ fsm_force_free : process(clk_i, rst_n_i)
freeing_mode <= fifo_data_out(g_page_addr_width + 2 - 1 downto g_page_addr_width);
current_page <= fifo_data_out(g_page_addr_width - 1 downto 0);
if(fifo_data_out(g_page_addr_width + 2 - 1 downto g_page_addr_width) = b"01") then -- standard free
if(fifo_data_out(g_page_addr_width + 2 - 1 downto g_page_addr_width) = b"01") then -- force free
state <= S_FORCE_FREE_CURRENT_PAGE_ADDR;
mmu_force_free <= '1';
elsif(fifo_data_out(g_page_addr_width + 2 - 1 downto g_page_addr_width) = b"10") then -- forced free
elsif(fifo_data_out(g_page_addr_width + 2 - 1 downto g_page_addr_width) = b"10") then -- standard free
state <= S_FREE_CURRENT_PAGE_ADDR;
mmu_free <= '1';
else
......
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