fpga/mor1kx-bemicrocv
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Compare commits

base: fpga:32434cf8025578d1d8933d41e295173a748159d2
Branches Tags
fpga:master
..
compare: fpga:c649c073ce5055ca8c9fb14c4a6eddcd6a48683f
Branches Tags
fpga:master

No commits in common. "32434cf8025578d1d8933d41e295173a748159d2" and "c649c073ce5055ca8c9fb14c4a6eddcd6a48683f" have entirely different histories.
32434cf802 ... c649c073ce

5 changed files with 6 additions and 422 deletions
Show Stats Expand all files Collapse all files

87
bench/bench_gpio.vhd
View File

@ -1,87 +0,0 @@
library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;
library design;
use design.all;
library ip;
use ip.wishbone_package.all;
entity bench_gpio is
end entity bench_gpio;
architecture RTL of bench_gpio is
signal clk : std_logic;
signal rst : std_logic;
signal clr : std_logic;
signal wb_in : wishbone_v3_slave_in;
signal wb_out : wishbone_v3_slave_out;
signal gpio : std_logic_vector(31 downto 0);
begin
gpio_inst : entity design.gpio
port map(
clk => clk,
rst => rst,
clr => clr,
wb_in => wb_in,
wb_out => wb_out,
gpio => gpio
);
clock_driver : process
constant period : time := 10 ns;
begin
clk <= '0';
wait for period / 2;
clk <= '1';
wait for period / 2;
end process clock_driver;
test : process is
begin
rst <= '1';
clr <= '0';
wb_in.STB <= '0';
wb_in.CYC <= '0';
wb_in.ADR <= (others => '0');
wb_in.DAT <= (others => '0');
wb_in.SEL <= (others => '1');
wb_in.WE <= '0';
wait for 20 ns;
wait until rising_edge(clk);
rst <= '0';
wait until rising_edge(clk);
wb_in.DAT <= x"0000ffff";
wb_in.WE <= '1';
wb_in.STB <= '1';
wb_in.CYC <= '1';
wait until rising_edge(clk);
wb_in.WE <= '0';
wb_in.STB <= '0';
wb_in.CYC <= '0';
wait until rising_edge(clk);
wb_in.WE <= '1';
wb_in.STB <= '1';
wb_in.CYC <= '1';
wb_in.ADR <= x"00000004";
wb_in.DAT <= x"12345678";
wait until rising_edge(clk);
wb_in.WE <= '0';
wb_in.STB <= '0';
wb_in.CYC <= '0';
wait until rising_edge(clk);
wb_in.ADR <= x"00000008";
wait;
end process test;
gpio(31 downto 28) <= (others => '1');
end architecture RTL;

240
cores/generic/fancy_spi_master.vhd
View File

