Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-09-27 03:41:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

fpga: Only allow system reset in firmware mode and syscalls

Browse source
This commit is contained in:
Mikael Ågren 2025-02-17 13:56:50 +01:00
parent 9e317666d3
commit 77fc5cf578
No known key found for this signature in database
GPG key ID: E02DA3D397792C46
4 changed files with 58 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/application_fpga/core/tk1/rtl/tk1.v
View file

@ -547,7 +547,9 @@ module tk1 #(
end
if (address == ADDR_SYSTEM_RESET) begin
system_reset_new = 1'h1;
if (!app_mode) begin
system_reset_new = 1'h1;
end
end
if ((address >= ADDR_CDI_FIRST) && (address <= ADDR_CDI_LAST)) begin

44
hw/application_fpga/core/tk1/tb/tb_tk1.v
View file

@ -56,6 +56,8 @@ module tb_tk1 ();
localparam ADDR_CPU_MON_FIRST = 8'h61;
localparam ADDR_CPU_MON_LAST = 8'h62;
localparam ADDR_SYSTEM_RESET = 8'h70;
localparam ADDR_SPI_EN = 8'h80;
localparam ADDR_SPI_XFER = 8'h81;
localparam ADDR_SPI_DATA = 8'h82;
@ -84,6 +86,7 @@ module tb_tk1 ();
reg tb_cpu_instr;
reg tb_cpu_valid;
wire tb_force_trap;
wire tb_system_reset;
wire [14 : 0] tb_ram_addr_rand;
wire [31 : 0] tb_ram_data_rand;
@ -132,6 +135,7 @@ module tb_tk1 ();
.cpu_instr (tb_cpu_instr),
.cpu_valid (tb_cpu_valid),
.force_trap(tb_force_trap),
.system_reset(tb_system_reset),
.ram_addr_rand(tb_ram_addr_rand),
.ram_data_rand(tb_ram_data_rand),
@ -1120,6 +1124,45 @@ module tb_tk1 ();
endtask // test12
//----------------------------------------------------------------
// test13()
// System reset
//----------------------------------------------------------------
task test13;
begin
tc_ctr = tc_ctr + 1;
$display("");
$display("--- test13: Reset allowed from firmware mode.");
tb_syscall = 0;
reset_dut();
write_word(ADDR_SYSTEM_RESET, 32'h1);
check_equal(tb_system_reset, 1);
$display("--- test13: Reset not allowed from app mode.");
reset_dut();
fetch_instruction(APP_RAM_START);
write_word(ADDR_SYSTEM_RESET, 32'h1);
check_equal(tb_system_reset, 0);
$display("--- test13: Reset allowed from syscall.");
reset_dut();
fetch_instruction(APP_RAM_START);
tb_syscall = 1;
write_word(ADDR_SYSTEM_RESET, 32'h1);
check_equal(tb_system_reset, 1);
tb_syscall = 0;
$display("--- test13: completed.");
$display("");
end
endtask // test13
//----------------------------------------------------------------
// exit_with_error_code()
//
@ -1161,6 +1204,7 @@ module tb_tk1 ();
test10();
test11();
test12();
test13();
display_test_result();
$display("");