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

fpga: Add stateful access control

Browse Source 
Add access stateful control register that toggles if access to a
      resources is granted based on if code is excuted from ROM or RAM.
      The register is used to enable or block access to SPI but
      potentially other HW resources.

Signed-off-by: Joachim Strömbergson <joachim@assured.se>
This commit is contained in:
Joachim Strömbergson 2024-07-09 12:58:45 +02:00 committed by Daniel Jobson
parent 7b4a659868
commit c0a79e77c6
No known key found for this signature in database
GPG Key ID: 3707A9DBF4BB8F1A
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hw/application_fpga/core/tk1/rtl/tk1.v
View File

@ -26,6 +26,9 @@ module tk1(
output wire force_trap, output wire force_trap,
output system_reset, output system_reset,
input wire ram_access,
input wire rom_access,
output wire [14 : 0] ram_addr_rand, output wire [14 : 0] ram_addr_rand,
output wire [31 : 0] ram_data_rand, output wire [31 : 0] ram_data_rand,
@ -164,7 +167,9 @@ module tk1(
reg force_trap_reg; reg force_trap_reg;
reg force_trap_set; reg force_trap_set;
reg spi_access_ok; reg access_ok_reg;
reg access_ok_new;
reg access_ok_we;
//---------------------------------------------------------------- //----------------------------------------------------------------
@ -240,13 +245,13 @@ module tk1(
.spi_mosi(spi_mosi), .spi_mosi(spi_mosi),
.spi_miso(spi_miso), .spi_miso(spi_miso),
.spi_enable((spi_enable & spi_access_ok)), .spi_enable((spi_enable & spi_access_ok_reg)),
.spi_enable_vld((spi_enable_vld & spi_access_ok)), .spi_enable_vld((spi_enable_vld & spi_access_ok_reg)),
.spi_start((spi_start & spi_access_ok)), .spi_start((spi_start & spi_access_ok_reg)),
.spi_tx_data(spi_tx_data), .spi_tx_data(spi_tx_data),
.spi_tx_data_vld((spi_tx_data_vld & spi_access_ok)), .spi_tx_data_vld((spi_tx_data_vld & spi_access_ok_reg)),
.spi_rx_data(spi_rx_data), .spi_rx_data(spi_rx_data),
.spi_ready((spi_ready & spi_access_ok)) .spi_ready((spi_ready & spi_access_ok_reg))
); );
`endif // INCLUDE_SPI_MASTER `endif // INCLUDE_SPI_MASTER
@ -282,13 +287,14 @@ module tk1(
cdi_mem[7] <= 32'h0; cdi_mem[7] <= 32'h0;
cpu_trap_ctr_reg <= 24'h0; cpu_trap_ctr_reg <= 24'h0;
cpu_trap_led_reg <= 3'h0; cpu_trap_led_reg <= 3'h0;
cpu_mon_en_reg <= 1'h0; cpu_mon_en_reg <= 1'h0;
cpu_mon_first_reg <= 32'h0; cpu_mon_first_reg <= 32'h0;
cpu_mon_last_reg <= 32'h0; cpu_mon_last_reg <= 32'h0;
ram_addr_rand_reg <= 15'h0; ram_addr_rand_reg <= 15'h0;
ram_data_rand_reg <= 32'h0; ram_data_rand_reg <= 32'h0;
force_trap_reg <= 1'h0; force_trap_reg <= 1'h0;
system_reset_reg <= 1'h0; system_reset_reg <= 1'h0;
access_ok_reg <= 1'h0;
end end
else begin else begin
@ -361,6 +367,10 @@ module tk1(
if (force_trap_set) begin if (force_trap_set) begin
force_trap_reg <= 1'h1; force_trap_reg <= 1'h1;
end end
if (access_ok_we) begin
access_ok_reg <= access_ok_new;
end
end end
end // reg_update end // reg_update
@ -389,17 +399,24 @@ module tk1(
//---------------------------------------------------------------- //----------------------------------------------------------------
// spi_access_control // access_control
// //
// Logic thar controls if any access to the SPI master is done // Logic that controls access to resources that only FW (ROM),
// by FW-code. // not applications should be allowed to use.
//---------------------------------------------------------------- //----------------------------------------------------------------
always @* always @*
begin : spi_access_control begin : access_control
spi_access_ok = 1'h0; access_ok_new = 1'h0;
access_ok_we = 1'h0;
if (cpu_addr[31 : 30] == ROM_PREFIX) begin if (rom_access) begin
spi_access_ok = 1'h1; access_ok_new = 1'h1;
access_ok_we = 1'h1;
end
if (ram_access) begin
access_ok_new = 1'h0;
access_ok_we = 1'h1;
end end
end end

3
hw/application_fpga/rtl/application_fpga.v
View File

@ -328,6 +328,9 @@ module application_fpga(
.system_reset(tk1_system_reset), .system_reset(tk1_system_reset),
.ram_access(ram_cs),
.rom_access(rom_cs),
.ram_addr_rand(ram_addr_rand), .ram_addr_rand(ram_addr_rand),
.ram_data_rand(ram_data_rand), .ram_data_rand(ram_data_rand),