Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified DDR_CTRL state machine as exact copy of Fredi's HDL original

Browse Source
This commit is contained in:
Markus Fröschle
2014-12-28 10:01:08 +00:00
parent c90e9e1b8c
commit 51d9e1f5f6
3 changed files with 120 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vhdl/backend/Altera/Firebee/firebee.qsf
View File

@@ -695,5 +695,5 @@ set_global_assignment -name VHDL_FILE ../../../rtl/vhdl/Firebee/altpll1.vhd
set_global_assignment -name SOURCE_FILE ../../../rtl/vhdl/Firebee/altpll1.cmp set_global_assignment -name SOURCE_FILE ../../../rtl/vhdl/Firebee/altpll1.cmp
set_global_assignment -name VHDL_FILE ../../../rtl/vhdl/Firebee/Firebee_pkg.vhd set_global_assignment -name VHDL_FILE ../../../rtl/vhdl/Firebee/Firebee_pkg.vhd
set_global_assignment -name QIP_FILE ../../../rtl/vhdl/Firebee/altpll_reconfig1.qip set_global_assignment -name QIP_FILE ../../../rtl/vhdl/Firebee/altpll_reconfig1.qip
set_global_assignment -name VHDL_FILE ../../../rtl/vhdl/io_register.vhd set_global_assignment -name EDA_RUN_TOOL_AUTOMATICALLY OFF -section_id eda_simulation
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

209
vhdl/rtl/vhdl/DDR/DDR_CTRL.vhd
View File

