Skip to content

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

wr_core: adding 16-bit PCS interface based on Peter's work 

Conflicts:

	modules/wrc_core/wr_core.vhd
	top/spec_1_1/wr_core_demo/spec_top.vhd
parent 7069cf95
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 40 deletions
modules/wrc_core/wr_core.vhd
View file @ 38ceddcd
...@@ -96,8 +96,8 @@ entity wr_core is ...@@ -96,8 +96,8 @@ entity wr_core is
g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb; g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb;
g_softpll_channels_config : t_softpll_channel_config_array := c_softpll_default_channel_config; g_softpll_channels_config : t_softpll_channel_config_array := c_softpll_default_channel_config;
g_softpll_enable_debugger : boolean := false; g_softpll_enable_debugger : boolean := false;
g_vuart_fifo_size : integer := 1024 g_vuart_fifo_size : integer := 1024;
); g_pcs_16bit : boolean := false);
port( port(
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Clocks/resets -- Clocks/resets
...@@ -137,16 +137,18 @@ entity wr_core is ...@@ -137,16 +137,18 @@ entity wr_core is
-- PHY I/f -- PHY I/f
phy_ref_clk_i : in std_logic; phy_ref_clk_i : in std_logic;
phy_tx_data_o : out std_logic_vector(7 downto 0); phy_tx_data_o : out std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_tx_k_o : out std_logic; phy_tx_k_o : out std_logic;
phy_tx_k16_o : out std_logic;
phy_tx_disparity_i : in std_logic; phy_tx_disparity_i : in std_logic;
phy_tx_enc_err_i : in std_logic; phy_tx_enc_err_i : in std_logic;
phy_rx_data_i : in std_logic_vector(7 downto 0); phy_rx_data_i : in std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_rx_rbclk_i : in std_logic; phy_rx_rbclk_i : in std_logic;
phy_rx_k_i : in std_logic; phy_rx_k_i : in std_logic;
phy_rx_k16_i : in std_logic := '0';
phy_rx_enc_err_i : in std_logic; phy_rx_enc_err_i : in std_logic;
phy_rx_bitslide_i : in std_logic_vector(3 downto 0); phy_rx_bitslide_i : in std_logic_vector(f_pcs_bts_width(g_pcs_16bit)-1 downto 0);
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
phy_loopen_o : out std_logic; phy_loopen_o : out std_logic;
...@@ -330,6 +332,11 @@ architecture struct of wr_core is ...@@ -330,6 +332,11 @@ architecture struct of wr_core is
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
--Endpoint --Endpoint
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
signal phy_tx_data_int : std_logic_vector(15 downto 0);
signal phy_tx_k_int : std_logic_vector(1 downto 0);
signal phy_rx_data_int : std_logic_vector(15 downto 0);
signal phy_rx_k_int : std_logic_vector(1 downto 0);
signal phy_rx_bitslide_int : std_logic_vector(4 downto 0);
signal ep_txtsu_port_id : std_logic_vector(4 downto 0); signal ep_txtsu_port_id : std_logic_vector(4 downto 0);
signal ep_txtsu_frame_id : std_logic_vector(15 downto 0); signal ep_txtsu_frame_id : std_logic_vector(15 downto 0);
...@@ -518,7 +525,7 @@ begin ...@@ -518,7 +525,7 @@ begin
generic map( generic map(
g_with_ext_clock_input => g_with_external_clock_input, g_with_ext_clock_input => g_with_external_clock_input,
g_reverse_dmtds => false, g_reverse_dmtds => false,
g_divide_input_by_2 => true, g_divide_input_by_2 => not g_pcs_16bit,
g_with_debug_fifo => g_softpll_enable_debugger, g_with_debug_fifo => g_softpll_enable_debugger,
g_tag_bits => 22, g_tag_bits => 22,
g_interface_mode => PIPELINED, g_interface_mode => PIPELINED,
...@@ -593,13 +600,32 @@ begin ...@@ -593,13 +600,32 @@ begin
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Endpoint -- Endpoint
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
phy_tx_data_o <= phy_tx_data_int(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_tx_k_o <= phy_tx_k_int(0);
phy_rx_k_int(0) <= phy_rx_k_i;
gen_16bit_phy_if: if g_pcs_16bit generate
phy_tx_k16_o <= phy_tx_k_int(1);
phy_rx_data_int <= phy_rx_data_i;
phy_rx_k_int(1) <= phy_rx_k16_i;
phy_rx_bitslide_int <= phy_rx_bitslide_i;
end generate;
gen_8bit_phy_if: if not g_pcs_16bit generate
phy_tx_k16_o <= '0';
phy_rx_data_int <= x"00" & phy_rx_data_i;
phy_rx_k_int(1) <= '0';
phy_rx_bitslide_int <= '0' & phy_rx_bitslide_i;
end generate;
U_Endpoint : xwr_endpoint U_Endpoint : xwr_endpoint
generic map ( generic map (
g_interface_mode => PIPELINED, g_interface_mode => PIPELINED,
g_address_granularity => BYTE, g_address_granularity => BYTE,
g_simulation => f_int_to_bool(g_simulation), g_simulation => f_int_to_bool(g_simulation),
g_tx_runt_padding => g_tx_runt_padding, g_tx_runt_padding => g_tx_runt_padding,
g_pcs_16bit => false, g_pcs_16bit => g_pcs_16bit,
g_rx_buffer_size => g_rx_buffer_size, g_rx_buffer_size => g_rx_buffer_size,
g_with_rx_buffer => true, g_with_rx_buffer => true,
g_with_flow_control => false, g_with_flow_control => false,
...@@ -619,23 +645,18 @@ begin ...@@ -619,23 +645,18 @@ begin
pps_csync_p1_i => s_pps_csync, pps_csync_p1_i => s_pps_csync,
pps_valid_i => pps_valid, pps_valid_i => pps_valid,
phy_rst_o => phy_rst_o, phy_rst_o => phy_rst_o,
phy_loopen_o => phy_loopen_o, phy_loopen_o => phy_loopen_o,
phy_ref_clk_i => phy_ref_clk_i, phy_ref_clk_i => phy_ref_clk_i,
phy_tx_data_o(7 downto 0) => phy_tx_data_o, phy_tx_data_o => phy_tx_data_int,
phy_tx_data_o(15 downto 8) => dummy(7 downto 0), phy_tx_k_o => phy_tx_k_int,
phy_tx_k_o(0) => phy_tx_k_o, phy_tx_disparity_i => phy_tx_disparity_i,
phy_tx_k_o(1) => dummy(8), phy_tx_enc_err_i => phy_tx_enc_err_i,
phy_tx_disparity_i => phy_tx_disparity_i, phy_rx_data_i => phy_rx_data_int,
phy_tx_enc_err_i => phy_tx_enc_err_i, phy_rx_clk_i => phy_rx_rbclk_i,
phy_rx_data_i(7 downto 0) => phy_rx_data_i, phy_rx_k_i => phy_rx_k_int,
phy_rx_data_i(15 downto 8) => x"00", phy_rx_enc_err_i => phy_rx_enc_err_i,
phy_rx_clk_i => phy_rx_rbclk_i, phy_rx_bitslide_i => phy_rx_bitslide_int,
phy_rx_k_i(0) => phy_rx_k_i,
phy_rx_k_i(1) => '0',
phy_rx_enc_err_i => phy_rx_enc_err_i,
phy_rx_bitslide_i(3 downto 0) => phy_rx_bitslide_i,
phy_rx_bitslide_i(4) => '0',
src_o => ep_src_out, src_o => ep_src_out,
src_i => ep_src_in, src_i => ep_src_in,
......
modules/wrc_core/wrcore_pkg.vhd
View file @ 38ceddcd
...@@ -11,6 +11,25 @@ use work.softpll_pkg.all; ...@@ -11,6 +11,25 @@ use work.softpll_pkg.all;
package wrcore_pkg is package wrcore_pkg is
function f_pcs_data_width(pcs_16 : boolean)
return integer is
begin
if (pcs_16) then
return 16;
else
return 8;
end if;
end function;
function f_pcs_bts_width(pcs_16 : boolean)
return integer is
begin
if (pcs_16) then
return 5;
else
return 4;
end if;
end function;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
--PPS generator --PPS generator
...@@ -307,8 +326,8 @@ package wrcore_pkg is ...@@ -307,8 +326,8 @@ package wrcore_pkg is
g_address_granularity : t_wishbone_address_granularity := BYTE; g_address_granularity : t_wishbone_address_granularity := BYTE;
g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb; g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb;
g_softpll_enable_debugger : boolean := false; g_softpll_enable_debugger : boolean := false;
g_vuart_fifo_size : integer := 1024 g_vuart_fifo_size : integer := 1024;
); g_pcs_16bit : boolean := false);
port( port(
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
clk_dmtd_i : in std_logic := '0'; clk_dmtd_i : in std_logic := '0';
...@@ -325,15 +344,17 @@ package wrcore_pkg is ...@@ -325,15 +344,17 @@ package wrcore_pkg is
dac_dpll_data_o : out std_logic_vector(15 downto 0); dac_dpll_data_o : out std_logic_vector(15 downto 0);
phy_ref_clk_i : in std_logic := '0'; phy_ref_clk_i : in std_logic := '0';
phy_tx_data_o : out std_logic_vector(7 downto 0); phy_tx_data_o : out std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_tx_k_o : out std_logic; phy_tx_k_o : out std_logic;
phy_tx_k16_o : out std_logic;
phy_tx_disparity_i : in std_logic := '0'; phy_tx_disparity_i : in std_logic := '0';
phy_tx_enc_err_i : in std_logic := '0'; phy_tx_enc_err_i : in std_logic := '0';
phy_rx_data_i : in std_logic_vector(7 downto 0) := x"00"; phy_rx_data_i : in std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0) := (others=>'0');
phy_rx_rbclk_i : in std_logic := '0'; phy_rx_rbclk_i : in std_logic := '0';
phy_rx_k_i : in std_logic := '0'; phy_rx_k_i : in std_logic := '0';
phy_rx_k16_i : in std_logic := '0';
phy_rx_enc_err_i : in std_logic := '0'; phy_rx_enc_err_i : in std_logic := '0';
phy_rx_bitslide_i : in std_logic_vector(3 downto 0) := x"0"; phy_rx_bitslide_i : in std_logic_vector(f_pcs_bts_width(g_pcs_16bit)-1 downto 0) := (others=>'0');
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
phy_loopen_o : out std_logic; phy_loopen_o : out std_logic;
...@@ -412,8 +433,8 @@ package wrcore_pkg is ...@@ -412,8 +433,8 @@ package wrcore_pkg is
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb; g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb;
g_softpll_enable_debugger : boolean := false; g_softpll_enable_debugger : boolean := false;
g_vuart_fifo_size : integer := 1024 g_vuart_fifo_size : integer := 1024;
); g_pcs_16bit : boolean := false);
port( port(
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Clocks/resets -- Clocks/resets
...@@ -453,16 +474,18 @@ package wrcore_pkg is ...@@ -453,16 +474,18 @@ package wrcore_pkg is
-- PHY I/f -- PHY I/f
phy_ref_clk_i : in std_logic; phy_ref_clk_i : in std_logic;
phy_tx_data_o : out std_logic_vector(7 downto 0); phy_tx_data_o : out std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_tx_k_o : out std_logic; phy_tx_k_o : out std_logic;
phy_tx_k16_o : out std_logic;
phy_tx_disparity_i : in std_logic := '0'; phy_tx_disparity_i : in std_logic := '0';
phy_tx_enc_err_i : in std_logic := '0'; phy_tx_enc_err_i : in std_logic := '0';
phy_rx_data_i : in std_logic_vector(7 downto 0); phy_rx_data_i : in std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0) := (others=>'0');
phy_rx_rbclk_i : in std_logic := '0'; phy_rx_rbclk_i : in std_logic := '0';
phy_rx_k_i : in std_logic := '0'; phy_rx_k_i : in std_logic := '0';
phy_rx_k16_i : in std_logic := '0';
phy_rx_enc_err_i : in std_logic := '0'; phy_rx_enc_err_i : in std_logic := '0';
phy_rx_bitslide_i : in std_logic_vector(3 downto 0) := x"0"; phy_rx_bitslide_i : in std_logic_vector(f_pcs_bts_width(g_pcs_16bit)-1 downto 0) := (others=>'0');
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
phy_loopen_o : out std_logic; phy_loopen_o : out std_logic;
......
modules/wrc_core/xwr_core.vhd
View file @ 38ceddcd
...@@ -80,8 +80,8 @@ entity xwr_core is ...@@ -80,8 +80,8 @@ entity xwr_core is
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb; g_aux_sdb : t_sdb_device := c_wrc_periph3_sdb;
g_softpll_enable_debugger : boolean := false; g_softpll_enable_debugger : boolean := false;
g_vuart_fifo_size : integer := 1024 g_vuart_fifo_size : integer := 1024;
); g_pcs_16bit : boolean := false);
port( port(
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Clocks/resets -- Clocks/resets
...@@ -121,16 +121,18 @@ entity xwr_core is ...@@ -121,16 +121,18 @@ entity xwr_core is
-- PHY I/f -- PHY I/f
phy_ref_clk_i : in std_logic; phy_ref_clk_i : in std_logic;
phy_tx_data_o : out std_logic_vector(7 downto 0); phy_tx_data_o : out std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_tx_k_o : out std_logic; phy_tx_k_o : out std_logic;
phy_tx_k16_o : out std_logic;
phy_tx_disparity_i : in std_logic; phy_tx_disparity_i : in std_logic;
phy_tx_enc_err_i : in std_logic; phy_tx_enc_err_i : in std_logic;
phy_rx_data_i : in std_logic_vector(7 downto 0); phy_rx_data_i : in std_logic_vector(f_pcs_data_width(g_pcs_16bit)-1 downto 0);
phy_rx_rbclk_i : in std_logic; phy_rx_rbclk_i : in std_logic;
phy_rx_k_i : in std_logic; phy_rx_k_i : in std_logic;
phy_rx_k16_i : in std_logic;
phy_rx_enc_err_i : in std_logic; phy_rx_enc_err_i : in std_logic;
phy_rx_bitslide_i : in std_logic_vector(3 downto 0); phy_rx_bitslide_i : in std_logic_vector(f_pcs_bts_width(g_pcs_16bit)-1 downto 0);
phy_rst_o : out std_logic; phy_rst_o : out std_logic;
phy_loopen_o : out std_logic; phy_loopen_o : out std_logic;
...@@ -237,7 +239,8 @@ begin ...@@ -237,7 +239,8 @@ begin
g_address_granularity => g_address_granularity, g_address_granularity => g_address_granularity,
g_aux_sdb => g_aux_sdb, g_aux_sdb => g_aux_sdb,
g_softpll_enable_debugger => g_softpll_enable_debugger, g_softpll_enable_debugger => g_softpll_enable_debugger,
g_vuart_fifo_size => g_vuart_fifo_size) g_vuart_fifo_size => g_vuart_fifo_size,
g_pcs_16bit => g_pcs_16bit)
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
clk_dmtd_i => clk_dmtd_i, clk_dmtd_i => clk_dmtd_i,
......
top/spec_1_1/wr_core_demo/spec_top.vhd
View file @ 38ceddcd
...@@ -659,6 +659,7 @@ begin ...@@ -659,6 +659,7 @@ begin
g_aux_clks => 0, g_aux_clks => 0,
g_ep_rxbuf_size => 1024, g_ep_rxbuf_size => 1024,
g_tx_runt_padding => true, g_tx_runt_padding => true,
g_pcs_16bit => false,
g_dpram_initf => "wrc.ram", g_dpram_initf => "wrc.ram",
g_aux_sdb => c_etherbone_sdb, g_aux_sdb => c_etherbone_sdb,
g_dpram_size => 131072/4, g_dpram_size => 131072/4,
......
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