Skip to content

V
VME64x core
Commit ad09b2d6 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

simple_tb: implement read32 and factorize code.

parent 3ca2a843
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 51 deletions
hdl/vme64x-core/rtl/VME_bus.vhd
View file @ ad09b2d6
...@@ -176,7 +176,7 @@ architecture RTL of VME_bus is ...@@ -176,7 +176,7 @@ architecture RTL of VME_bus is
-- Reformat address according to AM. -- Reformat address according to AM.
REFORMAT_ADDRESS, REFORMAT_ADDRESS,
-- Decoding ADDR and AM (selecting card or conf). -- Decoding ADDR and AM (selecting card or conf).
DECODE_ACCESS_0, DECODE_ACCESS_0,
DECODE_ACCESS_1, DECODE_ACCESS_1,
...@@ -245,7 +245,7 @@ architecture RTL of VME_bus is ...@@ -245,7 +245,7 @@ architecture RTL of VME_bus is
signal s_BERR_out : std_logic; signal s_BERR_out : std_logic;
signal s_sw_reset : std_logic; signal s_sw_reset : std_logic;
-- Set on the cycle to decode access (ADDR + AM) -- Set on the cycle to decode access (ADDR + AM)
signal s_decode : std_logic; signal s_decode : std_logic;
signal s_AckWb : std_logic; signal s_AckWb : std_logic;
...@@ -311,14 +311,14 @@ begin ...@@ -311,14 +311,14 @@ begin
-- | | | | BYTE 0 | BYTE 1 | BYTE 2 | BYTE 3 -- | | | | BYTE 0 | BYTE 1 | BYTE 2 | BYTE 3
-- BYTE 0 | BYTE 1 | BYTE 2 | BYTE 3 | BYTE 4 | BYTE 5 | BYTE 6 | BYTE 7 -- BYTE 0 | BYTE 1 | BYTE 2 | BYTE 3 | BYTE 4 | BYTE 5 | BYTE 6 | BYTE 7
with s_typeOfDataTransferSelect select s_typeOfDataTransfer <= with s_typeOfDataTransferSelect select s_typeOfDataTransfer <=
D08_0 when "01010" | "01011", D08_0 when b"01_010" | b"01_011",
D08_1 when "10010" | "10011", D08_1 when b"10_010" | b"10_011",
D08_2 when "01110" | "01111", D08_2 when b"01_110" | b"01_111",
D08_3 when "10110" | "10111", D08_3 when b"10_110" | b"10_111",
D16_01 when "00010" | "00011", D16_01 when b"00_010" | b"00_011",
D16_23 when "00110" | "00111", D16_23 when b"00_110" | b"00_111",
D32 when "00001", D32 when b"00_001",
D64 when "00000", D64 when b"00_000",
TypeError when others; TypeError when others;
-- Shift data when DS=01 and LWORD=1 -- Shift data when DS=01 and LWORD=1
...@@ -381,7 +381,7 @@ begin ...@@ -381,7 +381,7 @@ begin
s_retry <= '0'; s_retry <= '0';
s_BERR_out <= '0'; s_BERR_out <= '0';
s_mainFSMstate <= IDLE; s_mainFSMstate <= IDLE;
s_VMEaddrLatched <= (others => '0'); s_VMEaddrLatched <= (others => '0');
s_LWORDlatched <= '0'; s_LWORDlatched <= '0';
s_AMlatched <= (others => '0'); s_AMlatched <= (others => '0');
...@@ -414,7 +414,7 @@ begin ...@@ -414,7 +414,7 @@ begin
if VME_AS_n_i = '0' and VME_IACK_n_i = '1' then if VME_AS_n_i = '0' and VME_IACK_n_i = '1' then
-- if AS falling edge --> start access -- if AS falling edge --> start access
s_mainFSMstate <= REFORMAT_ADDRESS; s_mainFSMstate <= REFORMAT_ADDRESS;
-- Store ADDR, AM and LWORD -- Store ADDR, AM and LWORD
s_VMEaddrLatched <= VME_DATA_i & VME_ADDR_i; s_VMEaddrLatched <= VME_DATA_i & VME_ADDR_i;
s_LWORDlatched <= VME_LWORD_n_i; s_LWORDlatched <= VME_LWORD_n_i;
...@@ -490,7 +490,7 @@ begin ...@@ -490,7 +490,7 @@ begin
s_transferActive <= '1'; s_transferActive <= '1';
if s_DS_latch_count = 0 then if s_DS_latch_count = 0 then
s_mainFSMstate <= CHECK_TRANSFER_TYPE; s_mainFSMstate <= CHECK_TRANSFER_TYPE;
s_DSlatched <= VME_DS_n_i; s_DSlatched <= VME_DS_n_i;
else else
s_mainFSMstate <= LATCH_DS; s_mainFSMstate <= LATCH_DS;
s_DS_latch_count <= s_DS_latch_count - 1; s_DS_latch_count <= s_DS_latch_count - 1;
...@@ -526,7 +526,7 @@ begin ...@@ -526,7 +526,7 @@ begin
s_addrDir <= (s_is_d64) and VME_WRITE_n_i; s_addrDir <= (s_is_d64) and VME_WRITE_n_i;
s_dataPhase <= s_dataPhase; s_dataPhase <= s_dataPhase;
s_transferActive <= '1'; s_transferActive <= '1';
if s_memAck = '1' then if s_memAck = '1' then
-- WB ack -- WB ack
if VME_WRITE_n_i = '0' then if VME_WRITE_n_i = '0' then
...@@ -622,7 +622,7 @@ begin ...@@ -622,7 +622,7 @@ begin
else else
s_mainFSMstate <= WAIT_END; s_mainFSMstate <= WAIT_END;
end if; end if;
when others => when others =>
s_mainFSMstate <= IDLE; s_mainFSMstate <= IDLE;
...@@ -794,7 +794,7 @@ begin ...@@ -794,7 +794,7 @@ begin
s_addrOffset <= s_addrOffset + 1; s_addrOffset <= s_addrOffset + 1;
when D16_01 | D16_23 => when D16_01 | D16_23 =>
s_addrOffset <= s_addrOffset + 2; s_addrOffset <= s_addrOffset + 2;
when D32 => when D32 =>
s_addrOffset <= s_addrOffset + 4; s_addrOffset <= s_addrOffset + 4;
when D64 => when D64 =>
if s_transferType = MBLT then if s_transferType = MBLT then
......
hdl/vme64x-core/sim/simple_tb/top_tb.vhd
View file @ ad09b2d6
...@@ -13,6 +13,7 @@ architecture behaviour of top_tb is ...@@ -13,6 +13,7 @@ architecture behaviour of top_tb is
subtype cfg_addr_t is std_logic_vector (19 downto 0); subtype cfg_addr_t is std_logic_vector (19 downto 0);
subtype byte_t is std_logic_vector (7 downto 0); subtype byte_t is std_logic_vector (7 downto 0);
subtype word_t is std_logic_vector (15 downto 0); subtype word_t is std_logic_vector (15 downto 0);
subtype lword_t is std_logic_vector (31 downto 0);
subtype vme_am_t is std_logic_vector (5 downto 0); subtype vme_am_t is std_logic_vector (5 downto 0);
function hex1 (v : std_logic_vector (3 downto 0)) return character is function hex1 (v : std_logic_vector (3 downto 0)) return character is
...@@ -420,6 +421,37 @@ begin ...@@ -420,6 +421,37 @@ begin
return x"00" & slave_ga & addr (18 downto 0); return x"00" & slave_ga & addr (18 downto 0);
end to_vme_cfg_addr; end to_vme_cfg_addr;
procedure read_setup_addr (addr : std_logic_vector (31 downto 0);
am : vme_am_t) is
begin
VME_ADDR_i <= addr (31 downto 1);
VME_AM_i <= am;
VME_IACK_n_i <= '1';
wait for 35 ns;
VME_AS_n_i <= '0';
VME_WRITE_n_i <= '1';
if not (VME_DTACK_OE_o = '0' and VME_BERR_o = '0') then
wait until VME_DTACK_OE_o = '0' and VME_BERR_o = '0';
end if;
end read_setup_addr;
procedure read_wait_dtack is
begin
wait until (VME_DTACK_OE_o = '1' and VME_DTACK_n_o = '0')
or bus_timer = '1';
if bus_timer = '0' then
assert VME_DATA_DIR_o = '1' report "bad data_dir_o";
assert VME_DATA_OE_N_o = '0' report "bad data_oe_n_o";
end if;
end read_wait_dtack;
procedure read_release is
begin
-- Release
VME_AS_n_i <= '1';
VME_DS_n_i <= "11";
end read_release;
procedure read8 (addr : std_logic_vector (31 downto 0); procedure read8 (addr : std_logic_vector (31 downto 0);
am : vme_am_t; am : vme_am_t;
variable data : out byte_t) variable data : out byte_t)
...@@ -431,27 +463,16 @@ begin ...@@ -431,27 +463,16 @@ begin
& Image_AM (to_integer (unsigned (am))) & " ]" & LF); & Image_AM (to_integer (unsigned (am))) & " ]" & LF);
end if; end if;
VME_ADDR_i <= addr (31 downto 1);
VME_AM_i <= am;
VME_LWORD_n_i <= '1'; VME_LWORD_n_i <= '1';
VME_IACK_n_i <= '1'; read_setup_addr (addr, am);
wait for 35 ns;
VME_AS_n_i <= '0';
VME_WRITE_n_i <= '1';
if not (VME_DTACK_OE_o = '0' and VME_BERR_o = '0') then
wait until VME_DTACK_OE_o = '0' and VME_BERR_o = '0';
end if;
if addr (0) = '0' then if addr (0) = '0' then
VME_DS_n_i <= "01"; VME_DS_n_i <= "01";
else else
VME_DS_n_i <= "10"; VME_DS_n_i <= "10";
end if; end if;
wait until (VME_DTACK_OE_o = '1' and VME_DTACK_n_o = '0') read_wait_dtack;
or bus_timer = '1';
if bus_timer = '0' then if bus_timer = '0' then
assert VME_DATA_DIR_o = '1' report "bad data_dir_o";
assert VME_DATA_OE_N_o = '0' report "bad data_oe_n_o";
if addr (0) = '0' then if addr (0) = '0' then
res := VME_DATA_o (15 downto 8); res := VME_DATA_o (15 downto 8);
else else
...@@ -462,9 +483,7 @@ begin ...@@ -462,9 +483,7 @@ begin
end if; end if;
data := res; data := res;
-- Release read_release;
VME_AS_n_i <= '1';
VME_DS_n_i <= "11";
if c_log then if c_log then
write (output," => 0x" & hex(res) & LF); write (output," => 0x" & hex(res) & LF);
...@@ -482,43 +501,59 @@ begin ...@@ -482,43 +501,59 @@ begin
& Image_AM (to_integer (unsigned (am))) & " ]" & LF); & Image_AM (to_integer (unsigned (am))) & " ]" & LF);
end if; end if;
VME_ADDR_i <= addr (31 downto 1);
VME_AM_i <= am;
VME_LWORD_n_i <= '1'; VME_LWORD_n_i <= '1';
VME_IACK_n_i <= '1'; read_setup_addr (addr, am);
wait for 35 ns;
VME_AS_n_i <= '0';
VME_WRITE_n_i <= '1';
if not (VME_DTACK_OE_o = '0' and VME_BERR_o = '0') then
wait until VME_DTACK_OE_o = '0' and VME_BERR_o = '0';
end if;
assert addr (0) = '0' report "unaligned read16" severity error; assert addr (0) = '0' report "unaligned read16" severity error;
VME_DS_n_i <= "00"; VME_DS_n_i <= "00";
wait until (VME_DTACK_OE_o = '1' and VME_DTACK_n_o = '0') read_wait_dtack;
or bus_timer = '1';
if bus_timer = '0' then if bus_timer = '0' then
assert VME_DATA_DIR_o = '1' report "bad data_dir_o";
assert VME_DATA_OE_N_o = '0' report "bad data_oe_n_o";
res := VME_DATA_o (15 downto 0); res := VME_DATA_o (15 downto 0);
else else
res := (others => 'X'); res := (others => 'X');
end if; end if;
data := res; data := res;
-- Release read_release;
VME_AS_n_i <= '1';
VME_DS_n_i <= "11";
if c_log then if c_log then
write (output," => 0x" & hex(res) & LF); write (output," => 0x" & hex(res) & LF);
end if; end if;
end read16; end read16;
procedure read8_conf (addr : cfg_addr_t; procedure read32 (addr : std_logic_vector (31 downto 0);
variable data : out byte_t) am : vme_am_t;
variable data : out lword_t)
is is
variable l : line; variable res : lword_t;
begin
if c_log then
write (output, "read32 at 0x" & hex (addr) & " ["
& Image_AM (to_integer (unsigned (am))) & " ]" & LF);
end if;
VME_LWORD_n_i <= '0';
read_setup_addr (addr, am);
assert addr (1 downto 0) = "00" report "unaligned read32" severity error;
VME_DS_n_i <= "00";
read_wait_dtack;
if bus_timer = '0' then
res := VME_DATA_o (31 downto 0);
else
res := (others => 'X');
end if;
data := res;
read_release;
if c_log then
write (output," => 0x" & hex(res) & LF);
end if;
end read32;
procedure read8_conf (addr : cfg_addr_t;
variable data : out byte_t) is
begin begin
read8 (to_vme_cfg_addr (addr), c_AM_CR_CSR, data); read8 (to_vme_cfg_addr (addr), c_AM_CR_CSR, data);
end read8_conf; end read8_conf;
...@@ -709,6 +744,7 @@ begin ...@@ -709,6 +744,7 @@ begin
variable d8 : byte_t; variable d8 : byte_t;
variable d16 : word_t; variable d16 : word_t;
variable d32 : lword_t;
begin begin
-- Each scenario starts with a reset. -- Each scenario starts with a reset.
-- VME reset -- VME reset
...@@ -774,6 +810,9 @@ begin ...@@ -774,6 +810,9 @@ begin
read16 (x"56_00_00_12", c_AM_A32, d16); read16 (x"56_00_00_12", c_AM_A32, d16);
assert d16 = x"0004" report "bad read at 012" severity error; assert d16 = x"0004" report "bad read at 012" severity error;
read32 (x"56_00_00_14", c_AM_A32, d32);
assert d32 = x"0000_0500" report "bad read at 014" severity error;
end case; end case;
wait for 10 ns; wait for 10 ns;
......
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