Skip to content

D
DDR3 controller for Spartan6
Commit bd06069f authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

hdl: add separate reset lines for WB interfaces, review reset logic, solves #214

parent e4d6755c
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 20 deletions
hdl/rtl/ddr3_ctrl.vhd
View file @ bd06069f
...@@ -136,6 +136,8 @@ entity ddr3_ctrl is ...@@ -136,6 +136,8 @@ entity ddr3_ctrl is
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
-- Wishbone bus - Port 0 -- Wishbone bus - Port 0
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--! Wishbone bus reset
wb0_rst_n_i : in std_logic;
--! Wishbone bus clock --! Wishbone bus clock
wb0_clk_i : in std_logic; wb0_clk_i : in std_logic;
--! Wishbone bus byte select --! Wishbone bus byte select
...@@ -188,6 +190,8 @@ entity ddr3_ctrl is ...@@ -188,6 +190,8 @@ entity ddr3_ctrl is
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
-- Wishbone bus - Port 1 -- Wishbone bus - Port 1
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--! Wishbone bus reset
wb1_rst_n_i : in std_logic;
--! Wishbone bus clock --! Wishbone bus clock
wb1_clk_i : in std_logic; wb1_clk_i : in std_logic;
--! Wishbone bus byte select --! Wishbone bus byte select
...@@ -456,7 +460,7 @@ begin ...@@ -456,7 +460,7 @@ begin
g_DATA_PORT_SIZE => g_P0_DATA_PORT_SIZE g_DATA_PORT_SIZE => g_P0_DATA_PORT_SIZE
) )
port map( port map(
rst_n_i => rst_n_i, rst_n_i => wb0_rst_n_i,
ddr_cmd_clk_o => p0_cmd_clk, ddr_cmd_clk_o => p0_cmd_clk,
ddr_cmd_en_o => p0_cmd_en, ddr_cmd_en_o => p0_cmd_en,
ddr_cmd_instr_o => p0_cmd_instr, ddr_cmd_instr_o => p0_cmd_instr,
...@@ -503,7 +507,7 @@ begin ...@@ -503,7 +507,7 @@ begin
g_DATA_PORT_SIZE => g_P1_DATA_PORT_SIZE g_DATA_PORT_SIZE => g_P1_DATA_PORT_SIZE
) )
port map( port map(
rst_n_i => rst_n_i, rst_n_i => wb1_rst_n_i,
ddr_cmd_clk_o => p1_cmd_clk, ddr_cmd_clk_o => p1_cmd_clk,
ddr_cmd_en_o => p1_cmd_en, ddr_cmd_en_o => p1_cmd_en,
ddr_cmd_instr_o => p1_cmd_instr, ddr_cmd_instr_o => p1_cmd_instr,
......
hdl/rtl/ddr3_ctrl_pkg.vhd
View file @ bd06069f
...@@ -140,6 +140,8 @@ package ddr3_ctrl_pkg is ...@@ -140,6 +140,8 @@ package ddr3_ctrl_pkg is
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
-- Wishbone bus - Port 0 -- Wishbone bus - Port 0
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--! Wishbone bus reset
wb0_rst_n_i : in std_logic;
--! Wishbone bus clock --! Wishbone bus clock
wb0_clk_i : in std_logic; wb0_clk_i : in std_logic;
--! Wishbone bus byte select --! Wishbone bus byte select
...@@ -190,6 +192,8 @@ package ddr3_ctrl_pkg is ...@@ -190,6 +192,8 @@ package ddr3_ctrl_pkg is
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
-- Wishbone bus - Port 1 -- Wishbone bus - Port 1
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--! Wishbone bus reset
wb1_rst_n_i : in std_logic;
--! Wishbone bus clock --! Wishbone bus clock
wb1_clk_i : in std_logic; wb1_clk_i : in std_logic;
--! Wishbone bus byte select --! Wishbone bus byte select
......
hdl/rtl/ddr3_ctrl_wb.vhd
View file @ bd06069f
...@@ -138,7 +138,6 @@ architecture rtl of ddr3_ctrl_wb is ...@@ -138,7 +138,6 @@ architecture rtl of ddr3_ctrl_wb is
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Signals declaration -- Signals declaration
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
signal rst_n : std_logic;
signal wb_cyc_d : std_logic; signal wb_cyc_d : std_logic;
signal wb_cyc_f_edge : std_logic; signal wb_cyc_f_edge : std_logic;
...@@ -174,16 +173,6 @@ begin ...@@ -174,16 +173,6 @@ begin
-- Wishbone interface -- Wishbone interface
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Reset sync to wishbone clock
p_rst_sync : process (rst_n_i, wb_clk_i)
begin
if (rst_n_i = '0') then
rst_n <= '0';
elsif rising_edge(wb_clk_i) then
rst_n <= '1';
end if;
end process p_rst_sync;
-- Clocking -- Clocking
ddr_cmd_clk_o <= wb_clk_i; ddr_cmd_clk_o <= wb_clk_i;
ddr_wr_clk_o <= wb_clk_i; ddr_wr_clk_o <= wb_clk_i;
...@@ -196,7 +185,7 @@ begin ...@@ -196,7 +185,7 @@ begin
p_wb_cyc_f_edge : process (wb_clk_i) p_wb_cyc_f_edge : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
wb_cyc_d <= '0'; wb_cyc_d <= '0';
wb_stb_d <= '0'; wb_stb_d <= '0';
wb_we_d <= '0'; wb_we_d <= '0';
...@@ -217,7 +206,7 @@ begin ...@@ -217,7 +206,7 @@ begin
p_ddr_inputs : process (wb_clk_i) p_ddr_inputs : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
ddr_wr_data <= (others => '0'); ddr_wr_data <= (others => '0');
ddr_wr_en <= '0'; ddr_wr_en <= '0';
else else
...@@ -236,7 +225,7 @@ begin ...@@ -236,7 +225,7 @@ begin
p_ddr_cmd : process (wb_clk_i) p_ddr_cmd : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
ddr_cmd_byte_addr <= (others => '0'); ddr_cmd_byte_addr <= (others => '0');
ddr_cmd_instr <= "000"; ddr_cmd_instr <= "000";
ddr_cmd_bl <= (others => '0'); ddr_cmd_bl <= (others => '0');
...@@ -259,7 +248,7 @@ begin ...@@ -259,7 +248,7 @@ begin
p_ddr_cmd_en : process (wb_clk_i) p_ddr_cmd_en : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
ddr_cmd_en <= '0'; ddr_cmd_en <= '0';
ddr_cmd_en_d <= '0'; ddr_cmd_en_d <= '0';
else else
...@@ -282,7 +271,7 @@ begin ...@@ -282,7 +271,7 @@ begin
p_ddr_burst_cnt : process (wb_clk_i) p_ddr_burst_cnt : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
ddr_burst_cnt <= (others => '0'); ddr_burst_cnt <= (others => '0');
else else
if (wb_cyc_f_edge = '1') then if (wb_cyc_f_edge = '1') then
...@@ -307,7 +296,7 @@ begin ...@@ -307,7 +296,7 @@ begin
p_ddr_outputs : process (wb_clk_i) p_ddr_outputs : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
wb_ack_o <= '0'; wb_ack_o <= '0';
wb_data_o <= (others => '0'); wb_data_o <= (others => '0');
else else
...@@ -327,7 +316,7 @@ begin ...@@ -327,7 +316,7 @@ begin
p_ddr_stall : process (wb_clk_i) p_ddr_stall : process (wb_clk_i)
begin begin
if rising_edge(wb_clk_i) then if rising_edge(wb_clk_i) then
if (rst_n = '0') then if (rst_n_i = '0') then
wb_stall_o <= '0'; wb_stall_o <= '0';
else else
if ((ddr_wr_count_i > c_FIFO_ALMOST_FULL) or if ((ddr_wr_count_i > c_FIFO_ALMOST_FULL) or
......
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