@@ -78,7 +78,7 @@ ENTITY ddr_ctrl IS
SR_DDR_WR : OUT std_logic; SR_DDR_WR : OUT std_logic;
SR_DDRWR_D_SEL : OUT std_logic; SR_DDRWR_D_SEL : OUT std_logic;
SR_VDMP : OUT std_logic_vector(7 DOWNTO 0); SR_VDMP : OUT std_logic_vector(7 DOWNTO 0);
VIDEO_DDR_TA : OUT std_logic; video_ddr_ta : OUT std_logic;
SR_BLITTER_DACK : OUT std_logic; SR_BLITTER_DACK : OUT std_logic;
BA : OUT std_logic_vector(1 DOWNTO 0); BA : OUT std_logic_vector(1 DOWNTO 0);
DDRWR_D_SEL1 : OUT std_logic; DDRWR_D_SEL1 : OUT std_logic;
@@ -96,18 +96,16 @@ ARCHITECTURE behaviour OF ddr_ctrl IS
CONSTANT FIFO_MWM : unsigned(8 DOWNTO 0) := 9D"200"; -- 200. CONSTANT FIFO_MWM : unsigned(8 DOWNTO 0) := 9D"200"; -- 200.
CONSTANT FIFO_HWM : unsigned(8 DOWNTO 0) := 9D"500"; -- 500. CONSTANT FIFO_HWM : unsigned(8 DOWNTO 0) := 9D"500"; -- 500.
type ACCESS_WIDTH_TYPE is(LONG, WORD, BYTE);
type DDR_ACCESS_TYPE is(CPU, FIFO, BLITTER, NONE); type DDR_ACCESS_TYPE is(CPU, FIFO, BLITTER, NONE);
type FB_REGDDR_TYPE is(FR_WAIT,FR_S0,FR_S1,FR_S2,FR_S3); type FB_REGDDR_TYPE is(FR_WAIT,FR_S0,FR_S1,FR_S2,FR_S3);
type DDR_SM_TYPE is(DS_T1, DS_T2A, DS_T2B, DS_T3, DS_N5, DS_N6, DS_N7, DS_N8, -- Start (normal 8 cycles total = 60ns). type DDR_SM_TYPE is(DS_T1, DS_T2A, DS_T2B, DS_T3, DS_N5, DS_N6, DS_N7, DS_N8, -- Start (normal 8 cycles total = 60ns).
DS_C2, DS_C3, DS_C4, DS_C5, DS_C6, DS_C7, -- Configuration. DS_C2, DS_C3, DS_C4, DS_C5, DS_C6, DS_C7, -- Configuration.
DS_T4R, DS_T5R, -- Read CPU or BLITTER. DS_T4R, DS_T5R, -- Read CPU or BLITTER.
DS_T4W, DS_T5W, DS_T6W, DS_T7W, DS_T8W, DS_T9W, -- Write CPU or BLITTER. DS_T4W, DS_T5W, DS_T6W, DS_T7W, DS_T8W, DS_T9W, -- Write CPU or BLITTER.
DS_T4F, DS_T5F, DS_T6F, DS_T7F, DS_T8F, DS_T9F, DS_T10F, -- Read FIFO. DS_T4F, DS_T5F, DS_T6F, DS_T7F, DS_T8F, DS_T9F, DS_T10F, -- Read FIFO.
DS_CB6, DS_CB8, -- Close FIFO bank. DS_CB6, DS_CB8, -- Close FIFO bank.
DS_R2, DS_R3, DS_R4, DS_R5, DS_R6); -- Refresh: 10 x 7.5ns = 75ns. DS_R2, DS_R3, DS_R4, DS_R5, DS_R6); -- Refresh: 10 x 7.5ns = 75ns.
signal ACCESS_WIDTH : ACCESS_WIDTH_TYPE;
signal FB_REGDDR : FB_REGDDR_TYPE; signal FB_REGDDR : FB_REGDDR_TYPE;
signal FB_REGDDR_NEXT : FB_REGDDR_TYPE; signal FB_REGDDR_NEXT : FB_REGDDR_TYPE;
signal DDR_ACCESS : DDR_ACCESS_TYPE; signal DDR_ACCESS : DDR_ACCESS_TYPE;
@@ -170,107 +168,122 @@ ARCHITECTURE behaviour OF ddr_ctrl IS
signal VA_P : std_logic_vector(12 DOWNTO 0); signal VA_P : std_logic_vector(12 DOWNTO 0);
signal BA_S : std_logic_vector(1 DOWNTO 0) ; signal BA_S : std_logic_vector(1 DOWNTO 0) ;
signal BA_P : std_logic_vector(1 DOWNTO 0); signal BA_P : std_logic_vector(1 DOWNTO 0);
signal TSIZ : std_logic_vector(1 DOWNTO 0); SIGNAL line : std_logic;
begin begin
TSIZ <= FB_SIZE1 & FB_SIZE0; line <= fb_size1 AND fb_size0;
with TSIZ select
ACCESS_WIDTH <= LONG when "11",
WORD when "00",
BYTE when others;
-- Byte selectors: -- Byte selectors (changed to literal copy of Fredi's code):
BYTE_SEL(0) <= '1' when ACCESS_WIDTH = LONG or ACCESS_WIDTH = WORD else byte_sel(0) <= '1' WHEN fb_adr(1 DOWNTO 0) = "00" OR
'1' when FB_ADR(1 DOWNTO 0) = "00" else '0'; -- Byte 0. (?? (fb_size1 AND fb_size0)) OR
(?? (NOT fb_size1 AND NOT fb_size0))
ELSE '0';
BYTE_SEL(1) <= '1' when ACCESS_WIDTH = LONG or ACCESS_WIDTH = WORD else byte_sel(1) <= '1' WHEN fb_adr(1 DOWNTO 0) = "01" OR
'1' when ACCESS_WIDTH = BYTE and FB_ADR(1) = '0' else -- High word. (?? (fb_size1 AND NOT fb_size0 AND NOT fb_adr(1))) OR
'1' when FB_ADR(1 DOWNTO 0) = "01" else '0'; -- Byte 1. (?? (fb_size1 AND fb_size0)) OR
(?? (NOT fb_size1 AND NOT fb_size0))
ELSE '0';
BYTE_SEL(2) <= '1' when ACCESS_WIDTH = LONG or ACCESS_WIDTH = WORD else byte_sel(2) <= '1' WHEN fb_adr(1 DOWNTO 0) = "10" OR
'1' when FB_ADR(1 DOWNTO 0) = "10" else '0'; -- Byte 2. (??(fb_size1 AND fb_size0)) OR
(??(NOT fb_size1 AND NOT fb_size0))
BYTE_SEL(3) <= '1' when ACCESS_WIDTH = LONG or ACCESS_WIDTH = WORD else ELSE '0';
'1' when ACCESS_WIDTH = BYTE and FB_ADR(1) = '1' else -- Low word. byte_sel(3) <= '1' WHEN fb_adr(1 DOWNTO 0) = "11" OR
'1' when FB_ADR(1 DOWNTO 0) = "11" else '0'; -- Byte 3. (??(fb_size1 AND NOT fb_size0 AND fb_adr(1))) OR
(??(fb_size1 AND fb_size0)) OR
(??(NOT fb_size1 AND NOT fb_size0))
ELSE '0';
--------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------ CPU READ (REG DDR => CPU) AND WRITE (CPU => REG DDR) --------------------------------------------------------------------- ------------------------------------ CPU READ (REG DDR => CPU) AND WRITE (CPU => REG DDR) ---------------------------------------------------------------------
FBCTRL_REG: process fbctrl_reg : PROCESS
begin BEGIN
wait until CLK_MAIN = '1' and CLK_MAIN' event; WAIT UNTIL rising_edge(clk_main);
FB_REGDDR <= FB_REGDDR_NEXT; fb_regddr <= fb_regddr_next;
end process FBCTRL_REG; END PROCESS fbctrl_reg;
fbctrl_dec : PROCESS(ALL)
BEGIN
-- avoid latches - assign defaults
bus_cyc_end <= '0';
video_ddr_ta <= '0';
fb_vdoe(3 DOWNTO 0) <= "0000";
fb_le(3 DOWNTO 0) <= "0000";
-- mfro: replaced with literal copy of Fredi's original
FBCTRL_DEC: process(FB_REGDDR, BUS_CYC, DDR_SEL, ACCESS_WIDTH, fb_wr_n, DDR_CS)
begin
case FB_REGDDR is case FB_REGDDR is
when FR_WAIT => WHEN FR_WAIT =>
if BUS_CYC = '1' then fb_le(0) <= NOT fb_wr_n;
FB_REGDDR_NEXT <= FR_S0; IF bus_cyc = '1' OR (??(ddr_sel AND line AND NOT fb_wr_n)) THEN
elsif DDR_SEL = '1' and ACCESS_WIDTH = LONG and fb_wr_n = '0' then fb_regddr_next <= FR_S0;
FB_REGDDR_NEXT <= FR_S0; ELSE
else fb_regddr_next <= FR_WAIT;
FB_REGDDR_NEXT <= FR_WAIT; END IF;
end if;
when FR_S0 =>
if DDR_CS = '1' and ACCESS_WIDTH = LONG then
FB_REGDDR_NEXT <= FR_S1;
else
FB_REGDDR_NEXT <= FR_WAIT;
end if;
when FR_S1 =>
if DDR_CS = '1' then
FB_REGDDR_NEXT <= FR_S2;
else
FB_REGDDR_NEXT <= FR_WAIT;
end if;
when FR_S2 =>
if DDR_CS = '1' and BUS_CYC = '0' and ACCESS_WIDTH = LONG and fb_wr_n = '0' then -- Eventually wait during long word access.
FB_REGDDR_NEXT <= FR_S2;
elsif DDR_CS = '1' then
FB_REGDDR_NEXT <= FR_S3;
else
FB_REGDDR_NEXT <= FR_WAIT;
end if;
when FR_S3 =>
FB_REGDDR_NEXT <= FR_WAIT;
end case;
end process FBCTRL_DEC;
-- Coldfire CPU access: WHEN FR_S0 =>
FB_LE(0) <= not fb_wr_n when FB_REGDDR = FR_WAIT else IF ddr_cs THEN
not fb_wr_n when FB_REGDDR = FR_S0 and DDR_CS = '1' else '0'; fb_le(0) <= NOT fb_wr_n;
FB_LE(1) <= not fb_wr_n when FB_REGDDR = FR_S1 and DDR_CS = '1' else '0'; video_ddr_ta <= '1';
FB_LE(2) <= not fb_wr_n when FB_REGDDR = FR_S2 and DDR_CS = '1' else '0'; IF line THEN
FB_LE(3) <= not fb_wr_n when FB_REGDDR = FR_S3 and DDR_CS = '1' else '0'; fb_vdoe(0) <= NOT fb_oe_n AND NOT ddr_config;
fb_regddr_next <= FR_S1;
ELSE
bus_cyc_end <= '1';
fb_vdoe(0) <= NOT fb_oe_n AND NOT clk_main AND NOT ddr_config;
fb_regddr_next <= FR_S0;
END IF;
ELSE
fb_regddr_next <= FR_WAIT;
END IF;
-- Video data access: WHEN FR_S1 =>
VIDEO_DDR_TA <= '1' when FB_REGDDR = FR_S0 and DDR_CS = '1' else IF ddr_cs THEN
'1' when FB_REGDDR = FR_S1 and DDR_CS = '1' else fb_vdoe(1) <= NOT fb_oe_n AND NOT ddr_config;
'1' when FB_REGDDR = FR_S2 and FB_REGDDR_NEXT = FR_S3 else fb_le(1) <= NOT fb_wr_n;
'1' when FB_REGDDR = FR_S3 and DDR_CS = '1' else '0'; video_ddr_ta <= '1';
fb_regddr_next <= FR_S2;
ELSE
fb_regddr_next <= FR_WAIT;
END IF;
-- FB_VDOE # VIDEO_OE. WHEN FR_S2 =>
-- Write access for video data: IF ddr_cs THEN
FB_VDOE(0) <= '1' when FB_REGDDR = FR_S0 and DDR_CS = '1' and fb_oe_n = '0' and DDR_CONFIG = '0' and ACCESS_WIDTH = LONG else fb_vdoe(2) <= NOT fb_oe_n AND NOT ddr_config;
'1' when FB_REGDDR = FR_S0 and DDR_CS = '1' and fb_oe_n = '0' and DDR_CONFIG = '0' and ACCESS_WIDTH /= LONG and CLK_MAIN = '0' else '0'; fb_le(2) <= NOT fb_wr_n;
FB_VDOE(1) <= '1' when FB_REGDDR = FR_S1 and DDR_CS = '1' and fb_oe_n = '0' and DDR_CONFIG = '0' else '0'; IF NOT bus_cyc AND line AND NOT fb_wr_n THEN
FB_VDOE(2) <= '1' when FB_REGDDR = FR_S2 and DDR_CS = '1' and fb_oe_n = '0' and DDR_CONFIG = '0' else '0'; fb_regddr_next <= FR_S2;
FB_VDOE(3) <= '1' when FB_REGDDR = FR_S3 and DDR_CS = '1' and fb_oe_n = '0' and DDR_CONFIG = '0' and CLK_MAIN = '0' else '0'; video_ddr_ta <= '0'; -- mfro: ???
ELSE
video_ddr_ta <= '1';
fb_regddr_next <= FR_S3;
END IF;
ELSE
fb_regddr_next <= FR_WAIT;
END IF;
BUS_CYC_END <= '1' when FB_REGDDR = FR_S0 and DDR_CS = '1' and ACCESS_WIDTH /= LONG else WHEN FR_S3 =>
'1' when FB_REGDDR = FR_S3 and DDR_CS = '1' else '0'; IF ddr_cs THEN
fb_vdoe(3) <= NOT fb_oe_n AND NOT clk_main AND NOT ddr_config;
fb_le(3) <= NOT fb_wr_n;
video_ddr_ta <= '1';
bus_cyc_end <= '1';
fb_regddr_next <= FR_WAIT;
ELSE
fb_regddr_next <= FR_WAIT;
END IF;
END CASE;
END PROCESS fbctrl_dec;
--------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------ DDR State Machine -------------------------------------------------------------------------------------- ------------------------------------------------------ DDR State Machine --------------------------------------------------------------------------------------
DDR_STATE_REG: process ddr_state_reg : PROCESS
begin BEGIN
wait until DDRCLK0 = '1' and DDRCLK0' event; WAIT UNTIL rising_edge(ddrclk0);
DDR_STATE <= DDR_NEXT_STATE; ddr_state <= ddr_next_state;
end process DDR_STATE_REG; END PROCESS ddr_state_reg;
DDR_STATE_DEC: process(DDR_STATE, DDR_REFRESH_REQ, CPU_DDR_SYNC, DDR_CONFIG, fb_wr_n, DDR_ACCESS, BLITTER_WR, FIFO_REQ, FIFO_BANK_OK, DDR_STATE_DEC: process(ALL)
FIFO_MW, CPU_REQ, VIDEO_ADR_CNT, DDR_SEL, FB_SIZE1, FB_SIZE0, DATA_IN, FIFO_BA, DDR_REFRESH_SIG)
begin begin
case DDR_STATE is case DDR_STATE is
when DS_T1 => when DS_T1 =>
@@ -712,9 +725,13 @@ DATA_IN(18) and not fb_wr_n and not FB_SIZE0 and not FB_SIZE1 when DDR_STATE = D
'1' when DDR_STATE = DS_R2 and DDR_REFRESH_SIG = x"9" else '0'; '1' when DDR_STATE = DS_R2 and DDR_REFRESH_SIG = x"9" else '0';
-- DDR controller: -- DDR controller:
-- VIDEO RAM CONTROL REGISTER (is IN VIDEO_MUX_CTR) -- VIDEO RAM CONTROL REGISTER (is in VIDEO_MUX_CTR)
-- $F0000400: BIT 0: VCKE; 1: not nVCS ;2:REFRESH ON , (0=FIFO and CNT CLEAR); -- $F0000400:
-- 3: CONFIG; 8: FIFO_ACTIVE; -- BIT 0: VCKE
-- BIT 1: not nVCS
-- BIT 2: REFRESH ON , (0=FIFO and CNT CLEAR);
-- BIT 3: CONFIG
-- BIT 8: FIFO_ACTIVE;
VCKE <= VCKE_I; VCKE <= VCKE_I;
VCKE_I <= vram_control(0); VCKE_I <= vram_control(0);
vcs_n <= VCS_In; vcs_n <= VCS_In;

53
vhdl/rtl/vhdl/io_register.vhd
View File

@@ -1,53 +0,0 @@
LIBRARY IEEE;
USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL;
PACKAGE io_register_pkg IS
TYPE access_type_t IS (LONGWORD_ACCESS, WORD_ACCESS, BYTE_ACCESS);
COMPONENT io_register IS
GENERIC
(
sensitive : IN unsigned (31 DOWNTO 0);
address_mask : IN unsigned (31 DOWNTO 0)
);
PORT
(
address : IN std_logic_vector (31 DOWNTO 0);
access_type : IN access_type_t;
chip_select : OUT std_logic
);
END COMPONENT;
END PACKAGE;
----------------------------------------------------------------------------------------------------------------------------------------
LIBRARY IEEE;
USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL;
LIBRARY work;
USE work.io_register_pkg.ALL;
ENTITY io_register IS
GENERIC
(
sensitive : IN unsigned (31 DOWNTO 0);
address_mask : IN unsigned (31 DOWNTO 0)
);
PORT
(
address : IN std_logic_vector (31 DOWNTO 0);
access_type : IN access_type_t;
chip_select : OUT std_logic
);
END ENTITY io_register;
ARCHITECTURE rtl OF io_register IS
SIGNAL sel : STD_LOGIC := '0';
BEGIN
register_select : PROCESS
BEGIN
/* IF (address AND address_mask) = (address AND address_mask) THEN
sel <= '1';
END IF; */
END PROCESS register_select;
END rtl;