Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-09-20 12:54:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

fw: Introduce reset()

Browse source 
- New function reset.c:reset(). Move code from syscall handler switch
  to this function.

- Rename resetinfo.h to reset.h.
This commit is contained in:
Michael Cardell Widerkrantz 2025-04-29 17:10:19 +02:00
parent 9d1bbffbaa
commit f373ad3f68
No known key found for this signature in database
GPG key ID: D3DB3DDF57E704E5
9 changed files with 57 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/application_fpga/fw/tk1/main.c
View file

@ -17,7 +17,7 @@
#include "partition_table.h"
#include "preload_app.h"
#include "proto.h"
#include "resetinfo.h"
#include "reset.h"
#include "state.h"
#include "syscall_enable.h"

42
hw/application_fpga/fw/tk1/reset.c Normal file
View file

@ -0,0 +1,42 @@
/*
* Copyright (C) 2025 - Tillitis AB
* SPDX-License-Identifier: GPL-2.0-only
*/
#include <stdint.h>
#include <tkey/assert.h>
#include <tkey/lib.h>
#include <tkey/tk1_mem.h>
#include "reset.h"
// clang-format off
static volatile uint32_t *system_reset = (volatile uint32_t *)TK1_MMIO_TK1_SYSTEM_RESET;
static volatile struct reset *resetinfo = (volatile struct reset *)TK1_MMIO_RESETINFO_BASE;
// clang-format on
int reset(struct reset *userreset, size_t nextlen)
{
if ((uint32_t)userreset < TK1_RAM_BASE ||
(uint32_t)userreset >= TK1_RAM_BASE + TK1_RAM_SIZE) {
return -1;
}
if (nextlen > sizeof(resetinfo->next_app_data)) {
return -1;
}
(void)memset((void *)resetinfo, 0, sizeof(*resetinfo));
resetinfo->type = userreset->type;
memcpy((void *)resetinfo->app_digest, userreset->app_digest, 32);
memcpy((void *)resetinfo->next_app_data, userreset->next_app_data,
nextlen);
// Do the actual reset.
*system_reset = 1;
// Should not be reached.
assert(1 == 2);
__builtin_unreachable();
}

6
hw/application_fpga/fw/tk1/resetinfo.h → hw/application_fpga/fw/tk1/reset.h
View file

@ -1,9 +1,10 @@
// Copyright (C) 2025 - Tillitis AB
// SPDX-License-Identifier: GPL-2.0-only
#ifndef TKEY_RESETINFO_H
#define TKEY_RESETINFO_H
#ifndef TKEY_RESET_H
#define TKEY_RESET_H
#include <stddef.h>
#include <stdint.h>
#define TK1_MMIO_RESETINFO_BASE 0xd0000f00
@ -25,4 +26,5 @@ struct reset {
uint8_t next_app_data[220]; // Data to leave around for next app
};
int reset(struct reset *userreset, size_t nextlen);
#endif

31
hw/application_fpga/fw/tk1/syscall_handler.c
View file

@ -13,13 +13,11 @@
#include "preload_app.h"
#include "storage.h"
#include "../tk1/resetinfo.h"
#include "../tk1/reset.h"
#include "../tk1/syscall_num.h"
// clang-format off
static volatile uint32_t *system_reset = (volatile uint32_t *)TK1_MMIO_TK1_SYSTEM_RESET;
static volatile uint32_t *udi = (volatile uint32_t *)TK1_MMIO_TK1_UDI_FIRST;
static volatile struct reset *resetinfo = (volatile struct reset *)TK1_MMIO_RESETINFO_BASE;
// clang-format on
extern struct partition_table_storage part_table_storage;
@ -29,32 +27,9 @@ int32_t syscall_handler(uint32_t number, uint32_t arg1, uint32_t arg2,
uint32_t arg3)
{
switch (number) {
case TK1_SYSCALL_RESET: {
struct reset *userreset;
if (arg1 < TK1_RAM_BASE ||
arg1 >= TK1_RAM_BASE + TK1_RAM_SIZE) {
return -1;
}
userreset = (struct reset *)arg1;
if (arg2 > sizeof(resetinfo->next_app_data)) {
return -1;
}
(void)memset((void *)resetinfo, 0, sizeof(*resetinfo));
resetinfo->type = userreset->type;
memcpy((void *)resetinfo->app_digest, userreset->app_digest,
32);
memcpy((void *)resetinfo->next_app_data,
userreset->next_app_data, arg2);
*system_reset = 1;
// Should not be reached.
assert(1 == 2);
case TK1_SYSCALL_RESET:
reset((struct reset *)arg1, (size_t)arg2);
break;
}
case TK1_SYSCALL_ALLOC_AREA:
if (storage_allocate_area(&part_table_storage) < 0) {