DHBKM1024I-8 Added multi alert UART block for DHB STM8 alerts

This commit is contained in:
Christos Spirotis 2020-07-29 15:51:31 +01:00
commit 02ecacbe93
5 changed files with 60 additions and 13 deletions

View file

@ -45,6 +45,11 @@
"process" : "enabled",
"offset" : "0x4800"
},
"multi_alert_uart_rx_0" : {
"instance" : "",
"process" : "enabled",
"offset" : "0x5000"
},
"fpm_ctrl_6" : {
"instance" : "",
"process" : "cpp, txt",

View file

@ -238,6 +238,8 @@ architecture rtl of core is
signal uart_csr_read_som : std_logic;
signal uart_csr_write_hmb : std_logic;
signal uart_csr_read_hmb : std_logic;
signal uart_csr_write_dhb : std_logic;
signal uart_csr_read_dhb : std_logic;
signal fpga_csr_read : std_logic;
signal fpga_csr_write : std_logic;
signal print_ctrl_write : std_logic;
@ -255,7 +257,7 @@ architecture rtl of core is
signal print_ctrl_csr_readdata : std_logic_vector(31 downto 0);
signal print_ctrl_seq_readdata : std_logic_vector(31 downto 0);
signal shutdown_monitor_readdata : std_logic_vector(31 downto 0);
signal uart_csr_readdata_dhb : std_logic_vector(31 downto 0);
signal avm_rx_burstcount_fpga : std_logic_vector(11 downto 0);
signal avm_rx_address_fpga : std_logic_vector(31 downto 0);
@ -275,8 +277,9 @@ architecture rtl of core is
signal pwr_seq_status_good_in : std_logic_vector( 8 downto 0);
signal alert_trig_som : std_logic_vector( 3 downto 0);
signal alert_trig_hmb : std_logic_vector( 3 downto 0);
signal alert_trig_dhb : std_logic_vector( 3 downto 0);
signal emergency_state : std_logic;
signal dhb_alert_state : std_logic;
signal fault_state : std_logic;
signal good_state : std_logic_vector( 2 downto 0);
@ -550,20 +553,22 @@ begin
-- shutdown combinatorial logic
-- -----------------------------------
emergency_state <= '0';
fault_state <= pio_in(PIO_IN_NPGOOD_A) or pio_in(PIO_IN_NPGOOD_B);
good_state <= pio_in(PIO_IN_P_HOST_GOOD) & pio_in(PIO_IN_P_IN_GOOD) & pio_in(PIO_IN_P_GOOD);
dhb_alert_state <= alert_trig_dhb(UNDR_RNG_TRIG_BIT) or alert_trig_dhb(OVR_RNG_TRIG_BIT);
fault_state <= pio_in(PIO_IN_NPGOOD_A) or pio_in(PIO_IN_NPGOOD_B);
good_state <= pio_in(PIO_IN_P_HOST_GOOD) & pio_in(PIO_IN_P_IN_GOOD) & pio_in(PIO_IN_P_GOOD);
-- Hook up the power statuses to the appropriate triggers of the power control signal sequencer
pwr_seq_status_good_in <= not alert_trig_hmb(UNDR_RNG_TRIG_BIT) & not alert_trig_hmb(OVR_RNG_TRIG_BIT) &
not alert_trig_som(UNDR_RNG_TRIG_BIT) & not alert_trig_som(OVR_RNG_TRIG_BIT) &
good_state & not fault_state & not emergency_state;
pwr_seq_status_good_in <= not alert_trig_hmb(UNDR_RNG_TRIG_BIT) & not alert_trig_hmb(OVR_RNG_TRIG_BIT) &
not alert_trig_som(UNDR_RNG_TRIG_BIT) & not alert_trig_som(OVR_RNG_TRIG_BIT) &
good_state & not fault_state &
not dhb_alert_state;
pwr_seq_status_bad_in <= not pwr_seq_status_good_in;
pwr_seq_status_bad_in <= not pwr_seq_status_good_in;
pwr_seq_irq <= UART_IRQ_hmb or UART_IRQ_som or pwr_seq_irq_int;
pwr_seq_irq <= UART_IRQ_hmb or UART_IRQ_som or pwr_seq_irq_int;
disable_fire_reqs <= not pwr_seq_control_en(SIG_SEQ_CTRL_DISABLE_FIRE_REQS) and not en_test_pwr_ctrl;
disable_fire_reqs <= not pwr_seq_control_en(SIG_SEQ_CTRL_DISABLE_FIRE_REQS) and not en_test_pwr_ctrl;
-- -----------------------------------
-- Constant latancy CSR interface fix
@ -626,6 +631,11 @@ begin
uart_1MBd_3_hmb_write => uart_csr_write_hmb,
uart_1MBd_3_hmb_read => uart_csr_read_hmb,
uart_1MBd_3_hmb_readdata => uart_csr_readdata_hmb,
multi_alert_uart_rx_0_write => uart_csr_write_dhb,
multi_alert_uart_rx_0_read => uart_csr_read_dhb,
multi_alert_uart_rx_0_readdata=> uart_csr_readdata_dhb,
print_ctrl_write => print_ctrl_write,
print_ctrl_read => print_ctrl_read,
print_ctrl_readdata => print_ctrl_csr_readdata,
@ -912,6 +922,31 @@ begin
triggers => alert_trig_hmb
);
-- -----------------------------------
-- DHB STM8 alert 1MBaud uarts
-- -----------------------------------
multi_alert_uart_inst : entity work.multi_alert_uart_rx_0
generic map (
CLK_FREQ_MHZ => CLK_FREQ_MHZ,
NUM_CHANS => 14
)
port map (
clk => clk,
rst_n => reset_n,
UART_RXD => pio_in(PIO_IN_HMB_STM8_ALERT_TX) & pio_in(PIO_IN_SOM_STM8_ALERT_TX) & pio_in(PIO_IN_DHB_STM8_ALERT_TX),
triggers => alert_trig_dhb,
avs_csr_address => avs_csr_address_cl(3 downto 0),
avs_csr_read => uart_csr_read_dhb,
avs_csr_write => uart_csr_write_dhb,
avs_csr_writedata => avs_csr_writedata_cl,
avs_csr_readdata => uart_csr_readdata_dhb
);
-- -----------------------------------
-- HMB FPGA configuration interface
-- -----------------------------------