@ -1,240 +0,0 @@
library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;
entity fancy_spi_master is
generic(
TX_WIDTH_MAX : natural := 8; -- In bits
RX_WIDTH_MAX : natural := 8; -- In bits
RX_IGNORE_MAX : natural := 8; -- In bits
SPI_CPOL : std_logic; -- SPI clock polarity. '0': Idle low, '1': Idle high
SPI_CPHA : std_logic; -- SPI clock phase. '0': Sample on first edge, '1': Sample on second edge
CKDIV : natural := 8; -- Clock divider for SPI clock, minimum 2
CS_INACTIVE_DELAY : natural := 1 -- In system clock cycles
);
port(
-- System Signals
clk : in std_logic; -- System clock
rst : in std_logic; -- Asynchronous reset
clr : in std_logic; -- Synchronous reset
-- TX
tx_width : in integer range 0 to TX_WIDTH_MAX; -- Width of the next word in bits, sampled when asserting tx_next and at the beginning
tx_enable : in std_logic; -- Enable transmission, taking this low for at least one clock cycle will trigger a CS inactive sequence
tx_data : in std_logic_vector(TX_WIDTH_MAX - 1 downto 0); -- Data to be transmitted, MSB first, aligned to the left when tx_width /= TX_WIDTH_MAX
tx_next : out std_logic; -- Strobe to request new data or to deassert tx_enable
-- RX
rx_width : in integer range 0 to RX_WIDTH_MAX; -- Width of the next word in bits, sampled when asserting rx_valid and at the beginning
rx_valid : out std_logic; -- rx_data is valid, a new word has been received.
rx_data : out std_logic_vector(RX_WIDTH_MAX - 1 downto 0); -- Received data, MSB first, aligned to the right when rx_width /= RX_WIDTH_MAX
rx_ignore : in integer range 0 to RX_IGNORE_MAX; -- Bits to be ignored at the beginning of the transaction
-- SPI HW Signals
spi_clk : out std_logic; -- SPI clock output
spi_cs_n : out std_logic; -- SPI chip select (low active)
spi_mosi : out std_logic; -- SPI MOSI output
spi_miso : in std_logic -- SPI MISO input
);
end entity fancy_spi_master;
architecture RTL of fancy_spi_master is
-- CKDIV
signal spi_clk_en : std_logic;
signal spi_clk_en_last : std_logic;
signal spi_clk_i : std_logic;
signal ckdiv_cnt : integer range 0 to CKDIV;
signal spi_clk_event : boolean;
-- MAIN FSM
type state_t is (IDLE, ACTIVE, STOP);
signal state : state_t;
signal tx_width_i : integer range 0 to TX_WIDTH_MAX;
signal shiftreg_out : std_logic_vector(TX_WIDTH_MAX - 1 downto 0);
signal shiftreg_in : std_logic_vector(RX_WIDTH_MAX - 1 downto 0);
signal bit_cnt_tx : integer range 0 to CS_INACTIVE_DELAY - 1;
signal bit_cnt_rx : integer range 0 to RX_IGNORE_MAX; -- TODO: or RX_WIDTH_MAX or CS_INACTIVE_DELAY if bigger
signal rx_past_ignore : boolean;
signal rx_width_i : integer range 0 to RX_WIDTH_MAX;
signal active_cycles : boolean;
begin
clk_gen : process(rst, clk) is
procedure default_state is
begin
null;
end procedure default_state;
procedure reset_state is
begin
default_state;
ckdiv_cnt <= 0;
spi_clk_i <= SPI_CPOL;
spi_clk_en_last <= '0';
end procedure reset_state;
begin
if (rst = '1') then
reset_state;
elsif (rising_edge(clk)) then
default_state;
if (clr = '1') then
reset_state;
else
if (ckdiv_cnt = 0) then
spi_clk_en_last <= spi_clk_en;
if (spi_clk_en_last /= spi_clk_en) then
ckdiv_cnt <= CKDIV / 4;
else
if (spi_clk_i /= SPI_CPOL or spi_clk_en = '1') then
spi_clk_i <= not spi_clk_i;
end if;
if (spi_clk_en = '1' or spi_clk_i = SPI_CPOL) then
ckdiv_cnt <= CKDIV / 4;
end if;
end if;
else
ckdiv_cnt <= ckdiv_cnt - 1;
end if;
end if;
end if;
end process clk_gen;
spi_clk <= spi_clk_i;
spi_clk_event <= true when ckdiv_cnt = 0 and (spi_clk_en_last = spi_clk_en) else false;
fancy_spi : process(rst, clk) is
variable tx_break : boolean;
variable tx_word_done : boolean;
variable rx_word_done : boolean;
procedure default_state is
begin
tx_next <= '0';
tx_word_done := false;
rx_word_done := false;
rx_valid <= '0';
end procedure default_state;
procedure reset_state is
begin
default_state;
state <= IDLE;
tx_break := true;
bit_cnt_tx <= 0;
shiftreg_out <= (others => '0');
shiftreg_in <= (others => '0');
spi_cs_n <= '1';
rx_past_ignore <= false;
rx_width_i <= 0;
tx_width_i <= 0;
bit_cnt_rx <= 0;
active_cycles <= false;
spi_clk_en <= '0';
end procedure reset_state;
procedure load_new_tx_word is
begin
tx_width_i <= tx_width;
shiftreg_out <= tx_data;
bit_cnt_tx <= 0;
tx_next <= '1';
end procedure load_new_tx_word;
procedure shift_out is
begin
shiftreg_out <= shiftreg_out(shiftreg_out'high - 1 downto 0) & '0';
if (bit_cnt_tx = tx_width_i - 1) then
bit_cnt_tx <= 0;
tx_word_done := true;
else
bit_cnt_tx <= bit_cnt_tx + 1;
end if;
end procedure shift_out;
procedure shift_in is
begin
if (rx_past_ignore) then
shiftreg_in <= shiftreg_in(shiftreg_in'high - 1 downto 0) & spi_miso;
if (bit_cnt_rx = rx_width_i - 1) then
bit_cnt_rx <= 0;
rx_word_done := true;
else
bit_cnt_rx <= bit_cnt_rx + 1;
end if;
else
if (bit_cnt_rx = rx_ignore - 1) then
bit_cnt_rx <= 0;
rx_past_ignore <= true;
else
bit_cnt_rx <= bit_cnt_rx + 1;
end if;
end if;
end procedure shift_in;
begin
if (rst = '1') then
reset_state;
elsif (rising_edge(clk)) then
default_state;
if (clr = '1') then
reset_state;
else
if (tx_enable = '0') then
tx_break := true;
end if;
case state is
when IDLE =>
if (tx_enable = '1') then
if (tx_break) then
rx_width_i <= rx_width;
end if;
spi_clk_en <= '1';
state <= ACTIVE;
tx_break := false;
load_new_tx_word;
spi_cs_n <= '0';
end if;
when ACTIVE =>
if (spi_clk_event) then
active_cycles <= true;
end if;
if (active_cycles or SPI_CPHA = '0') then
if (spi_clk_event and spi_clk_i /= SPI_CPOL) then
shift_out;
if (tx_word_done) then
if (tx_break) then
spi_clk_en <= '0';
else
load_new_tx_word;
end if;
end if;
elsif (spi_clk_event and spi_clk_i = SPI_CPOL) then
if (spi_clk_en = '1') then
shift_in;
if (rx_word_done) then
rx_width_i <= rx_width;
rx_valid <= '1';
end if;
else
bit_cnt_tx <= 0;
state <= STOP;
spi_cs_n <= '1';
end if;
end if;
end if;
when STOP =>
if (bit_cnt_tx = CS_INACTIVE_DELAY - 1) then
state <= IDLE;
rx_past_ignore <= false;
tx_break := true;
active_cycles <= false;
bit_cnt_rx <= 0;
else
bit_cnt_tx <= bit_cnt_tx + 1;
end if;
end case;
end if;
end if;
end process fancy_spi;
spi_mosi <= shiftreg_out(shiftreg_out'high);
rx_data <= shiftreg_in;
end architecture RTL;

74
cores/gpio/gpio.vhd
View File

@ -1,74 +0,0 @@
-- TODO: This is only a placeholder for a "real" GPIO core.
library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;
library ip;
use ip.wishbone_package.all;
entity gpio is
port(
clk : in std_logic;
rst : in std_logic;
clr : in std_logic;
-- Wishbone
wb_in : in wishbone_v3_slave_in;
wb_out : out wishbone_v3_slave_out;
-- Ports
gpio : inout std_logic_vector(31 downto 0)
);
end entity gpio;
architecture RTL of gpio is
signal reg_port : std_logic_vector(31 downto 0);
signal reg_ddr : std_logic_vector(31 downto 0);
begin
gpio_p : process(clk, rst) is
procedure default_state is
begin
null;
end procedure default_state;
procedure reset_state is
begin
default_state;
reg_ddr <= (others => '0');
reg_port <= (others => '0');
end procedure reset_state;
begin
if rst = '1' then
reset_state;
elsif rising_edge(clk) then
default_state;
if clr = '1' then
reset_state;
else
if (wb_in.STB = '1' and wb_in.CYC = '1' and wb_in.WE = '1') then
for i in 0 to 3 loop
if (wb_in.SEL(i) = '1') then
case wb_in.ADR(3 downto 2) is
when "00" => reg_ddr((i + 1) * 8 - 1 downto i * 8) <= wb_in.DAT((i + 1) * 8 - 1 downto i * 8);
when "01" => reg_port((i + 1) * 8 - 1 downto i * 8) <= wb_in.DAT((i + 1) * 8 - 1 downto i * 8);
when others => null;
end case;
end if;
end loop;
end if;
end if;
end if;
end process gpio_p;
wb_out.ERR <= '0';
wb_out.RTY <= '0';
wb_out.ACK <= (wb_in.STB and wb_in.CYC);
read : with wb_in.ADR(3 downto 2) select wb_out.DAT <=
reg_ddr when "00",
reg_port when "01",
gpio when others;
writeport : for i in 0 to 31 generate
gpio(i) <= reg_port(i) when reg_ddr(i) = '1' else 'Z';
end generate writeport;
end architecture RTL;

23
design/top.vhd
View File

@ -59,11 +59,11 @@ architecture RTL of top is
-- WB config -- WB config
constant masters : natural := 3; constant masters : natural := 3;
constant slaves : natural := 4; constant slaves : natural := 3;
constant INTERCON_ID_SRAM : natural := 0; constant INTERCON_ID_SRAM : natural := 0;
constant INTERCON_ID_DDR3 : natural := 1; constant INTERCON_ID_DDR3 : natural := 1;
constant INTERCON_ID_FLASH : natural := 2; constant INTERCON_ID_FLASH : natural := 2;
constant INTERCON_ID_GPIO : natural := 3; -- constant INTERCON_ID_GPIO : natural := 2;
-- constant INTERCON_ID_UART : natural := 3; -- constant INTERCON_ID_UART : natural := 3;
-- constant INTERCON_ID_NS16550 : natural := 4; -- constant INTERCON_ID_NS16550 : natural := 4;
@ -132,7 +132,7 @@ begin
elsif rising_edge(clk) then elsif rising_edge(clk) then
if pll_locked = '1' then if pll_locked = '1' then
rst_ddr3_n <= '1'; -- Start DDR3 Controller rst_ddr3_n <= '1'; -- Start DDR3 Controller
if (local_init_done = '1' and local_cal_success = '1') or in_simulation then if local_init_done = '1' and local_cal_success = '1' then
rst <= '0'; -- Start system! rst <= '0'; -- Start system!
end if; end if;
end if; end if;
@ -322,17 +322,6 @@ begin
spi_wp_n => flash_wp_n spi_wp_n => flash_wp_n
); );
-- GPIO
gpio_inst : entity work.gpio
port map(
clk => clk,
rst => rst,
clr => '0',
wb_in => intercon_slave_i(INTERCON_ID_GPIO),
wb_out => intercon_slave_o(INTERCON_ID_GPIO),
gpio => GPIOA
);
-- Intercon -- Intercon
crossbar_inst : entity ip.crossbar crossbar_inst : entity ip.crossbar
generic map( generic map(
@ -350,14 +339,12 @@ begin
address => ( address => (
INTERCON_ID_SRAM => x"00000000", INTERCON_ID_SRAM => x"00000000",
INTERCON_ID_DDR3 => x"10000000", INTERCON_ID_DDR3 => x"10000000",
INTERCON_ID_FLASH => x"40000000", INTERCON_ID_FLASH => x"90000000"
INTERCON_ID_GPIO => x"80000000"
), ),
mask => ( mask => (
INTERCON_ID_SRAM => x"ffff0000", INTERCON_ID_SRAM => x"ffff0000",
INTERCON_ID_DDR3 => x"f0000000", INTERCON_ID_DDR3 => x"f0000000",
INTERCON_ID_FLASH => x"f0000000", INTERCON_ID_FLASH => x"f0000000"
INTERCON_ID_GPIO => x"fffffffc"
) )
); );
end architecture RTL; end architecture RTL;

4
quartus/mor1kx-bemicrocv.qsf
View File

@ -323,8 +323,7 @@ set_location_assignment PIN_N16 -to flash_sck
set_location_assignment PIN_M16 -to flash_si set_location_assignment PIN_M16 -to flash_si
set_location_assignment PIN_M18 -to flash_so set_location_assignment PIN_M18 -to flash_so
set_location_assignment PIN_N19 -to flash_wp_n set_location_assignment PIN_N19 -to flash_wp_n
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
set_global_assignment -name VHDL_FILE ../cores/gpio/gpio.vhd
set_global_assignment -name VHDL_FILE ../cores/generic/fancy_spi_master.vhd set_global_assignment -name VHDL_FILE ../cores/generic/fancy_spi_master.vhd
set_global_assignment -name VHDL_FILE "../cores/flashrom-wb/flashrom_wb.vhd" set_global_assignment -name VHDL_FILE "../cores/flashrom-wb/flashrom_wb.vhd"
set_global_assignment -name VHDL_FILE "../cores/flashrom-wb/flashrom_pkg.vhd" set_global_assignment -name VHDL_FILE "../cores/flashrom-wb/flashrom_pkg.vhd"
@ -382,4 +381,3 @@ set_global_assignment -name VHDL_FILE ../design/top.vhd
set_global_assignment -name VHDL_FILE ../ip/intercon/rtl/wishbone_package.vhd -library ip set_global_assignment -name VHDL_FILE ../ip/intercon/rtl/wishbone_package.vhd -library ip
set_global_assignment -name VHDL_FILE ../ip/intercon/rtl/crossbar_v3.vhd -library ip set_global_assignment -name VHDL_FILE ../ip/intercon/rtl/crossbar_v3.vhd -library ip
set_global_assignment -name QIP_FILE ../ip/altera/ddr3.qip set_global_assignment -name QIP_FILE ../ip/altera/ddr3.qip
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top