Skip to content

W
White Rabbit core collection
Commit 2dd3ddf8 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

added external txtsu interface (for wr-nic-project)

parent 955e4d14
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 45 deletions
modules/wrc_core/wr_core.vhd
View file @ 2dd3ddf8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- Author : Grzegorz Daniluk -- Author : Grzegorz Daniluk
-- Company : Elproma -- Company : Elproma
-- Created : 2011-02-02 -- Created : 2011-02-02
-- Last update: 2011-12-13 -- Last update: 2012-02-08
-- Platform : FPGA-generics -- Platform : FPGA-generics
-- Standard : VHDL -- Standard : VHDL
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -66,7 +66,7 @@ entity wr_core is ...@@ -66,7 +66,7 @@ entity wr_core is
g_dpram_initf : string := ""; g_dpram_initf : string := "";
g_dpram_size : integer := 16384; --in 32-bit words g_dpram_size : integer := 16384; --in 32-bit words
g_interface_mode : t_wishbone_interface_mode := PIPELINED; g_interface_mode : t_wishbone_interface_mode := PIPELINED;
g_address_granularity : t_wishbone_address_granularity := WORD g_address_granularity : t_wishbone_address_granularity := WORD
); );
port( port(
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
...@@ -129,15 +129,15 @@ entity wr_core is ...@@ -129,15 +129,15 @@ entity wr_core is
----------------------------------------- -----------------------------------------
-- 1-wire -- 1-wire
----------------------------------------- -----------------------------------------
owr_en_o : out std_logic; owr_en_o : out std_logic;
owr_i : in std_logic; owr_i : in std_logic;
----------------------------------------- -----------------------------------------
--External WB interface --External WB interface
----------------------------------------- -----------------------------------------
wb_adr_i : in std_logic_vector(c_wishbone_address_width-1 downto 0); wb_adr_i : in std_logic_vector(c_wishbone_address_width-1 downto 0);
wb_dat_i : in std_logic_vector(c_wishbone_data_width-1 downto 0); wb_dat_i : in std_logic_vector(c_wishbone_data_width-1 downto 0);
wb_dat_o : out std_logic_vector(c_wishbone_data_width-1 downto 0); wb_dat_o : out std_logic_vector(c_wishbone_data_width-1 downto 0);
wb_sel_i : in std_logic_vector(c_wishbone_address_width/8-1 downto 0); wb_sel_i : in std_logic_vector(c_wishbone_address_width/8-1 downto 0);
wb_we_i : in std_logic; wb_we_i : in std_logic;
wb_cyc_i : in std_logic; wb_cyc_i : in std_logic;
...@@ -145,9 +145,9 @@ entity wr_core is ...@@ -145,9 +145,9 @@ entity wr_core is
wb_ack_o : out std_logic; wb_ack_o : out std_logic;
wb_stall_o : out std_logic; wb_stall_o : out std_logic;
------------------------------------------------------------------------------- -----------------------------------------
-- External Fabric I/F -- External Fabric I/F
------------------------------------------------------------------------------- -----------------------------------------
ext_snk_adr_i : in std_logic_vector(1 downto 0) := "00"; ext_snk_adr_i : in std_logic_vector(1 downto 0) := "00";
ext_snk_dat_i : in std_logic_vector(15 downto 0) := x"0000"; ext_snk_dat_i : in std_logic_vector(15 downto 0) := x"0000";
ext_snk_sel_i : in std_logic_vector(1 downto 0) := "00"; ext_snk_sel_i : in std_logic_vector(1 downto 0) := "00";
...@@ -168,6 +168,15 @@ entity wr_core is ...@@ -168,6 +168,15 @@ entity wr_core is
ext_src_err_i : in std_logic := '0'; ext_src_err_i : in std_logic := '0';
ext_src_stall_i : in std_logic := '0'; ext_src_stall_i : in std_logic := '0';
------------------------------------------
-- External TX Timestamp I/F
------------------------------------------
txtsu_port_id_o : out std_logic_vector(4 downto 0);
txtsu_frame_id_o : out std_logic_vector(15 downto 0);
txtsu_tsval_o : out std_logic_vector(31 downto 0);
txtsu_valid_o : out std_logic;
txtsu_ack_i : in std_logic;
----------------------------------------- -----------------------------------------
-- Timecode/Servo Control -- Timecode/Servo Control
----------------------------------------- -----------------------------------------
...@@ -186,8 +195,8 @@ entity wr_core is ...@@ -186,8 +195,8 @@ entity wr_core is
-- 1PPS output -- 1PPS output
pps_p_o : out std_logic; pps_p_o : out std_logic;
dio_o : out std_logic_vector(3 downto 0); dio_o : out std_logic_vector(3 downto 0);
rst_aux_n_o : out std_logic rst_aux_n_o : out std_logic
); );
end wr_core; end wr_core;
...@@ -213,11 +222,11 @@ architecture struct of wr_core is ...@@ -213,11 +222,11 @@ architecture struct of wr_core is
--Endpoint --Endpoint
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
signal txtsu_port_id_o : std_logic_vector(4 downto 0); signal ep_txtsu_port_id : std_logic_vector(4 downto 0);
signal txtsu_frame_id_o : std_logic_vector(16 -1 downto 0); signal ep_txtsu_frame_id : std_logic_vector(15 downto 0);
signal txtsu_tsval_o : std_logic_vector(28 + 4 - 1 downto 0); signal ep_txtsu_tsval : std_logic_vector(31 downto 0);
signal txtsu_valid_o : std_logic; signal ep_txtsu_valid : std_logic;
signal txtsu_ack_i : std_logic; signal ep_txtsu_ack : std_logic;
constant c_mnic_memsize_log2 : integer := f_log2_size(g_dpram_size); constant c_mnic_memsize_log2 : integer := f_log2_size(g_dpram_size);
...@@ -228,6 +237,7 @@ architecture struct of wr_core is ...@@ -228,6 +237,7 @@ architecture struct of wr_core is
signal mnic_mem_addr_o : std_logic_vector(c_mnic_memsize_log2-1 downto 0); signal mnic_mem_addr_o : std_logic_vector(c_mnic_memsize_log2-1 downto 0);
signal mnic_mem_data_i : std_logic_vector(31 downto 0); signal mnic_mem_data_i : std_logic_vector(31 downto 0);
signal mnic_mem_wr_o : std_logic; signal mnic_mem_wr_o : std_logic;
signal mnic_txtsu_ack : std_logic;
signal mnic_wb_irq_o : std_logic; signal mnic_wb_irq_o : std_logic;
...@@ -290,6 +300,10 @@ architecture struct of wr_core is ...@@ -290,6 +300,10 @@ architecture struct of wr_core is
signal ext_wb_in : t_wishbone_slave_in; signal ext_wb_in : t_wishbone_slave_in;
signal ext_wb_out : t_wishbone_slave_out; signal ext_wb_out : t_wishbone_slave_out;
-----------------------------------------------------------------------------
-- External Tx TSU interface
-----------------------------------------------------------------------------
--===========================-- --===========================--
-- For SPEC -- -- For SPEC --
--===========================-- --===========================--
...@@ -482,14 +496,15 @@ begin ...@@ -482,14 +496,15 @@ begin
snk_o => ep_snk_out, snk_o => ep_snk_out,
snk_i => ep_snk_in, snk_i => ep_snk_in,
txtsu_port_id_o => txtsu_port_id_o, txtsu_port_id_o => ep_txtsu_port_id,
txtsu_frame_id_o => txtsu_frame_id_o, txtsu_frame_id_o => ep_txtsu_frame_id,
txtsu_tsval_o => txtsu_tsval_o, txtsu_tsval_o => ep_txtsu_tsval,
txtsu_valid_o => txtsu_valid_o, txtsu_valid_o => ep_txtsu_valid,
txtsu_ack_i => txtsu_ack_i, txtsu_ack_i => ep_txtsu_ack,
wb_i => ep_wb_in, wb_i => ep_wb_in,
wb_o => ep_wb_out); wb_o => ep_wb_out);
ep_txtsu_ack <= txtsu_ack_i or mnic_txtsu_ack;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Mini-NIC -- Mini-NIC
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -513,11 +528,11 @@ begin ...@@ -513,11 +528,11 @@ begin
snk_o => minic_snk_out, snk_o => minic_snk_out,
snk_i => minic_snk_in, snk_i => minic_snk_in,
txtsu_port_id_i => txtsu_port_id_o, txtsu_port_id_i => ep_txtsu_port_id,
txtsu_frame_id_i => txtsu_frame_id_o, txtsu_frame_id_i => ep_txtsu_frame_id,
txtsu_tsval_i => txtsu_tsval_o, txtsu_tsval_i => ep_txtsu_tsval,
txtsu_valid_i => txtsu_valid_o, txtsu_valid_i => ep_txtsu_valid,
txtsu_ack_o => txtsu_ack_i, txtsu_ack_o => mnic_txtsu_ack,
wb_i => minic_wb_in, wb_i => minic_wb_in,
wb_o => minic_wb_out wb_o => minic_wb_out
...@@ -544,11 +559,6 @@ begin ...@@ -544,11 +559,6 @@ begin
iwb_i => cbar_slave_o(1) iwb_i => cbar_slave_o(1)
); );
--cbar_slave_i(1).cyc <= '0';
--cbar_slave_i(1).stb <= '0';
--cbar_slave_i(2).cyc <= '0';
--cbar_slave_i(2).stb <= '0';
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Dual-port RAM -- Dual-port RAM
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -584,12 +594,12 @@ begin ...@@ -584,12 +594,12 @@ begin
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
PERIPH : wrc_periph PERIPH : wrc_periph
generic map( generic map(
g_phys_uart => g_phys_uart, g_phys_uart => g_phys_uart,
g_virtual_uart => g_virtual_uart, g_virtual_uart => g_virtual_uart,
g_mem_words => g_dpram_size) g_mem_words => g_dpram_size)
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
rst_n_i => rst_n_i, rst_n_i => rst_n_i,
rst_net_n_o => rst_net_n, rst_net_n_o => rst_net_n,
rst_wrc_n_o => rst_wrc_n, rst_wrc_n_o => rst_wrc_n,
...@@ -609,8 +619,8 @@ begin ...@@ -609,8 +619,8 @@ begin
uart_rxd_i => uart_rxd_i, uart_rxd_i => uart_rxd_i,
uart_txd_o => uart_txd_o, uart_txd_o => uart_txd_o,
owr_en_o => owr_en_o, owr_en_o => owr_en_o,
owr_i => owr_i owr_i => owr_i
); );
U_Adapter : wb_slave_adapter U_Adapter : wb_slave_adapter
...@@ -712,7 +722,7 @@ begin ...@@ -712,7 +722,7 @@ begin
generic map( generic map(
g_num_masters => 1, g_num_masters => 1,
g_num_slaves => 7, g_num_slaves => 7,
g_registered => true g_registered => true
) )
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
...@@ -787,4 +797,13 @@ begin ...@@ -787,4 +797,13 @@ begin
ext_snk_err_o <= ext_snk_out.err; ext_snk_err_o <= ext_snk_out.err;
ext_snk_stall_o <= ext_snk_out.stall; ext_snk_stall_o <= ext_snk_out.stall;
-----------------------------------------------------------------------------
-- External Tx Timestamping I/F
-----------------------------------------------------------------------------
txtsu_port_id_o <= ep_txtsu_port_id;
txtsu_frame_id_o <= ep_txtsu_frame_id;
txtsu_tsval_o <= ep_txtsu_tsval;
txtsu_valid_o <= '1' when (ep_txtsu_valid = '1' and (ep_txtsu_frame_id /= x"0000")) else
'0';
end struct; end struct;
modules/wrc_core/wrcore_pkg.vhd
View file @ 2dd3ddf8
...@@ -9,7 +9,14 @@ use work.wr_fabric_pkg.all; ...@@ -9,7 +9,14 @@ use work.wr_fabric_pkg.all;
package wrcore_pkg is package wrcore_pkg is
----------------------------------------------------------------------------- type t_txtsu_timestamp is record
valid : std_logic;
tsval : std_logic_vector(31 downto 0);
port_id : std_logic_vector(5 downto 0);
frame_id : std_logic_vector(15 downto 0);
end record;
-----------------------------------------------------------------------------
--PPS generator --PPS generator
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
component xwr_pps_gen is component xwr_pps_gen is
......
modules/wrc_core/xwr_core.vhd
View file @ 2dd3ddf8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- Author : Grzegorz Daniluk -- Author : Grzegorz Daniluk
-- Company : Elproma -- Company : Elproma
-- Created : 2011-02-02 -- Created : 2011-02-02
-- Last update: 2012-01-24 -- Last update: 2012-02-08
-- Platform : FPGA-generics -- Platform : FPGA-generics
-- Standard : VHDL -- Standard : VHDL
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -133,6 +133,12 @@ entity xwr_core is ...@@ -133,6 +133,12 @@ entity xwr_core is
wrf_snk_o : out t_wrf_sink_out; wrf_snk_o : out t_wrf_sink_out;
wrf_snk_i : in t_wrf_sink_in := c_dummy_snk_in; wrf_snk_i : in t_wrf_sink_in := c_dummy_snk_in;
-----------------------------------------
-- External Tx Timestamping I/F
-----------------------------------------
timestamps_o : out t_txtsu_timestamp;
timestamps_ack_i : in std_logic := '1';
----------------------------------------- -----------------------------------------
-- Timecode/Servo Control -- Timecode/Servo Control
----------------------------------------- -----------------------------------------
...@@ -238,6 +244,12 @@ architecture struct of xwr_core is ...@@ -238,6 +244,12 @@ architecture struct of xwr_core is
ext_src_err_i : in std_logic := '0'; ext_src_err_i : in std_logic := '0';
ext_src_stall_i : in std_logic := '0'; ext_src_stall_i : in std_logic := '0';
txtsu_port_id_o : out std_logic_vector(4 downto 0);
txtsu_frame_id_o : out std_logic_vector(15 downto 0);
txtsu_tsval_o : out std_logic_vector(31 downto 0);
txtsu_valid_o : out std_logic;
txtsu_ack_i : in std_logic;
tm_dac_value_o : out std_logic_vector(23 downto 0); tm_dac_value_o : out std_logic_vector(23 downto 0);
tm_dac_wr_o : out std_logic; tm_dac_wr_o : out std_logic;
tm_clk_aux_lock_en_i : in std_logic; tm_clk_aux_lock_en_i : in std_logic;
...@@ -333,6 +345,12 @@ begin ...@@ -333,6 +345,12 @@ begin
ext_src_err_i => wrf_src_i.err, ext_src_err_i => wrf_src_i.err,
ext_src_stall_i => wrf_src_i.stall, ext_src_stall_i => wrf_src_i.stall,
txtsu_port_id_o => timestamps_o.port_id(4 downto 0),
txtsu_frame_id_o => timestamps_o.frame_id,
txtsu_tsval_o => timestamps_o.tsval,
txtsu_valid_o => timestamps_o.valid,
txtsu_ack_i => timestamps_ack_i,
tm_dac_value_o => tm_dac_value_o, tm_dac_value_o => tm_dac_value_o,
tm_dac_wr_o => tm_dac_wr_o, tm_dac_wr_o => tm_dac_wr_o,
tm_clk_aux_lock_en_i => tm_clk_aux_lock_en_i, tm_clk_aux_lock_en_i => tm_clk_aux_lock_en_i,
...@@ -346,4 +364,6 @@ begin ...@@ -346,4 +364,6 @@ begin
rst_aux_n_o => rst_aux_n_o rst_aux_n_o => rst_aux_n_o
); );
timestamps_o.port_id(5) <= '0';
end struct; end struct;
top/spec_1_1/wr_core_demo/spec_top.vhd
View file @ 2dd3ddf8
...@@ -285,6 +285,9 @@ architecture rtl of spec_top is ...@@ -285,6 +285,9 @@ architecture rtl of spec_top is
wrf_snk_o : out t_wrf_sink_out; wrf_snk_o : out t_wrf_sink_out;
wrf_snk_i : in t_wrf_sink_in := c_dummy_snk_in; wrf_snk_i : in t_wrf_sink_in := c_dummy_snk_in;
timestamps_o : out t_txtsu_timestamp;
timestamps_ack_i : in std_logic := '1';
tm_dac_value_o : out std_logic_vector(23 downto 0); tm_dac_value_o : out std_logic_vector(23 downto 0);
tm_dac_wr_o : out std_logic; tm_dac_wr_o : out std_logic;
tm_clk_aux_lock_en_i : in std_logic; tm_clk_aux_lock_en_i : in std_logic;
...@@ -954,11 +957,11 @@ begin ...@@ -954,11 +957,11 @@ begin
dio_out(0) <= pps; dio_out(0) <= pps;
dio_oe_n_o(0) <= '0'; dio_oe_n_o(0) <= '0';
dio_oe_n_o(4 downto 1) <= (others => '0'); dio_oe_n_o(4 downto 1) <= (others => '0');
dio_onewire_b <= '0' when owr_en = '1' else 'Z'; dio_onewire_b <= '0' when owr_en = '1' else 'Z';
owr_i <= dio_onewire_b; owr_i <= dio_onewire_b;
dio_term_en_o <= (others => '0'); dio_term_en_o <= (others => '0');
dio_sdn_ck_n_o <= '1'; dio_sdn_ck_n_o <= '1';
dio_sdn_n_o <= '1'; dio_sdn_n_o <= '1';
......
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