kryddan/exjobb-public
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kryddan:1146970be57a3e18e05f6d10eb55ea834abf49e5
Branches Tags
kryddan:main
kryddan:ganimede-space-optimized
kryddan:ganimede-single-issue
kryddan:ganimede-multipacket
kryddan:ganimede-rework
kryddan:management-unit
kryddan:ganimede
kryddan:scripts
kryddan:admin
kryddan:v1.0.0
..
compare: kryddan:4e4853c540f829ce6f52a2e42d75f9ca9ad28cc2
Branches Tags
kryddan:ganimede-space-optimized
kryddan:ganimede-single-issue
kryddan:ganimede-multipacket
kryddan:ganimede-rework
kryddan:management-unit
kryddan:ganimede
kryddan:scripts
kryddan:admin
kryddan:main
kryddan:v1.0.0

2 Commits
1146970be5 ... 4e4853c540

Author SHA1 Message Date
Erik Örtenberg
4e4853c540 fixed bug which occurs due to socbridge not handling addresses seperately for read and writes 2025-05-22 23:48:49 +02:00
Erik Örtenberg
4682d19720 made reads not start if read buffer is too full 2025-05-22 23:33:54 +02:00
1 changed files with 13 additions and 4 deletions
Show Stats Expand all files Collapse all files

17
src/socbridge/socbridge_driver.vhd
View File

@ -13,7 +13,8 @@ use grlib.stdlib.all;
entity socbridge_driver is entity socbridge_driver is
generic( generic(
MAX_PKT_SIZE : integer range 1 to 128 := 8 MAX_PKT_SIZE : integer range 1 to 128 := 128;
BUFFER_SIZE : integer
); );
port( port(
clk : in std_logic; clk : in std_logic;
@ -341,7 +342,7 @@ begin
elsif st.curr_rx_transaction = READ or st.curr_rx_transaction = READ_ADD elsif st.curr_rx_transaction = READ or st.curr_rx_transaction = READ_ADD
or st.curr_rx_transaction = WRITE or st.curr_rx_transaction = WRITE_ADD then or st.curr_rx_transaction = WRITE or st.curr_rx_transaction = WRITE_ADD then
trans_read_next_state <= IDLE; trans_read_next_state <= IDLE;
elsif trans_st.read.curr_inst.request = '1' then elsif trans_st.read.curr_inst.request = '1' and BUFFER_SIZE - ip_to_socbridge_driver.read_fifo.used_slots > 2*MAX_PKT_SIZE then
trans_read_next_state <= SEND; trans_read_next_state <= SEND;
else else
trans_read_next_state <= IDLE; trans_read_next_state <= IDLE;
@ -362,7 +363,7 @@ begin
trans_read_next_state <= IDLE; trans_read_next_state <= IDLE;
elsif ip_to_socbridge_driver.flush = '1'and not st.read_in_flight then elsif ip_to_socbridge_driver.flush = '1'and not st.read_in_flight then
trans_read_next_state <= IDLE; trans_read_next_state <= IDLE;
elsif not st.read_in_flight then elsif not st.read_in_flight and BUFFER_SIZE - ip_to_socbridge_driver.read_fifo.used_slots > 2*MAX_PKT_SIZE then
trans_read_next_state <= SEND; trans_read_next_state <= SEND;
else else
trans_read_next_state <= AWAIT; trans_read_next_state <= AWAIT;
@ -393,7 +394,7 @@ begin
else else
next_tx_data_size <= 0; next_tx_data_size <= 0;
end if; end if;
elsif trans_st.write.curr_state = SEND then elsif trans_st.write.curr_state = SEND and not st.read_in_flight then
if trans_st.write.is_first_word = '1' then if trans_st.write.is_first_word = '1' then
local_next_tx_transaction := WRITE_ADD; local_next_tx_transaction := WRITE_ADD;
else else
@ -616,6 +617,14 @@ begin
end if; end if;
trans_st.write.is_first_word <= '1'; trans_st.write.is_first_word <= '1';
when SEND => when SEND =>
if trans_st.write.curr_inst.seq_mem_access_count mod 256 = 0 then
trans_st.write.is_first_word <= '1';
elsif st.last_sent_transaction = READ or st.last_sent_transaction = READ_ADD
or next_tx_transaction = READ or next_tx_transaction = READ_ADD then
trans_st.write.is_first_word <= '1';
else
trans_st.write.is_first_word <= '0';
end if;
when SEND_ACCEPTED => when SEND_ACCEPTED =>
trans_st.write.curr_inst.seq_mem_access_count <= trans_st.write.curr_inst.seq_mem_access_count - MAX_PKT_SIZE; trans_st.write.curr_inst.seq_mem_access_count <= trans_st.write.curr_inst.seq_mem_access_count - MAX_PKT_SIZE;
trans_st.write.curr_inst.address <= std_logic_vector(unsigned(trans_st.write.curr_inst.address) + MAX_PKT_SIZE); trans_st.write.curr_inst.address <= std_logic_vector(unsigned(trans_st.write.curr_inst.address) + MAX_PKT_SIZE);