From 09a5318523d1a40e2396ffac8f1376d385ee2d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20=C3=96rtenberg?= Date: Fri, 23 May 2025 15:35:41 +0200 Subject: [PATCH] cleanup: made manager address be kept in one variable (io pipelined access to ganimede isn't likely) --- src/socbridge/socbridge_driver.vhd | 35 +++++++++++++------------- src/socbridge/socbridge_driver_pkg.vhd | 3 +-- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/socbridge/socbridge_driver.vhd b/src/socbridge/socbridge_driver.vhd index 8d83b67..9fdcfb0 100644 --- a/src/socbridge/socbridge_driver.vhd +++ b/src/socbridge/socbridge_driver.vhd @@ -287,17 +287,17 @@ begin when RX_W_BODY => if st.rx_stage mod 4 = 0 and st.rx_stage /= st.rx_data_size then socbridge_driver_to_manager.data <= st.curr_write_data; - socbridge_driver_to_manager.address <= st.curr_rx_write_addr; + socbridge_driver_to_manager.address <= st.manager_addr; socbridge_driver_to_manager.valid <= '1'; end if; when RX_R_BODY => when RX_AWAIT => if st.curr_rx_transaction = WRITE or st.curr_rx_transaction = WRITE_ADD then socbridge_driver_to_manager.data <= st.curr_write_data; - socbridge_driver_to_manager.address <= st.curr_rx_write_addr; + socbridge_driver_to_manager.address <= st.manager_addr; socbridge_driver_to_manager.valid <= '1'; else - socbridge_driver_to_manager.address <= st.curr_rx_read_addr; + socbridge_driver_to_manager.address <= st.manager_addr; end if; when ADDR1 => when ADDR2 => @@ -438,8 +438,7 @@ begin st.curr_rx_transaction <= NO_OP; st.tx_data_size <= 0; st.rx_data_size <= 0; - st.curr_rx_read_addr <= (others => '0'); - st.curr_rx_write_addr <= (others => '0'); + st.manager_addr <= (others => '0'); st.curr_write_data <= (others => '0'); st.curr_read_data <= (others => '0'); socbridge_driver_to_ip.data <= (others => '0'); @@ -450,8 +449,8 @@ begin elsif(rising_edge(ext_to_socbridge_driver_rec.clk)) then st.ext_to_socbridge_driver_reg.data <= ext_to_socbridge_driver_rec.data; - st.ext_to_socbridge_driver_reg.clk <= ext_to_socbridge_driver_rec.clk; - st.ext_to_socbridge_driver_reg.parity <= ext_to_socbridge_driver_rec.parity; + -- PARITY CHECK NOT IMPLEMENTED, REMOVING + --st.ext_to_socbridge_driver_reg.parity <= ext_to_socbridge_driver_rec.parity; st.socbridge_driver_to_ext_reg.data <= next_data_out; st.socbridge_driver_to_ext_reg.clk <= not st.socbridge_driver_to_ext_reg.clk; st.socbridge_driver_to_ext_reg.parity <= next_parity_out; @@ -558,41 +557,41 @@ begin st.curr_write_data((((st.rx_stage - 1) mod 4) + 1) * 8 - 1 downto ((((st.rx_stage - 1) mod 4) + 1) - 1) * 8) <= st.ext_to_socbridge_driver_reg.data; end if; if (st.rx_stage - 2) mod 4 = 0 and st.rx_data_size - st.rx_stage > 4 then - st.curr_rx_write_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.curr_rx_write_addr) + 4), 32)); + st.manager_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.manager_addr) + 4), 32)); end if; when RX_AWAIT => st.curr_read_data <= manager_to_socbridge_driver.data; -- THIS DOESN'T WORK FOR LARGER THAN 4 BYTE ACCESSES, SHOULD BE FIXED BUT NOT NEEDED IF ONLY 4 BYTE ACCESSES ARRIVE if st.curr_tx_transaction = READ_RESPONSE or st.curr_tx_transaction = WRITE_ACK then if (st.curr_rx_transaction = READ or st.curr_rx_transaction = READ_ADD) and (st.tx_stage - 2) mod 4 = 0 then - st.curr_rx_read_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.curr_rx_read_addr) + 4), 32)); + st.manager_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.manager_addr) + 4), 32)); elsif (st.curr_rx_transaction = WRITE or st.curr_rx_transaction = WRITE_ADD) and (st.rx_stage - 2) mod 4 = 0 then - st.curr_rx_write_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.curr_rx_write_addr) + 4), 32)); + st.manager_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.manager_addr) + 4), 32)); end if; end if; when ADDR1 => if st.curr_rx_transaction = READ_ADD then - st.curr_rx_read_addr(31 downto 24) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(31 downto 24) <= st.ext_to_socbridge_driver_reg.data; else - st.curr_rx_write_addr(31 downto 24) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(31 downto 24) <= st.ext_to_socbridge_driver_reg.data; end if; when ADDR2 => if st.curr_rx_transaction = READ_ADD then - st.curr_rx_read_addr(23 downto 16) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(23 downto 16) <= st.ext_to_socbridge_driver_reg.data; else - st.curr_rx_write_addr(23 downto 16) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(23 downto 16) <= st.ext_to_socbridge_driver_reg.data; end if; when ADDR3 => if st.curr_rx_transaction = READ_ADD then - st.curr_rx_read_addr(15 downto 8) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(15 downto 8) <= st.ext_to_socbridge_driver_reg.data; else - st.curr_rx_write_addr(15 downto 8) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(15 downto 8) <= st.ext_to_socbridge_driver_reg.data; end if; when ADDR4 => if st.curr_rx_transaction = READ_ADD then - st.curr_rx_read_addr(7 downto 0) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(7 downto 0) <= st.ext_to_socbridge_driver_reg.data; else - st.curr_rx_write_addr(7 downto 0) <= st.ext_to_socbridge_driver_reg.data; + st.manager_addr(7 downto 0) <= st.ext_to_socbridge_driver_reg.data; end if; when others => end case; diff --git a/src/socbridge/socbridge_driver_pkg.vhd b/src/socbridge/socbridge_driver_pkg.vhd index 2026aba..2e712e4 100644 --- a/src/socbridge/socbridge_driver_pkg.vhd +++ b/src/socbridge/socbridge_driver_pkg.vhd @@ -51,8 +51,7 @@ package socbridge_driver_pkg is curr_write_data : std_logic_vector(31 downto 0); curr_read_data : std_logic_vector(31 downto 0); curr_tx_addr : std_logic_vector(31 downto 0); - curr_rx_read_addr : std_logic_vector(31 downto 0); - curr_rx_write_addr : std_logic_vector(31 downto 0); + manager_addr : std_logic_vector(31 downto 0); read_in_flight : boolean; write_in_flight : boolean; last_sent_transaction : transaction_t;