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

Add set-only register for the force_trap signal to ensure

Browse source 
that the device must be reset to get out of trap. This
change also breaks a critical path.

Signed-off-by: Joachim Strömbergson <joachim@assured.se>
This commit is contained in:
Joachim Strömbergson 2024-03-19 09:55:44 +01:00 • committed by Michael Cardell Widerkrantz
parent 4c3e210a00
commit 3fb6d66cf3
No known key found for this signature in database
GPG key ID: D3DB3DDF57E704E5
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,6 +142,9 @@ module tk1(
reg [31 : 0] cpu_mon_last_reg; reg [31 : 0] cpu_mon_last_reg;
reg cpu_mon_last_we; reg cpu_mon_last_we;
reg force_trap_reg;
reg force_trap_set;
//---------------------------------------------------------------- //----------------------------------------------------------------
// Wires. // Wires.
@ -149,7 +152,6 @@ module tk1(
/* verilator lint_off UNOPTFLAT */ /* verilator lint_off UNOPTFLAT */
reg [31 : 0] tmp_read_data; reg [31 : 0] tmp_read_data;
reg tmp_ready; reg tmp_ready;
reg tmp_force_trap;
/* verilator lint_on UNOPTFLAT */ /* verilator lint_on UNOPTFLAT */
reg [2 : 0] muxed_led; reg [2 : 0] muxed_led;
@ -163,7 +165,7 @@ module tk1(
assign fw_app_mode = switch_app_reg; assign fw_app_mode = switch_app_reg;
assign force_trap = tmp_force_trap; assign force_trap = force_trap_reg;
assign gpio3 = gpio3_reg; assign gpio3 = gpio3_reg;
assign gpio4 = gpio4_reg; assign gpio4 = gpio4_reg;
@ -224,6 +226,7 @@ module tk1(
cpu_mon_last_reg <= 32'h0; cpu_mon_last_reg <= 32'h0;
ram_aslr_reg <= 15'h0; ram_aslr_reg <= 15'h0;
ram_scramble_reg <= 32'h0; ram_scramble_reg <= 32'h0;
force_trap_reg <= 1'h0;
end end
else begin else begin
@ -290,6 +293,10 @@ module tk1(
if (cpu_mon_last_we) begin if (cpu_mon_last_we) begin
cpu_mon_last_reg <= write_data; cpu_mon_last_reg <= write_data;
end end
if (force_trap_set) begin
force_trap_reg <= 1'h1;
end
end end
end // reg_update end // reg_update
@ -322,18 +329,18 @@ module tk1(
//---------------------------------------------------------------- //----------------------------------------------------------------
always @* always @*
begin : cpu_monitor begin : cpu_monitor
tmp_force_trap = 1'h0; force_trap_set = 1'h0;
if (cpu_valid && cpu_instr) begin if (cpu_valid && cpu_instr) begin
if ((cpu_addr >= FW_RAM_FIRST) && if ((cpu_addr >= FW_RAM_FIRST) &&
(cpu_addr <= FW_RAM_LAST)) begin (cpu_addr <= FW_RAM_LAST)) begin
tmp_force_trap = 1'h1; force_trap_set = 1'h1;
end end
if (cpu_mon_en_reg) begin if (cpu_mon_en_reg) begin
if ((cpu_addr >= cpu_mon_first_reg) && if ((cpu_addr >= cpu_mon_first_reg) &&
(cpu_addr <= cpu_mon_last_reg)) begin (cpu_addr <= cpu_mon_last_reg)) begin
tmp_force_trap = 1'h1; force_trap_set = 1'h1;
end end
end end
end end