WIP preload_app

hw/application_fpga/Makefile

@@ -88,7 +88,8 @@ FIRMWARE_DEPS = \
 	$(P)/fw/tk1/blake2s/blake2s.h \
 	$(P)/fw/tk1/spi.h \
 	$(P)/fw/tk1/flash.h \
-	$(P)/fw/tk1/partition_table.h
+	$(P)/fw/tk1/partition_table.h \
+	$(P)/fw/tk1/preload_app.h
 
 FIRMWARE_OBJS = \
 	$(P)/fw/tk1/main.o \
@@ -100,7 +101,8 @@ FIRMWARE_OBJS = \
 	$(P)/fw/tk1/blake2s/blake2s.o \
 	$(P)/fw/tk1/spi.o \
 	$(P)/fw/tk1/flash.o \
-	$(P)/fw/tk1/partition_table.o
+	$(P)/fw/tk1/partition_table.o \
+	$(P)/fw/tk1/preload_app.o
 
 FIRMWARE_SOURCES = \
 	$(P)/fw/tk1/main.c \
@@ -111,7 +113,8 @@ FIRMWARE_SOURCES = \
 	$(P)/fw/tk1/blake2s/blake2s.c \
 	$(P)/fw/tk1/spi.c \
 	$(P)/fw/tk1/flash.c \
-	$(P)/fw/tk1/partition_table.c
+	$(P)/fw/tk1/partition_table.c \
+	$(P)/fw/tk1/preload_app.c
 
 TESTFW_OBJS = \
 	$(P)/fw/testfw/main.o \

hw/application_fpga/fw/tk1/preload_app.c

@@ -0,0 +1,84 @@
+// Copyright (C) 2024 - Tillitis AB
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "preload_app.h"
+#include "../tk1_mem.h"
+#include "flash.h"
+#include "lib.h"
+#include "partition_table.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/* Returns non-zero if the app is valid */
+bool preload_check_valid_app(partition_table_t *part_table)
+{
+
+	if (part_table->pre_app_data.status == 0x00 &&
+	    part_table->pre_app_data.size == 0) {
+		/*No valid app*/
+		return false;
+		// TODO: Should we also check nonce, authentication digest for
+		// non-zero?
+	}
+
+	return true;
+}
+
+/* Loads a preloaded app from flash to app RAM */
+int preload_start(partition_table_t *part_table)
+{
+	/*Check for a valid app in flash	*/
+	if (!preload_check_valid_app(part_table)) {
+		return -1;
+	}
+	uint8_t *loadaddr = (uint8_t *)TK1_RAM_BASE;
+
+	// TODO: Check authentication digest
+	// TODO: Should this function set *app_size?
+
+	/* Read from flash, straight into RAM */
+	int ret = flash_read_data(ADDR_PRE_LOADED_APP, loadaddr,
+				  part_table->pre_app_data.size);
+
+	return ret;
+}
+
+int preload_store(partition_table_t *part_table)
+{
+	// TODO: Can reuse the app loading context  in main, to keep track of
+	// where to store.
+	//  Most likely needs to aggregate some data, before it writes to flash.
+
+	/*Check for a valid app in flash, bale out if it already exists */
+	if (preload_check_valid_app(part_table)) {
+		return -1;
+	}
+
+	return 0;
+}
+
+int preload_delete(partition_table_t *part_table)
+{
+	/*Check for a valid app in flash	*/
+	if (!preload_check_valid_app(part_table)) {
+		return 0;
+		// TODO: Nothing here, return zero like all is good?
+	}
+	part_table->pre_app_data.size = 0;
+	part_table->pre_app_data.status = 0;
+
+	memset(part_table->pre_app_data.auth.nonce, 0x00,
+	       sizeof(part_table->pre_app_data.auth.nonce));
+
+	memset(part_table->pre_app_data.auth.authentication_digest, 0x00,
+	       sizeof(part_table->pre_app_data.auth.authentication_digest));
+
+	part_table_write(part_table);
+
+	flash_block_64_erase(ADDR_PRE_LOADED_APP); // Erase first 64 KB block
+	flash_block_64_erase(ADDR_PRE_LOADED_APP +
+			     0x10000); // Erase second 64 KB block
+
+	return 0;
+}

hw/application_fpga/fw/tk1/preload_app.h

@@ -0,0 +1,16 @@
+// Copyright (C) 2024 - Tillitis AB
+// SPDX-License-Identifier: GPL-2.0-only
+
+#ifndef PRELOAD_APP_H
+#define PRELOAD_APP_H
+
+#include "partition_table.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+bool preload_check_valid_app(partition_table_t *part_table);
+int preload_start(partition_table_t *part_table);
+int preload_store(partition_table_t *part_table);
+int preload_delete(partition_table_t *part_table);
+
+#endif