From ec2cfeff21a6080cccf3d0f6d4be60a13915ff23 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Thu, 11 Nov 2021 11:41:36 +0100
Subject: [PATCH] fixed bug in common_areset and synchronized reset signals in
ip_arria10_e1sg_jesd204b.vhd
---
.../base/common/src/vhdl/common_areset.vhd | 5 +-
.../jesd204b/ip_arria10_e1sg_jesd204b.vhd | 65 ++++++++++++++-----
2 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/libraries/base/common/src/vhdl/common_areset.vhd b/libraries/base/common/src/vhdl/common_areset.vhd
index 85f4645d1e..80f32970ac 100644
--- a/libraries/base/common/src/vhdl/common_areset.vhd
+++ b/libraries/base/common/src/vhdl/common_areset.vhd
@@ -45,7 +45,7 @@ END;
ARCHITECTURE str OF common_areset IS
CONSTANT c_rst_level_n : STD_LOGIC := NOT g_rst_level;
-
+ SIGNAL i_rst : STD_LOGIC;
BEGIN
-- When in_rst becomes g_rst_level then out_rst follows immediately (asynchronous reset apply).
@@ -55,13 +55,14 @@ BEGIN
-- . g_rst_level = '0': output asynchronoulsy follows the falling edge input and synchronises the rising edge input.
-- . g_rst_level = '1': output asynchronoulsy follows the rising edge input and synchronises the falling edge input.
+ i_rst <= NOT in_rst WHEN g_rst_level = '0' ELSE in_rst;
u_async : ENTITY work.common_async
GENERIC MAP (
g_rst_level => g_rst_level,
g_delay_len => g_delay_len
)
PORT MAP (
- rst => in_rst,
+ rst => i_rst,
clk => clk,
din => c_rst_level_n,
dout => out_rst
diff --git a/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd b/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd
index e1570a8bb2..5532ed3cbf 100644
--- a/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd
+++ b/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd
@@ -102,10 +102,13 @@ ARCHITECTURE str OF ip_arria10_e1sg_jesd204b IS
SIGNAL rx_csr_lane_powerdown_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL xcvr_rst_ctrl_rx_ready_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL rx_xcvr_ready_in_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
+ SIGNAL pll_reset_async_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL pll_reset_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL xcvr_rst_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0) := (OTHERS => '1');
SIGNAL rx_avs_rst_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
+ SIGNAL rxlink_rst_async_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL rxlink_rst_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
+ SIGNAL rxframe_rst_async_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL rxframe_rst_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL rx_avs_rst_n_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL rxlink_rst_n_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
@@ -326,16 +329,43 @@ BEGIN
reset2_dsrt_qual => '1', -- Tied to '1' in example design. Tx xcvr is not used.
reset5_dsrt_qual => rx_xcvr_ready_in_arr(i),
reset_in0 => mm_rst,
- reset_out0 => pll_reset_arr(i), -- Use channel 0 to reset the core pll
+ reset_out0 => pll_reset_async_arr(i), -- Use channel 0 to reset the core pll
reset_out1 => xcvr_rst_arr(i), -- Use channel 1 to reset the transceiver reset controller
reset_out2 => open,
reset_out3 => open,
reset_out4 => open,
- reset_out5 => rx_avs_rst_arr(i),
- reset_out6 => rxlink_rst_arr(i),
- reset_out7 => rxframe_rst_arr(i)
+ reset_out5 => rx_avs_rst_arr(i), -- mm_clk domain
+ reset_out6 => rxlink_rst_async_arr(i),
+ reset_out7 => rxframe_rst_async_arr(i)
);
+ -- synchronize pll_reset
+ u_common_areset_pll : ENTITY common_lib.common_areset
+ PORT MAP (
+ in_rst => pll_reset_async_arr(i),
+ clk => jesd204b_refclk,
+ out_rst => pll_reset_arr(i)
+ );
+
+ -- No need to synchronize xcvr_rst as it is synchronized in ip_arria10_e1sg_jesd204b_rx_xcvr_reset_control_12
+
+ -- synchronize rxlink reset
+ u_common_areset_rxlink : ENTITY common_lib.common_areset
+ PORT MAP (
+ in_rst => rxlink_rst_async_arr(i),
+ clk => rxlink_clk,
+ out_rst => rxlink_rst_arr(i)
+ );
+
+ -- synchronize rxframe reset
+ u_common_areset_rxframe : ENTITY common_lib.common_areset
+ PORT MAP (
+ in_rst => rxframe_rst_async_arr(i),
+ clk => rxframe_clk,
+ out_rst => rxframe_rst_arr(i)
+ );
+
+
rx_xcvr_ready_in_arr(i) <= '1' when rx_csr_lane_powerdown_arr(i)='1' OR xcvr_rst_ctrl_rx_ready_arr(i)='1' else '0';
-- Invert thr active-low resets
@@ -432,25 +462,24 @@ BEGIN
);
END GENERATE;
- p_pll_locked_reg : PROCESS (mm_rst, mm_clk)
- BEGIN
- IF mm_rst = '1' THEN
- core_pll_locked_reg <= '0';
- ELSE
- IF rising_edge(mm_clk) THEN
- core_pll_locked_reg <= core_pll_locked;
- END IF;
- END IF;
- END PROCESS;
-
+ u_common_areset_pll_locked : ENTITY common_lib.common_areset
+ GENERIC MAP (
+ g_rst_level => '0' -- synchronises the rising edge input.
+ )
+ PORT MAP (
+ in_rst => core_pll_locked,
+ clk => mm_clk,
+ out_rst => core_pll_locked_reg
+ );
+
-- Transceiver reset controller. Use g_nof_streams out of 12 channels. Receive only
- -- Clock set to 100MHz (use mm_clk)
+ -- Clock set to 100MHz (use rxlink_clk)
u_ip_arria10_e1sg_jesd204b_rx_xcvr_reset_control : ip_arria10_e1sg_jesd204b_rx_xcvr_reset_control_12
PORT MAP (
- clock => mm_clk,
- reset => xcvr_rst_arr(0), -- From Reset Sequencer output1 as per example design
+ clock => rxlink_clk,
+ reset => xcvr_rst_arr(0), -- From Reset Sequencer output1 as per example design, the reset input is synchronised internally.
rx_analogreset => rx_analogreset_arr, -- output to reset RX PMA. Release before deasserting link and avs resets (Intel JESD204B-UG p70)
rx_cal_busy => rx_cal_busy_arr, -- input from PHY
rx_digitalreset => rx_digitalreset_arr, -- output to reset RX PCS. Release before deasserting link and avs resets (Intel JESD204B-UG p70)
--
GitLab