View file

@ -47,6 +47,10 @@ add_fileset_file uart_1MBd_rs232_3.v VERILOG PATH ../../generic_ip/uart_1MBd/3/s
add_fileset_file uart_1MBd_3_pkg_auto.vhd VHDL PATH ../../generic_ip/uart_1MBd/3/src/uart_1MBd_3_pkg_auto.vhd
add_fileset_file uart_1MBd_3_csr_regs_auto.vhd VHDL PATH ../../generic_ip/uart_1MBd/3/src/uart_1MBd_3_csr_regs_auto.vhd
add_fileset_file uart_1MBd_3.vhd VHDL PATH ../../generic_ip/uart_1MBd/3/src/uart_1MBd_3.vhd
add_fileset_file multi_alert_uart_rx_0_pkg_auto.vhd VHDL PATH ../../generic_ip/multi_alert_uart_rx/0/src/multi_alert_uart_rx_0_pkg_auto.vhd
add_fileset_file multi_alert_uart_rx_0_csr_regs_auto.vhd VHDL PATH ../../generic_ip/multi_alert_uart_rx/0/src/multi_alert_uart_rx_0_csr_regs_auto.vhd
add_fileset_file uart_1mbd_rx_0.vhd VHDL PATH ../../generic_ip/multi_alert_uart_rx/0/src/uart_1mbd_rx_0.vhd
add_fileset_file multi_alert_uart_rx_0.vhd VHDL PATH ../../generic_ip/multi_alert_uart_rx/0/src/multi_alert_uart_rx_0.vhd
add_fileset_file common_pkg.vhd VHDL PATH ../../generic_ip/common/0/src/common_pkg.vhd
add_fileset_file pkg_functions.vhd VHDL PATH ../../generic_ip/common/0/src/pkg_functions.vhd
add_fileset_file markov_edges.vhd VHDL PATH ../../generic_ip/common/0/src/markov_edges.vhd

View file

@ -263,7 +263,7 @@ begin
RX_N_SSE(RX_N_NPGOOD_A) <= 'Z';
RX_N_SSE(RX_N_NPGOOD_B) <= 'Z';
pio_in(PIO_IN_HMB1_STM8_ALERT_TX) <= RX_N_SSE(RX_N_DHB_STM8_ALERT);
pio_in(PIO_IN_DHB_STM8_ALERT_TX) <= RX_N_SSE(RX_N_DHB_STM8_ALERT);
pio_in(PIO_IN_SOM_STM8_ALERT_TX) <= STM8_ALERT_TX;
pio_in(PIO_IN_HMB_STM8_ALERT_TX) <= RX_N_SSE(RX_N_ALERT_TX0);
pio_in(PIO_IN_P_HOST_GOOD) <= P_HOST_GOOD;

View file

@ -38,7 +38,10 @@ package top_pkg is
subtype PIO_IN_UNUSED0 is natural range 1 downto 0;
constant PIO_IN_P_OVLO_OD : integer := 1;
subtype PIO_IN_HMB1_STM8_ALERT_TX is natural range 13 downto 2;
constant PIO_IN_DHB_STM8_ALERT_TX_LO : integer := 2;
constant PIO_IN_DHB_STM8_ALERT_TX_HI : integer := 13;
subtype PIO_IN_DHB_STM8_ALERT_TX is natural range PIO_IN_DHB_STM8_ALERT_TX_HI downto PIO_IN_DHB_STM8_ALERT_TX_LO;
constant PIO_IN_SOM_STM8_ALERT_TX : integer := 14;
constant PIO_IN_HMB_STM8_ALERT_TX : integer := 15;
constant PIO_IN_P_HOST_GOOD : integer := 16;