Skip to content
Snippets Groups Projects
Commit 0244a1ae authored by Miguel Jimenez Lopez's avatar Miguel Jimenez Lopez Committed by Grzegorz Daniluk
Browse files

wr_nic_wrapper: Fix indentation.

parent ad115ce1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/wr_nic/wr_nic_wrapper.vhd
+ 49
− 49
View file @ 0244a1ae
...@@ -50,46 +50,46 @@ entity wr_nic_wrapper is ...@@ -50,46 +50,46 @@ entity wr_nic_wrapper is
g_num_irqs : integer := 3; g_num_irqs : integer := 3;
-- Number of ports for the TxTSU module -- Number of ports for the TxTSU module
g_num_ports : integer := 1 g_num_ports : integer := 1
); );
port( port(
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Global ports (Clocks & Resets) -- Global ports (Clocks & Resets)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- System clock -- System clock
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
-- Global reset (active low) -- Global reset (active low)
resetn_i : in std_logic; resetn_i : in std_logic;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- External WB slave interface -- External WB slave interface
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
ext_slave_i : in t_wishbone_slave_in; ext_slave_i : in t_wishbone_slave_in;
ext_slave_o : out t_wishbone_slave_out; ext_slave_o : out t_wishbone_slave_out;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- NIC fabric data buses -- NIC fabric data buses
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
nic_snk_i : in t_wrf_sink_in; nic_snk_i : in t_wrf_sink_in;
nic_snk_o : out t_wrf_sink_out; nic_snk_o : out t_wrf_sink_out;
nic_src_i : in t_wrf_source_in; nic_src_i : in t_wrf_source_in;
nic_src_o : out t_wrf_source_out; nic_src_o : out t_wrf_source_out;
-- PPS-related signal for NIC core -- PPS-related signal for NIC core
pps_p_i : in std_logic := '0'; pps_p_i : in std_logic := '0';
pps_valid_i : in std_logic := '0'; pps_valid_i : in std_logic := '0';
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- VIC ports (peripheral interrupts lines and global interrupt output) -- VIC ports (peripheral interrupts lines and global interrupt output)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
vic_irqs_i : in std_logic_vector(g_num_irqs-1 downto 0); vic_irqs_i : in std_logic_vector(g_num_irqs-1 downto 0);
vic_int_o : out std_logic; vic_int_o : out std_logic;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- TxTSU ports (Timestamp trigger and acknowlegdement signal) -- TxTSU ports (Timestamp trigger and acknowlegdement signal)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
txtsu_timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0); txtsu_timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0);
txtsu_timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0) txtsu_timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0)
); );
end entity wr_nic_wrapper; end entity wr_nic_wrapper;
architecture struct of wr_nic_wrapper is architecture struct of wr_nic_wrapper is
...@@ -98,24 +98,24 @@ architecture struct of wr_nic_wrapper is ...@@ -98,24 +98,24 @@ architecture struct of wr_nic_wrapper is
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- NIC constants -- NIC constants
constant c_NIC_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED; constant c_NIC_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED;
constant c_NIC_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE; constant c_NIC_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE;
constant c_NIC_SRC_CYC_ON_STALL : boolean := true; constant c_NIC_SRC_CYC_ON_STALL : boolean := true;
constant c_NIC_PORT_MASK_BITS : integer := g_num_ports+1; constant c_NIC_PORT_MASK_BITS : integer := g_num_ports+1;
constant c_NIC_RMON_EVENTS_PP : integer := 1; constant c_NIC_RMON_EVENTS_PP : integer := 1;
-- VIC constants -- VIC constants
constant c_VIC_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED; constant c_VIC_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED;
constant c_VIC_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE; constant c_VIC_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE;
constant c_VIC_EXTRA_IRQS : integer := 3; constant c_VIC_EXTRA_IRQS : integer := 3;
constant c_VIC_NUM_IRQS : integer := g_num_irqs+c_VIC_EXTRA_IRQS; constant c_VIC_NUM_IRQS : integer := g_num_irqs+c_VIC_EXTRA_IRQS;
constant c_VIC_IRQ_TXTSU : integer := 0; constant c_VIC_IRQ_TXTSU : integer := 0;
constant c_VIC_IRQ_NIC : integer := 1; constant c_VIC_IRQ_NIC : integer := 1;
constant c_VIC_IRQ_PPS : integer := 2; constant c_VIC_IRQ_PPS : integer := 2;
-- TxTSU constants -- TxTSU constants
constant c_TXTSU_NUM_PORTS : integer := g_num_ports; constant c_TXTSU_NUM_PORTS : integer := g_num_ports;
constant c_TXTSU_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED; constant c_TXTSU_INTERFACE_MODE : t_wishbone_interface_mode := PIPELINED;
constant c_TXTSU_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE; constant c_TXTSU_ADDRESS_GRANULARITY : t_wishbone_address_granularity := BYTE;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -147,12 +147,12 @@ begin -- architecture struct ...@@ -147,12 +147,12 @@ begin -- architecture struct
g_layout => c_nic_wrapper_xbar_layout, g_layout => c_nic_wrapper_xbar_layout,
g_sdb_addr => c_nic_wrapper_xbar_sdb_address) g_sdb_addr => c_nic_wrapper_xbar_sdb_address)
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
rst_n_i => resetn_i, rst_n_i => resetn_i,
slave_i => cbar_slave_i, slave_i => cbar_slave_i,
slave_o => cbar_slave_o, slave_o => cbar_slave_o,
master_i => cbar_master_i, master_i => cbar_master_i,
master_o => cbar_master_o); master_o => cbar_master_o);
-- Assign slave interface of the WB crossbar to external port -- Assign slave interface of the WB crossbar to external port
cbar_slave_i(c_NIC_WRAPPER_XBAR_MASTER_EXT) <= ext_slave_i; cbar_slave_i(c_NIC_WRAPPER_XBAR_MASTER_EXT) <= ext_slave_i;
...@@ -163,15 +163,15 @@ begin -- architecture struct ...@@ -163,15 +163,15 @@ begin -- architecture struct
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
cmp_nic : xwr_nic cmp_nic : xwr_nic
generic map( generic map(
g_interface_mode => c_NIC_INTERFACE_MODE, g_interface_mode => c_NIC_INTERFACE_MODE,
g_address_granularity => c_NIC_ADDRESS_GRANULARITY, g_address_granularity => c_NIC_ADDRESS_GRANULARITY,
g_src_cyc_on_stall => c_NIC_SRC_CYC_ON_STALL, g_src_cyc_on_stall => c_NIC_SRC_CYC_ON_STALL,
g_port_mask_bits => c_NIC_PORT_MASK_BITS, g_port_mask_bits => c_NIC_PORT_MASK_BITS,
g_rmon_events_pp => c_NIC_RMON_EVENTS_PP) g_rmon_events_pp => c_NIC_RMON_EVENTS_PP)
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
rst_n_i => resetn_i, rst_n_i => resetn_i,
pps_p_i => pps_p_i, pps_p_i => pps_p_i,
pps_valid_i => pps_valid_i, pps_valid_i => pps_valid_i,
snk_i => nic_snk_i, snk_i => nic_snk_i,
snk_o => nic_snk_o, snk_o => nic_snk_o,
...@@ -203,9 +203,9 @@ begin -- architecture struct ...@@ -203,9 +203,9 @@ begin -- architecture struct
irqs_i => vic_vec_int_i, irqs_i => vic_vec_int_i,
irq_master_o => vic_int_o); irq_master_o => vic_int_o);
vic_vec_int_i(c_VIC_IRQ_TXTSU) <= txtsu_int; vic_vec_int_i(c_VIC_IRQ_TXTSU) <= txtsu_int;
vic_vec_int_i(c_VIC_IRQ_NIC) <= nic_int; vic_vec_int_i(c_VIC_IRQ_NIC) <= nic_int;
vic_vec_int_i(c_VIC_IRQ_PPS) <= pps_p_i; vic_vec_int_i(c_VIC_IRQ_PPS) <= pps_p_i;
vic_vec_int_i(c_VIC_NUM_IRQS-1 downto c_VIC_EXTRA_IRQS) <= vic_irqs_i; vic_vec_int_i(c_VIC_NUM_IRQS-1 downto c_VIC_EXTRA_IRQS) <= vic_irqs_i;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -217,12 +217,12 @@ begin -- architecture struct ...@@ -217,12 +217,12 @@ begin -- architecture struct
g_interface_mode => c_TXTSU_INTERFACE_MODE, g_interface_mode => c_TXTSU_INTERFACE_MODE,
g_address_granularity => c_TXTSU_ADDRESS_GRANULARITY) g_address_granularity => c_TXTSU_ADDRESS_GRANULARITY)
port map( port map(
clk_sys_i => clk_sys_i, clk_sys_i => clk_sys_i,
rst_n_i => resetn_i, rst_n_i => resetn_i,
timestamps_i => txtsu_timestamps_i, timestamps_i => txtsu_timestamps_i,
timestamps_ack_o => txtsu_timestamps_ack_o, timestamps_ack_o => txtsu_timestamps_ack_o,
wb_i => cbar_master_o(c_NIC_WRAPPER_XBAR_SLAVE_TXTSU), wb_i => cbar_master_o(c_NIC_WRAPPER_XBAR_SLAVE_TXTSU),
wb_o => cbar_master_i(c_NIC_WRAPPER_XBAR_SLAVE_TXTSU), wb_o => cbar_master_i(c_NIC_WRAPPER_XBAR_SLAVE_TXTSU),
int_o => txtsu_int); int_o => txtsu_int);
end architecture struct; end architecture struct;
modules/wr_nic/wr_nic_wrapper_pkg.vhd
+ 111
− 111
View file @ 0244a1ae
...@@ -48,136 +48,136 @@ package wr_nic_wrapper_pkg is ...@@ -48,136 +48,136 @@ package wr_nic_wrapper_pkg is
-- Network Interface Core (NIC) component -- Network Interface Core (NIC) component
component xwr_nic component xwr_nic
generic( generic(
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
g_address_granularity : t_wishbone_address_granularity := WORD; g_address_granularity : t_wishbone_address_granularity := WORD;
g_src_cyc_on_stall : boolean := false; g_src_cyc_on_stall : boolean := false;
g_port_mask_bits : integer := 32; --should be num_ports+1 g_port_mask_bits : integer := 32; --should be num_ports+1
g_rmon_events_pp : integer := 1); g_rmon_events_pp : integer := 1);
port ( port (
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
rst_n_i : in std_logic; rst_n_i : in std_logic;
pps_p_i : in std_logic; pps_p_i : in std_logic;
pps_valid_i : in std_logic; pps_valid_i : in std_logic;
snk_i : in t_wrf_sink_in; snk_i : in t_wrf_sink_in;
snk_o : out t_wrf_sink_out; snk_o : out t_wrf_sink_out;
src_i : in t_wrf_source_in; src_i : in t_wrf_source_in;
src_o : out t_wrf_source_out; src_o : out t_wrf_source_out;
rtu_dst_port_mask_o : out std_logic_vector(g_port_mask_bits-1 downto 0); rtu_dst_port_mask_o : out std_logic_vector(g_port_mask_bits-1 downto 0);
rtu_prio_o : out std_logic_vector(2 downto 0); rtu_prio_o : out std_logic_vector(2 downto 0);
rtu_drop_o : out std_logic; rtu_drop_o : out std_logic;
rtu_rsp_valid_o : out std_logic; rtu_rsp_valid_o : out std_logic;
rtu_rsp_ack_i : in std_logic; rtu_rsp_ack_i : in std_logic;
wb_i : in t_wishbone_slave_in; wb_i : in t_wishbone_slave_in;
wb_o : out t_wishbone_slave_out; wb_o : out t_wishbone_slave_out;
int_o: out std_logic; int_o : out std_logic;
rmon_events_o : out std_logic_vector(g_port_mask_bits*g_rmon_events_pp-1 downto 0)); rmon_events_o : out std_logic_vector(g_port_mask_bits*g_rmon_events_pp-1 downto 0));
end component; end component;
-- Transimission TimeStamp Unit (TxTSU) component -- Transimission TimeStamp Unit (TxTSU) component
component xwr_tx_tsu component xwr_tx_tsu
generic( generic(
g_num_ports : integer := 10; g_num_ports : integer := 10;
g_interface_mode : t_wishbone_interface_mode := CLASSIC; g_interface_mode : t_wishbone_interface_mode := CLASSIC;
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;
rst_n_i : in std_logic; rst_n_i : in std_logic;
timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0); timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0);
timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0); timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0);
wb_i : in t_wishbone_slave_in; wb_i : in t_wishbone_slave_in;
wb_o : out t_wishbone_slave_out; wb_o : out t_wishbone_slave_out;
int_o : out std_logic); int_o : out std_logic);
end component; end component;
component wr_nic_wrapper component wr_nic_wrapper
generic( generic(
-- Number of peripheral interrupt lines -- Number of peripheral interrupt lines
g_num_irqs : integer := 3; g_num_irqs : integer := 3;
-- Number of ports for the TxTSU module -- Number of ports for the TxTSU module
g_num_ports : integer := 1 g_num_ports : integer := 1
); );
port( port(
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Global ports (Clocks & Resets) -- Global ports (Clocks & Resets)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- System clock -- System clock
clk_sys_i : in std_logic; clk_sys_i : in std_logic;
-- Global reset (active low) -- Global reset (active low)
resetn_i : in std_logic; resetn_i : in std_logic;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- External WB slave interface -- External WB slave interface
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
ext_slave_i : in t_wishbone_slave_in; ext_slave_i : in t_wishbone_slave_in;
ext_slave_o : out t_wishbone_slave_out; ext_slave_o : out t_wishbone_slave_out;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- NIC fabric data buses -- NIC fabric data buses
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
nic_snk_i : in t_wrf_sink_in; nic_snk_i : in t_wrf_sink_in;
nic_snk_o : out t_wrf_sink_out; nic_snk_o : out t_wrf_sink_out;
nic_src_i : in t_wrf_source_in; nic_src_i : in t_wrf_source_in;
nic_src_o : out t_wrf_source_out; nic_src_o : out t_wrf_source_out;
-- PPS-related signal for NIC core -- PPS-related signal for NIC core
pps_p_i : in std_logic := '0'; pps_p_i : in std_logic := '0';
pps_valid_i : in std_logic := '0'; pps_valid_i : in std_logic := '0';
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- VIC ports (peripheral interrupts lines and global interrupt output) -- VIC ports (peripheral interrupts lines and global interrupt output)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
vic_irqs_i : in std_logic_vector(g_num_irqs-1 downto 0); vic_irqs_i : in std_logic_vector(g_num_irqs-1 downto 0);
vic_int_o : out std_logic; vic_int_o : out std_logic;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- TxTSU ports (Timestamp trigger and acknowlegdement signal) -- TxTSU ports (Timestamp trigger and acknowlegdement signal)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
txtsu_timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0); txtsu_timestamps_i : in t_txtsu_timestamp_array(g_num_ports-1 downto 0);
txtsu_timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0) txtsu_timestamps_ack_o : out std_logic_vector(g_num_ports -1 downto 0)
); );
end component; end component;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Constants -- Constants
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- SDB constants for NIC and TxTSU -- SDB constants for NIC and TxTSU
constant c_xwr_nic_sdb : t_sdb_device := ( constant c_xwr_nic_sdb : t_sdb_device := (
abi_class => x"0000", -- undocumented device abi_class => x"0000", -- undocumented device
abi_ver_major => x"01", abi_ver_major => x"01",
abi_ver_minor => x"01", abi_ver_minor => x"01",
wbd_endian => c_sdb_endian_big, wbd_endian => c_sdb_endian_big,
wbd_width => x"7", -- 8/16/32-bit port granularity wbd_width => x"7", -- 8/16/32-bit port granularity
sdb_component => ( sdb_component => (
addr_first => x"0000000000000000", addr_first => x"0000000000000000",
addr_last => x"000000000000ffff", -- I think this is overestimated (orig. 1ffff, wrsw_hdl. ffff) addr_last => x"000000000000ffff", -- I think this is overestimated (orig. 1ffff, wrsw_hdl. ffff)
product => ( product => (
vendor_id => x"000000000000CE42", -- CERN vendor_id => x"000000000000CE42", -- CERN
device_id => x"00000012", device_id => x"00000012",
version => x"00000001", version => x"00000001",
date => x"20000101", -- UNKNOWN date => x"20000101", -- UNKNOWN
name => "WR-NIC "))); name => "WR-NIC ")));
constant c_xwr_txtsu_sdb : t_sdb_device := ( constant c_xwr_txtsu_sdb : t_sdb_device := (
abi_class => x"0000", -- undocumented device abi_class => x"0000", -- undocumented device
abi_ver_major => x"01", abi_ver_major => x"01",
abi_ver_minor => x"01", abi_ver_minor => x"01",
wbd_endian => c_sdb_endian_big, wbd_endian => c_sdb_endian_big,
wbd_width => x"7", -- 8/16/32-bit port granularity wbd_width => x"7", -- 8/16/32-bit port granularity
sdb_component => ( sdb_component => (
addr_first => x"0000000000000000", addr_first => x"0000000000000000",
addr_last => x"00000000000000ff", addr_last => x"00000000000000ff",
product => ( product => (
vendor_id => x"000000000000CE42", -- CERN vendor_id => x"000000000000CE42", -- CERN
device_id => x"00000014", device_id => x"00000014",
version => x"00000001", version => x"00000001",
date => x"20120316", date => x"20120316",
name => "WR-TXTSU "))); name => "WR-TXTSU ")));
-- WB Crossbar constants -- WB Crossbar constants
constant c_NIC_WRAPPER_XBAR_REGISTERED : boolean := true; constant c_NIC_WRAPPER_XBAR_REGISTERED : boolean := true;
constant c_NIC_WRAPPER_XBAR_WRAPAROUND : boolean := true; constant c_NIC_WRAPPER_XBAR_WRAPAROUND : boolean := true;
constant c_NIC_WRAPPER_XBAR_NUM_MASTERS : integer := 1; constant c_NIC_WRAPPER_XBAR_NUM_MASTERS : integer := 1;
constant c_NIC_WRAPPER_XBAR_MASTER_EXT : integer := 0; constant c_NIC_WRAPPER_XBAR_MASTER_EXT : integer := 0;
...@@ -189,13 +189,13 @@ package wr_nic_wrapper_pkg is ...@@ -189,13 +189,13 @@ package wr_nic_wrapper_pkg is
-- Crossbar memory layout -- Crossbar memory layout
constant c_nic_wrapper_xbar_layout : t_sdb_record_array(c_NIC_WRAPPER_XBAR_NUM_SLAVES-1 downto 0) := ( constant c_nic_wrapper_xbar_layout : t_sdb_record_array(c_NIC_WRAPPER_XBAR_NUM_SLAVES-1 downto 0) := (
c_NIC_WRAPPER_XBAR_SLAVE_NIC => f_sdb_embed_device(c_xwr_nic_sdb , x"00000000"), c_NIC_WRAPPER_XBAR_SLAVE_NIC => f_sdb_embed_device(c_xwr_nic_sdb, x"00000000"),
c_NIC_WRAPPER_XBAR_SLAVE_VIC => f_sdb_embed_device(c_xwb_vic_sdb , x"00010000"), c_NIC_WRAPPER_XBAR_SLAVE_VIC => f_sdb_embed_device(c_xwb_vic_sdb, x"00010000"),
c_NIC_WRAPPER_XBAR_SLAVE_TXTSU => f_sdb_embed_device(c_xwr_txtsu_sdb , x"00010100") c_NIC_WRAPPER_XBAR_SLAVE_TXTSU => f_sdb_embed_device(c_xwr_txtsu_sdb, x"00010100")
); );
-- Crossbar SDB entry address -- Crossbar SDB entry address
constant c_nic_wrapper_xbar_sdb_address : t_wishbone_address := x"00011000"; constant c_nic_wrapper_xbar_sdb_address : t_wishbone_address := x"00011000";
constant c_nic_wrapper_xbar_bridge_sdb : t_sdb_bridge := constant c_nic_wrapper_xbar_bridge_sdb : t_sdb_bridge :=
f_xwb_bridge_layout_sdb(true, c_nic_wrapper_xbar_layout, c_nic_wrapper_xbar_sdb_address); f_xwb_bridge_layout_sdb(true, c_nic_wrapper_xbar_layout, c_nic_wrapper_xbar_sdb_address);
end wr_nic_wrapper_pkg; end wr_nic_wrapper_pkg;
......
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