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

fw: Add status syscall for flash status

Browse Source 
Add a way of reporting invalid partition table copy through a new
syscall for TKey status.
This commit is contained in:
Michael Cardell Widerkrantz 2025-04-04 16:02:55 +02:00
parent 092bac027d
commit 781bce9602
No known key found for this signature in database
GPG Key ID: D3DB3DDF57E704E5
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/application_fpga/fw/tk1/partition_table.c
View File

@ -10,6 +10,12 @@
#include "partition_table.h"
#include "proto.h"
static enum part_status part_status;
enum part_status part_get_status(void) {
return part_status;
}
void part_digest(struct partition_table *part_table, uint8_t *out_digest, size_t out_len) {
blake2s_ctx b2s_ctx = {0};
int blake2err = 0;
@ -30,8 +36,6 @@ void part_digest(struct partition_table *part_table, uint8_t *out_digest, size_t
// It stores the partition table in storage.
//
// Returns negative values on errors.
// Returns 0 if using slot 0.
// Returns 1 if using slot 1, indicating that slot 0 failed verification.
int part_table_read(struct partition_table_storage *storage)
{
uint32_t offset[2] = {
@ -49,7 +53,11 @@ int part_table_read(struct partition_table_storage *storage)
part_digest(&storage->table, check_digest, sizeof(check_digest));
if (memeq(check_digest, storage->check_digest, sizeof(check_digest))) {
return i;
if (i == 1) {
part_status = PART_SLOT0_INVALID;
}
return 0;
}
}

5
hw/application_fpga/fw/tk1/partition_table.h
View File

@ -47,6 +47,10 @@
#define PART_DIGEST_SIZE 16
enum part_status {
PART_SLOT0_INVALID = 1,
};
/* Partition Table */
/*- Table header */
/* - 1 bytes Version */
@ -97,6 +101,7 @@ struct partition_table_storage {
uint8_t check_digest[PART_DIGEST_SIZE];
} __attribute__((packed));
enum part_status part_get_status(void);
int part_table_read(struct partition_table_storage *storage);
int part_table_write(struct partition_table_storage *storage);

4
hw/application_fpga/fw/tk1/syscall_handler.c
View File

@ -24,6 +24,7 @@ static volatile uint8_t *resetinfo = (volatile uint8_t *) TK1_MMIO_RESETINFO
// clang-format on
extern struct partition_table_storage part_table_storage;
extern uint8_t part_status;
int32_t syscall_handler(uint32_t number, uint32_t arg1, uint32_t arg2,
uint32_t arg3)
@ -94,6 +95,9 @@ int32_t syscall_handler(uint32_t number, uint32_t arg1, uint32_t arg2,
case TK1_SYSCALL_PRELOAD_GET_DIGSIG:
return preload_get_digsig(&part_table_storage.table, (uint8_t *)arg1, (uint8_t *)arg2, 1);
case TK1_SYSCALL_STATUS:
return part_get_status();
default:
assert(1 == 2);
}

1
hw/application_fpga/fw/tk1/syscall_num.h
View File

@ -17,6 +17,7 @@ enum syscall_num {
TK1_SYSCALL_PRELOAD_DELETE = 10,
TK1_SYSCALL_PRELOAD_GET_DIGSIG = 11,
TK1_SYSCALL_REG_MGMT = 12,
TK1_SYSCALL_STATUS = 13,
TK1_SYSCALL_SET_LED = 30,
};