[Cryptech-Commits] [sw/stm32] 01/02: threaded rpc server
git at cryptech.is
git at cryptech.is
Sun Apr 24 17:13:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
paul at psgd.org pushed a commit to branch rtos
in repository sw/stm32.
commit a59302fda685722cd003045359a184ad751045c0
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Thu Apr 21 16:30:36 2016 -0400
threaded rpc server
---
.gitignore | 1 +
Makefile | 28 ++++++-----
projects/hsm/Makefile | 26 ++++++++++
projects/hsm/main.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 173 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index e3b4b63..ad98d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.a
*.o
*.mo
*.bin
diff --git a/Makefile b/Makefile
index e951c35..c1d2d43 100644
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,17 @@
# absolute path, because we're going to be passing things to sub-makes
export TOPLEVEL = $(shell pwd)
+# define board: dev-bridge or alpha
+BOARD = TARGET_CRYPTECH_DEV_BRIDGE
+
# Location of the Libraries folder from the STM32F4 Standard Peripheral Library
-MBED_DIR = $(TOPLEVEL)/libraries/mbed
+LIBS_DIR = $(TOPLEVEL)/libraries
+MBED_DIR = $(LIBS_DIR)/mbed
CMSIS_DIR = $(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4
-BOARD_DIR = $(CMSIS_DIR)/TARGET_CRYPTECH_DEV_BRIDGE
+BOARD_DIR = $(CMSIS_DIR)/$(BOARD)
RTOS_DIR = $(MBED_DIR)/rtos
+export LIBTFM_DIR = $(LIBS_DIR)/thirdparty/libtfm
+export LIBHAL_DIR = $(LIBS_DIR)/libhal
export LIBS = $(MBED_DIR)/libstmf4.a $(RTOS_DIR)/librtos.a
@@ -65,7 +71,7 @@ CFLAGS = -ggdb -O2 -Wall -Warray-bounds #-Wextra
CFLAGS += -mcpu=cortex-m4 -mthumb -mlittle-endian -mthumb-interwork
CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
CFLAGS += -DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F429xx
-CFLAGS += -D__CORTEX_M4 -DTARGET_STM -DTARGET_STM32F4 -DTARGET_STM32F429ZI -DTOOLCHAIN_GCC -D__FPU_PRESENT=1
+CFLAGS += -D__CORTEX_M4 -DTARGET_STM -DTARGET_STM32F4 -DTARGET_STM32F429ZI -DTOOLCHAIN_GCC -D__FPU_PRESENT=1 -D$(BOARD)
CFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections
CFLAGS += -std=c99
CFLAGS += -I $(TOPLEVEL)
@@ -74,9 +80,9 @@ CFLAGS += -I $(MBED_DIR)/rtos/rtos
CFLAGS += -I $(MBED_DIR)/rtos/rtx/TARGET_CORTEX_M
CFLAGS += -I $(MBED_DIR)/targets/cmsis
CFLAGS += -I $(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4
-CFLAGS += -I $(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_DEV_BRIDGE
+CFLAGS += -I $(MBED_DIR)/targets/cmsis/TARGET_STM/TARGET_STM32F4/$(BOARD)
CFLAGS += -I $(MBED_DIR)/targets/hal/TARGET_STM/TARGET_STM32F4
-CFLAGS += -I $(MBED_DIR)/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_DEV_BRIDGE
+CFLAGS += -I $(MBED_DIR)/targets/hal/TARGET_STM/TARGET_STM32F4/$(BOARD)
export CFLAGS
%.o : %.c
@@ -85,7 +91,7 @@ export CFLAGS
%.o : %.S
$(CC) $(CFLAGS) -c -o $@ $<
-all: board-test libhal-test
+all: board-test libhal-test hsm
init:
git submodule update --init --recursive
@@ -102,15 +108,9 @@ $(RTOS_DIR)/librtos.a:
rtos-test: $(RTOS_OBJS) $(LIBS)
$(MAKE) -C projects/rtos-test
-LIBS_DIR = $(TOPLEVEL)/libraries
-
-export LIBTFM_DIR = $(LIBS_DIR)/thirdparty/libtfm
-
$(LIBTFM_DIR)/libtfm.a:
$(MAKE) -C $(LIBTFM_DIR) PREFIX=$(PREFIX)
-export LIBHAL_DIR = $(LIBS_DIR)/libhal
-
$(LIBHAL_DIR)/libhal.a: $(LIBTFM_DIR)/libtfm.a
# $(MAKE) -C $(LIBHAL_DIR) RPC_CLIENT=local IO_BUS=fmc KS=volatile libhal.a
$(MAKE) -C $(LIBHAL_DIR) IO_BUS=fmc RPC_SERVER=yes RPC_TRANSPORT=serial KS=volatile libhal.a
@@ -118,6 +118,9 @@ $(LIBHAL_DIR)/libhal.a: $(LIBTFM_DIR)/libtfm.a
libhal-test: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
$(MAKE) -C projects/libhal-test
+hsm: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
+ $(MAKE) -C projects/hsm
+
# don't automatically delete objects, to avoid a lot of unnecessary rebuilding
.SECONDARY: $(BOARD_OBJS)
@@ -128,6 +131,7 @@ clean:
$(MAKE) -C projects/board-test clean
$(MAKE) -C projects/rtos-test clean
$(MAKE) -C projects/libhal-test clean
+ $(MAKE) -C projects/hsm clean
distclean: clean
$(MAKE) -C $(MBED_DIR) clean
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
new file mode 100644
index 0000000..b933653
--- /dev/null
+++ b/projects/hsm/Makefile
@@ -0,0 +1,26 @@
+PROJ = hsm
+
+SRCS = main.c
+
+OBJS = $(SRCS:.c=.o)
+
+CFLAGS += -I $(LIBHAL_DIR)
+
+LIBS += $(LIBHAL_DIR)/libhal.a $(LIBTFM_DIR)/libtfm.a
+
+all: $(PROJ:=.elf)
+
+$(PROJ).elf: $(OBJS) $(BOARD_OBJS) $(LIBS)
+ $(CC) $(CFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$(PROJ).map
+ $(OBJCOPY) -O ihex $(PROJ).elf $(PROJ).hex
+ $(OBJCOPY) -O binary $(PROJ).elf $(PROJ).bin
+ $(OBJDUMP) -St $(PROJ).elf >$(PROJ).lst
+ $(SIZE) $(PROJ).elf
+
+clean:
+ rm -f *.o
+ rm -f *.elf
+ rm -f *.hex
+ rm -f *.bin
+ rm -f *.map
+ rm -f *.lst
diff --git a/projects/hsm/main.c b/projects/hsm/main.c
new file mode 100644
index 0000000..6c3d2e3
--- /dev/null
+++ b/projects/hsm/main.c
@@ -0,0 +1,130 @@
+/*
+ * rpc_server.c
+ * ------------
+ * Remote procedure call server-side private API implementation.
+ *
+ * Copyright (c) 2016, NORDUnet A/S All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the NORDUnet nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "cmsis_os.h"
+
+#include "stm-init.h"
+#include "stm-led.h"
+#include "stm-fmc.h"
+#include "stm-uart.h"
+
+/* stm32f4xx_hal_def.h and hal.h both define HAL_OK as an enum value */
+#define HAL_OK HAL_OKAY
+
+#include "hal.h"
+
+/* declared in hal_internal.h */
+extern hal_error_t hal_rpc_sendto(const uint8_t * const buf, const size_t len, void *opaque);
+extern hal_error_t hal_rpc_recvfrom(uint8_t * const buf, size_t * const len, void **opaque);
+
+#ifndef MAX_PKT_SIZE
+#define MAX_PKT_SIZE 4096
+#endif
+
+typedef struct {
+ void *opaque;
+ size_t len;
+ uint8_t buf[MAX_PKT_SIZE];
+} rpc_buffer_t;
+
+osPoolDef(rpc_buffer_pool, 16, rpc_buffer_t);
+osPoolId rpc_buffer_pool;
+
+rpc_buffer_t *rpc_buffer_alloc(void)
+{
+ rpc_buffer_t *rbuf = (rpc_buffer_t *)osPoolCAlloc(rpc_buffer_pool);
+ if (rbuf)
+ rbuf->len = sizeof(rbuf->buf);
+ return rbuf;
+}
+
+osMutexId uart_mutex;
+osMutexDef(uart_mutex);
+
+void dispatch_thread(void const *args)
+{
+ rpc_buffer_t *ibuf = (rpc_buffer_t *)args;
+ rpc_buffer_t *obuf = rpc_buffer_alloc(); // NULL check
+ obuf->opaque = ibuf->opaque;
+ hal_rpc_server_dispatch(ibuf->buf, ibuf->len, obuf->buf, &obuf->len);
+ osPoolFree(rpc_buffer_pool, ibuf);
+ osMutexWait(uart_mutex, osWaitForever);
+ hal_rpc_sendto(obuf->buf, obuf->len, obuf->opaque);
+ osMutexRelease(uart_mutex);
+ osPoolFree(rpc_buffer_pool, obuf);
+}
+osThreadDef(dispatch_thread, osPriorityNormal, DEFAULT_STACK_SIZE);
+
+void rpc_server_main(void)
+{
+ hal_error_t ret;
+
+ while (1) {
+ rpc_buffer_t *ibuf = rpc_buffer_alloc(); // NULL check
+ // separate allocations for struct and block of memory?
+ ret = hal_rpc_recvfrom(ibuf->buf, &ibuf->len, &ibuf->opaque);
+ if (ret == HAL_OK) {
+ osThreadCreate(osThread(dispatch_thread), (void *)ibuf);
+ }
+ }
+}
+
+int main()
+{
+ stm_init();
+
+#ifdef TARGET_CRYPTECH_DEV_BRIDGE
+ // Blink blue LED for six seconds to not upset the Novena at boot.
+ led_on(LED_BLUE);
+ for (int i = 0; i < 12; i++) {
+ osDelay(500);
+ led_toggle(LED_BLUE);
+ }
+#endif
+ // prepare fmc interface
+ fmc_init();
+
+ rpc_buffer_pool = osPoolCreate(osPool(rpc_buffer_pool));
+ uart_mutex = osMutexCreate(osMutex(uart_mutex));
+
+#ifdef TARGET_CRYPTECH_ALPHA
+ // Launch other threads:
+ // - admin thread on USART1
+ // - csprng warm-up thread?
+#endif
+
+ if (hal_rpc_server_init() != HAL_OK)
+ return 1;
+ rpc_server_main();
+}
More information about the Commits
mailing list