Skip to content
Snippets Groups Projects
Commit 259b0114 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files

greg_counters: make rmon of PCS output only (not inout anymore)

parent afeb09d3
No related merge requests found
...@@ -152,7 +152,7 @@ package endpoint_private_pkg is ...@@ -152,7 +152,7 @@ package endpoint_private_pkg is
serdes_rx_k_i : in std_logic; serdes_rx_k_i : in std_logic;
serdes_rx_enc_err_i : in std_logic; serdes_rx_enc_err_i : in std_logic;
serdes_rx_bitslide_i : in std_logic_vector(3 downto 0); serdes_rx_bitslide_i : in std_logic_vector(3 downto 0);
rmon_o : inout t_rmon_triggers; rmon_o : out t_rmon_triggers;
mdio_addr_i : in std_logic_vector(15 downto 0); mdio_addr_i : in std_logic_vector(15 downto 0);
mdio_data_i : in std_logic_vector(15 downto 0); mdio_data_i : in std_logic_vector(15 downto 0);
mdio_data_o : out std_logic_vector(15 downto 0); mdio_data_o : out std_logic_vector(15 downto 0);
......
...@@ -112,8 +112,8 @@ entity ep_1000basex_pcs is ...@@ -112,8 +112,8 @@ entity ep_1000basex_pcs is
-- 1-pulse: TX timestamp trigger (to timestamping unit). -- 1-pulse: TX timestamp trigger (to timestamping unit).
txpcs_timestamp_trigger_p_a_o : out std_logic; txpcs_timestamp_trigger_p_a_o : out std_logic;
link_ok_o : out std_logic; link_ok_o : out std_logic;
link_ctr_i : in std_logic; link_ctr_i : in std_logic;
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- GTP/GTX/TBI Serdes interface -- GTP/GTX/TBI Serdes interface
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
...@@ -167,8 +167,8 @@ entity ep_1000basex_pcs is ...@@ -167,8 +167,8 @@ entity ep_1000basex_pcs is
serdes_rx_enc_err_i : in std_logic; serdes_rx_enc_err_i : in std_logic;
serdes_rx_bitslide_i : in std_logic_vector(4 downto 0); serdes_rx_bitslide_i : in std_logic_vector(4 downto 0);
-- RMON statistic counters -- RMON events, aligned to clk_sys
rmon_o : inout t_rmon_triggers; rmon_o : out t_rmon_triggers;
-- MDIO interface -- MDIO interface
...@@ -407,10 +407,10 @@ architecture rtl of ep_1000basex_pcs is ...@@ -407,10 +407,10 @@ architecture rtl of ep_1000basex_pcs is
signal tx_clk, rx_clk : std_logic; signal tx_clk, rx_clk : std_logic;
--RMON events --RMON events
signal rmon_tx_underrun : std_logic; signal rmon_tx_underrun : std_logic;
signal rmon_rx_overrun : std_logic; signal rmon_rx_overrun : std_logic;
signal rmon_rx_inv_code : std_logic; signal rmon_rx_inv_code : std_logic;
signal rmon_rx_sync_lost : std_logic; signal rmon_rx_sync_lost: std_logic;
begin -- rtl begin -- rtl
...@@ -469,9 +469,9 @@ begin -- rtl ...@@ -469,9 +469,9 @@ begin -- rtl
an_rx_valid_o => an_rx_valid, an_rx_valid_o => an_rx_valid,
an_idle_match_o => an_idle_match, an_idle_match_o => an_idle_match,
rmon_rx_overrun => rmon_rx_overrun, rmon_rx_overrun => rmon_rx_overrun,
rmon_rx_inv_code => rmon_rx_inv_code, rmon_rx_inv_code => rmon_rx_inv_code,
rmon_rx_sync_lost => rmon_rx_sync_lost, rmon_rx_sync_lost=> rmon_rx_sync_lost,
phy_rx_clk_i => serdes_rx_clk_i, phy_rx_clk_i => serdes_rx_clk_i,
phy_rx_data_i => serdes_rx_data_i, phy_rx_data_i => serdes_rx_data_i,
...@@ -539,9 +539,9 @@ begin -- rtl ...@@ -539,9 +539,9 @@ begin -- rtl
an_rx_valid_o => an_rx_valid, an_rx_valid_o => an_rx_valid,
an_idle_match_o => an_idle_match, an_idle_match_o => an_idle_match,
rmon_rx_overrun => rmon_rx_overrun, rmon_rx_overrun => rmon_rx_overrun,
rmon_rx_inv_code => rmon_rx_inv_code, rmon_rx_inv_code => rmon_rx_inv_code,
rmon_rx_sync_lost => rmon_rx_sync_lost, rmon_rx_sync_lost=> rmon_rx_sync_lost,
phy_rx_clk_i => serdes_rx_clk_i, phy_rx_clk_i => serdes_rx_clk_i,
phy_rx_data_i => serdes_rx_data_i(7 downto 0), phy_rx_data_i => serdes_rx_data_i(7 downto 0),
...@@ -554,8 +554,8 @@ begin -- rtl ...@@ -554,8 +554,8 @@ begin -- rtl
txpcs_busy_o <= txpcs_busy_int; txpcs_busy_o <= txpcs_busy_int;
-- to enable killing of link (by ML) -- to enable killing of link (by ML)
mdio_mcr_pdown <= mdio_mcr_pdown_cpu or (not link_ctr_i); mdio_mcr_pdown <= mdio_mcr_pdown_cpu or (not link_ctr_i);
serdes_rst_o <= (not pcs_reset_n) or mdio_mcr_pdown; serdes_rst_o <= (not pcs_reset_n) or mdio_mcr_pdown;
mdio_wr_spec_bslide <= serdes_rx_bitslide_i(4 downto 0); mdio_wr_spec_bslide <= serdes_rx_bitslide_i(4 downto 0);
...@@ -681,7 +681,7 @@ begin -- rtl ...@@ -681,7 +681,7 @@ begin -- rtl
serdes_loopen_o <= mdio_mcr_loopback; serdes_loopen_o <= mdio_mcr_loopback;
--RMON events --RMON events
U_sync_tx_underrun : gc_sync_ffs U_sync_tx_underrun: gc_sync_ffs
generic map ( generic map (
g_sync_edge => "positive") g_sync_edge => "positive")
port map ( port map (
...@@ -692,7 +692,7 @@ begin -- rtl ...@@ -692,7 +692,7 @@ begin -- rtl
npulse_o => open, npulse_o => open,
ppulse_o => rmon_o.tx_underrun); ppulse_o => rmon_o.tx_underrun);
U_sync_rx_overrun : gc_sync_ffs U_sync_rx_overrun: gc_sync_ffs
generic map ( generic map (
g_sync_edge => "positive") g_sync_edge => "positive")
port map ( port map (
...@@ -703,7 +703,7 @@ begin -- rtl ...@@ -703,7 +703,7 @@ begin -- rtl
npulse_o => open, npulse_o => open,
ppulse_o => rmon_o.rx_overrun); ppulse_o => rmon_o.rx_overrun);
U_sync_rx_inv_code : gc_sync_ffs U_sync_rx_inv_code: gc_sync_ffs
generic map ( generic map (
g_sync_edge => "positive") g_sync_edge => "positive")
port map ( port map (
...@@ -714,7 +714,7 @@ begin -- rtl ...@@ -714,7 +714,7 @@ begin -- rtl
npulse_o => open, npulse_o => open,
ppulse_o => rmon_o.rx_invalid_code); ppulse_o => rmon_o.rx_invalid_code);
U_sync_rx_sync_lost : gc_sync_ffs U_sync_rx_sync_lost: gc_sync_ffs
generic map ( generic map (
g_sync_edge => "positive") g_sync_edge => "positive")
port map ( port map (
......
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