Build libhal and libtfm for stm32.

7 files changed, 237 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..890e4fe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.o
+*.bin
+*.elf
+*.hex
+*.lst
+*.map
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cb803f8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "libhal"]
+	path = libhal
+	url = git@git.cryptech.is:sw/libhal.git
+[submodule "thirdparty/libtfm"]
+	path = thirdparty/libtfm
+	url = git@git.cryptech.is:sw/thirdparty/libtfm.git
diff --git a/Drivers/.gitignore b/Drivers/.gitignore
new file mode 100644
index 0000000..b3ef86c
--- /dev/null
+++ b/Drivers/.gitignore
@@ -0,0 +1 @@
+*.[ao]
diff --git a/Makefile b/Makefile
index a1a3fad..6f665f5 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,13 @@ SRCS += $(TOPLEVEL)/Device/system_stm32f4xx.c
 
 ###################################################
 
-CC=arm-none-eabi-gcc
-AS=arm-none-eabi-as
-OBJCOPY=arm-none-eabi-objcopy
-OBJDUMP=arm-none-eabi-objdump
-SIZE=arm-none-eabi-size
+PREFIX=arm-none-eabi-
+export CC=$(PREFIX)gcc
+export AS=$(PREFIX)as
+export AR=$(PREFIX)ar
+export OBJCOPY=$(PREFIX)objcopy
+export OBJDUMP=$(PREFIX)objdump
+export SIZE=$(PREFIX)size
 
 CFLAGS  = -ggdb -O2 -Wall -Wextra -Warray-bounds
 CFLAGS += -mcpu=cortex-m4 -mthumb -mlittle-endian -mthumb-interwork
@@ -53,13 +55,26 @@ OBJS = $(patsubst %.s,%.o, $(patsubst %.c,%.o, $(SRCS)))
 
 ###################################################
 
-.PHONY: lib proj
+.PHONY: libstmf4 proj libhal libtfm lib
+
+LIBS = libstmf4 libtfm libhal
 
 all: lib proj
 
-lib:
+init:
+	git submodule update --init --recursive
+
+lib: $(LIBS)
+
+libstmf4:
 	$(MAKE) -C $(STD_PERIPH_LIB) STDPERIPH_SETTINGS="$(STDPERIPH_SETTINGS) -I $(PWD)/include"
 
+libtfm:
+	${MAKE} -C thirdparty/libtfm PREFIX=$(PREFIX)
+
+libhal: hal_io_fmc.o
+	${MAKE} -C libhal IO_OBJ=../hal_io_fmc.o libhal.a
+
 proj: $(PROJS:=.elf)
 
 %.elf: %.o $(OBJS)
@@ -80,3 +95,5 @@ clean:
 
 distclean: clean
 	$(MAKE) -C $(STD_PERIPH_LIB) clean
+	$(MAKE) -C thirdparty/libtfm clean
+	$(MAKE) -C libhal clean
diff --git a/hal_io_fmc.c b/hal_io_fmc.c
new file mode 100644
index 0000000..cce7e06
--- /dev/null
+++ b/hal_io_fmc.c
@@ -0,0 +1,200 @@
+/*
+ * hal_io_fmc.c
+ * ------------
+ * This module contains common code to talk to the FPGA over the FMC bus.
+ *
+ * Author: Paul Selkirk
+ * Copyright (c) 2014-2015, 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 <stdio.h>
+#include <stdint.h>
+
+#include "stm-fmc.h"
+#include "libhal/hal.h"
+
+static int debug = 0;
+static int inited = 0;
+
+#ifndef FMC_IO_TIMEOUT
+#define FMC_IO_TIMEOUT  100000000
+#endif
+
+static hal_error_t init(void)
+{
+  if (!inited) {
+    fmc_init();
+    inited = 1;
+  }
+  return HAL_OK;
+}
+
+/* Translate cryptech register number to FMC address.
+ * This is a lot simpler than EIM, just shift the register number.
+ */
+static off_t fmc_offset(off_t offset)
+{
+  return (offset << 2);
+}
+
+void hal_io_set_debug(int onoff)
+{
+  debug = onoff;
+}
+
+static void dump(char *label, const uint8_t *buf, size_t len)
+{
+  if (debug) {
+    size_t i;
+    printf("%s [", label);
+    for (i = 0; i < len; ++i)
+      printf(" %02x", buf[i]);
+    printf(" ]\n");
+  }
+}
+
+hal_error_t hal_io_write(off_t offset, const uint8_t *buf, size_t len)
+{
+  hal_error_t err;
+
+  if (len % 4 != 0)
+    return HAL_ERROR_IO_BAD_COUNT;
+
+  if ((err = init()) != HAL_OK)
+    return err;
+
+  dump("write ", buf, len);
+
+  offset = fmc_offset(offset);
+  for (; len > 0; offset += 4, buf += 4, len -= 4) {
+    uint32_t val;
+    val = *(uint32_t *)buf;
+    fmc_write_32(offset, &val);
+  }
+
+  return HAL_OK;
+}
+
+hal_error_t hal_io_read(off_t offset, uint8_t *buf, size_t len)
+{
+  uint8_t *rbuf = buf;
+  int rlen = len;
+  hal_error_t err;
+
+  if (len % 4 != 0)
+    return HAL_ERROR_IO_BAD_COUNT;
+
+  if ((err = init()) != HAL_OK)
+    return err;
+
+  offset = fmc_offset(offset);
+  for (; rlen > 0; offset += 4, rbuf += 4, rlen -= 4) {
+    uint32_t val;
+    fmc_read_32(offset, &val);
+    *(uint32_t *)rbuf = val;
+  }
+
+  dump("read  ", buf, len);
+
+  return HAL_OK;
+}
+
+hal_error_t hal_io_expected(off_t offset, const uint8_t *expected, size_t len)
+{
+  hal_error_t err;
+  uint8_t buf[4];
+  size_t i;
+
+  if (len % 4 != 0)
+    return HAL_ERROR_IO_BAD_COUNT;
+
+  dump("expect", expected, len);
+
+  for (i = 0; i < len; i++) {
+    if ((i & 3) == 0 && (err = hal_io_read(offset + i/4, buf, sizeof(buf))) != HAL_OK)
+      return err;
+    if (buf[i & 3] != expected[i])
+      return HAL_ERROR_IO_UNEXPECTED;
+  }
+
+  return HAL_OK;
+}
+
+hal_error_t hal_io_init(off_t offset)
+{
+  uint8_t buf[4] = { 0, 0, 0, CTRL_INIT };
+  return hal_io_write(offset, buf, sizeof(buf));
+}
+
+hal_error_t hal_io_next(off_t offset)
+{
+  uint8_t buf[4] = { 0, 0, 0, CTRL_NEXT };
+  return hal_io_write(offset, buf, sizeof(buf));
+}
+
+hal_error_t hal_io_wait(off_t offset, uint8_t status, int *count)
+{
+  hal_error_t err;
+  uint8_t buf[4];
+  int i;
+
+  for (i = 1; ; ++i) {
+
+    if (count && (*count > 0) && (i >= *count))
+      return HAL_ERROR_IO_TIMEOUT;
+
+    if ((err = hal_io_read(offset, buf, sizeof(buf))) != HAL_OK)
+      return err;
+
+    if ((buf[3] & status) != 0) {
+      if (count)
+        *count = i;
+      return HAL_OK;
+    }
+  }
+}
+
+hal_error_t hal_io_wait_ready(off_t offset)
+{
+  int limit = FMC_IO_TIMEOUT;
+  return hal_io_wait(offset, STATUS_READY, &limit);
+}
+
+hal_error_t hal_io_wait_valid(off_t offset)
+{
+  int limit = FMC_IO_TIMEOUT;
+  return hal_io_wait(offset, STATUS_VALID, &limit);
+}
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-basic-offset: 2
+ * End:
+ */
diff --git a/libhal b/libhal
new file mode 160000
+Subproject 60cce0124f2fc3eddca03ed3950da9238247a61
diff --git a/thirdparty/libtfm b/thirdparty/libtfm
new file mode 160000
+Subproject e2eab1093a134e5a655d1ccad23a31b2b8252c6