wip: c33

facchinm · facchinm · commit 88b94168f9a5 · 2025-02-13T16:29:04.000+01:00
diff --git a/boards.txt b/boards.txt
@@ -484,7 +484,7 @@ portentac33.build.compiler_path={runtime.tools.arm-zephyr-eabi-0.16.8.path}/bin/
 portentac33.menu.mode.llext=llext
 portentac33.menu.mode.linked=linked
 
-portentac33.menu.mode.linked.build.extra_extra_ldflags=-lc -lm -lgcc -L{build.variant.path}
+portentac33.menu.mode.linked.build.extra_extra_ldflags=-lc -lm -lgcc -L{build.variant.path} -Wl,--wrap=random -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=malloc -Wl,--wrap=realloc 
 portentac33.menu.mode.linked.build.llext_link_flags=
 portentac33.menu.mode.linked.build.suffix=_linked
 portentac33.menu.mode.linked.build.ldscript={runtime.platform.path}/variants/linked/linker_script.ld
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "Arduino.h"
+#include "zephyr/kernel.h"
 #include <cstdint>
 #ifdef CONFIG_LLEXT
 #include <zephyr/llext/symbol.h>
@@ -59,7 +60,7 @@ static void __libc_init_array (void)
     __init_array_start[i] ();
 }
 
-extern "C" __attribute__((section(".entry_point"), used)) void entry_point(k_thread_stack_t* stack, size_t stack_size) {
+extern "C" __attribute__((section(".entry_point"), used)) void entry_point(struct k_heap* stack, size_t stack_size) {
   // copy .data in the right place
   // .bss should already be in the right place
   // call constructors
@@ -68,7 +69,15 @@ extern "C" __attribute__((section(".entry_point"), used)) void entry_point(k_thr
   extern uintptr_t _edata;
   extern uintptr_t _sbss;
   extern uintptr_t _ebss;
+  extern uintptr_t __heap_start;
+  extern uintptr_t __heap_end;
   //__asm volatile ("cpsie i");
+
+  const size_t alignment = 4096;
+  printk("Heap end: %p\n", &__heap_end);
+  printk("Heap start: %p\n", &__heap_start);
+  // __heap_start = (__heap_start + (alignment - 1)) & ~(alignment - 1);
+
   memcpy(&_sdata, &_sidata, &_edata - &_sdata);
   memset(&_sbss, 0, &_ebss - &_sbss);
   __libc_init_array();
diff --git a/cores/arduino/new.cpp b/cores/arduino/new.cpp
@@ -132,4 +132,4 @@ void operator delete(void* ptr, void* place) noexcept {
 void operator delete[](void* ptr, void* place) noexcept {
   (void)ptr; (void)place; // unused
   // Nothing to do
-}
+}
diff --git a/extra/build.sh b/extra/build.sh
@@ -33,8 +33,16 @@ fi
 # Generate the provides.ld file for linked builds
 echo "Exporting provides.ld"
 arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep FUNC | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' > variants/$variant/provides.ld
-arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep llext_stack | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> variants/$variant/provides.ld
-arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep llext_stack | awk -F' ' '{print "PROVIDE(llext_stack_size = "$3");"}' >> variants/$variant/provides.ld
+arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> variants/$variant/provides.ld
+arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap_llext_heap | awk -F' ' '{print "PROVIDE(kheap_llext_heap_size = "$3");"}' >> variants/$variant/provides.ld
+arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE("$8" = 0x"$2");"}' >> variants/$variant/provides.ld
+arm-none-eabi-readelf --wide -s build/zephyr/zephyr.elf  | c++filt  | grep kheap__system_heap | awk -F' ' '{print "PROVIDE(kheap__system_heap_size = "$3");"}' >> variants/$variant/provides.ld
 cat build/zephyr/zephyr.map | grep __device_dts_ord | grep -v rodata | grep -v llext_const_symbol |  awk -F' ' '{print "PROVIDE("$2" = "$1");"}'  >> variants/$variant/provides.ld
 TEXT_START=`cat loader/boards/$variant.overlay | grep user_sketch: | cut -f2 -d"@" | cut -f1 -d"{"`
 echo "PROVIDE(_sketch_start = 0x$TEXT_START);" >> variants/$variant/provides.ld
+
+sed -i 's/PROVIDE(malloc =/PROVIDE(__wrap_malloc =/g' variants/$variant/provides.ld
+sed -i 's/PROVIDE(free =/PROVIDE(__wrap_free =/g' variants/$variant/provides.ld
+sed -i 's/PROVIDE(realloc =/PROVIDE(__wrap_realloc =/g' variants/$variant/provides.ld
+sed -i 's/PROVIDE(calloc =/PROVIDE(__wrap_calloc =/g' variants/$variant/provides.ld
+sed -i 's/PROVIDE(random =/PROVIDE(__wrap_random =/g' variants/$variant/provides.ld
diff --git a/libraries/SocketWrapper/SocketHelpers.h b/libraries/SocketWrapper/SocketHelpers.h
@@ -135,6 +135,10 @@ class NetworkInterface {
         return (ret == 0);
     }
 
+    bool disconnect() {
+        return (net_if_down(net_if_get_by_index(iface_index)) == 0);
+    }
+
     // TODO: manual functions for setting IP address, subnet mask, gateway, etc.
     // net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
     // net_if_ipv4_addr_add(iface, &addr4, NET_ADDR_MANUAL, 0);
@@ -148,6 +152,14 @@ class NetworkInterface {
         }
     }
 
+    bool begin(uint8_t* mac_address, int _timeout, int _response_timeout) {
+        return begin();
+    }
+
+    bool begin(uint8_t* mac_address, IPAddress _ip, IPAddress _dns, IPAddress _gateway, IPAddress _netmask, int _timeout, int _response_timeout) {
+        return begin();
+    }
+
     EthernetHardwareStatus hardwareStatus() {
         const struct device *const dev = DEVICE_DT_GET(DT_COMPAT_GET_ANY_STATUS_OKAY(ethernet_phy));
         if (device_is_ready(dev)) {
diff --git a/libraries/SocketWrapper/SocketWrapper.h b/libraries/SocketWrapper/SocketWrapper.h
@@ -117,7 +117,6 @@ class ZephyrSocketWrapper {
         if (ca_certificate_pem != nullptr) {
             ret = tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
                 ca_certificate_pem, strlen(ca_certificate_pem) + 1);
-            Serial.println(ret);
         }
 
         sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
diff --git a/libraries/SocketWrapper/ZephyrClient.h b/libraries/SocketWrapper/ZephyrClient.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "SocketWrapper.h"
 #include "api/Client.h"
 #include "unistd.h"
diff --git a/libraries/SocketWrapper/ZephyrSSLClient.h b/libraries/SocketWrapper/ZephyrSSLClient.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "SocketWrapper.h"
 #include "api/Client.h"
 #include "unistd.h"
diff --git a/loader/boards/arduino_portenta_c33.conf b/loader/boards/arduino_portenta_c33.conf
@@ -44,7 +44,7 @@ CONFIG_INIT_STACKS=y
 
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_NET_MGMT=y
-#CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
+CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 CONFIG_NET_MGMT=y
 CONFIG_NET_MGMT_EVENT=y
 CONFIG_NET_L2_ETHERNET=y
@@ -58,11 +58,11 @@ CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
 CONFIG_POSIX_API=y
 
-#CONFIG_MBEDTLS=y
-#CONFIG_MBEDTLS_BUILTIN=y
-#CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
-#CONFIG_MBEDTLS_ENABLE_HEAP=y
-#CONFIG_MBEDTLS_HEAP_SIZE=60000
-#CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=7168
-#CONFIG_MBEDTLS_HASH_ALL_ENABLED=y
-#CONFIG_MBEDTLS_CMAC=y
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=60000
+CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=7168
+CONFIG_MBEDTLS_HASH_ALL_ENABLED=y
+CONFIG_MBEDTLS_CMAC=y
diff --git a/loader/boards/arduino_portenta_c33.overlay b/loader/boards/arduino_portenta_c33.overlay
@@ -72,8 +72,8 @@
 
 		pwm-pin-gpios =	<&ioport6 0 0>;
 
-		serials = <&cdc_acm_uart0>,<&uart9>;
-		cdc-acm = <&cdc_acm_uart0>;
+		serials = /*<&cdc_acm_uart0>,*/ <&uart9>;
+		/* cdc-acm = <&cdc_acm_uart0>; */
 		i2cs = <&iic1>;
 		spis = <&spi1>;
 		pwms = <&pwm6 1 PWM_HZ(25000000) PWM_POLARITY_NORMAL>;
diff --git a/loader/llext_exports.c b/loader/llext_exports.c
@@ -60,6 +60,7 @@ EXPORT_SYMBOL(z_log_msg_runtime_vcreate);
 
 #if defined(CONFIG_NETWORKING)
 FORCE_EXPORT_SYM(net_if_foreach);
+FORCE_EXPORT_SYM(net_if_down);
 FORCE_EXPORT_SYM(net_if_get_by_iface);
 FORCE_EXPORT_SYM(net_if_ipv4_maddr_add);
 FORCE_EXPORT_SYM(net_if_ipv4_maddr_join);
diff --git a/loader/main.c b/loader/main.c
@@ -26,9 +26,8 @@ const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zep
 
 static int enable_shell_usb(void);
 
-K_THREAD_STACK_DEFINE(llext_stack, CONFIG_MAIN_STACK_SIZE);
-
 #ifdef CONFIG_USERSPACE
+K_THREAD_STACK_DEFINE(llext_stack, CONFIG_MAIN_STACK_SIZE);
 struct k_thread llext_thread;
 
 void llext_entry(void *arg0, void *arg1, void *arg2)
@@ -103,9 +102,9 @@ static int loader(const struct shell *sh)
 		#if CONFIG_ICACHE
 		barrier_isync_fence_full();
 		#endif
-		memset(llext_stack, 0, CONFIG_MAIN_STACK_SIZE);
-		void (*entry_point)(k_thread_stack_t * stack, size_t stack_size) = (void (*)(k_thread_stack_t * stack, size_t stack_size))(offset+header_len+1);
-		entry_point(llext_stack, K_THREAD_STACK_SIZEOF(llext_stack));
+		extern struct k_heap llext_heap;
+		void (*entry_point)(struct k_heap * heap, size_t heap_size) = (void (*)(struct k_heap * stack, size_t stack_size))(offset+header_len+1);
+		entry_point(&llext_heap, llext_heap.heap.init_bytes);
 		// should never reach here
 		for (;;) {
 			k_sleep(K_FOREVER);
diff --git a/loader/prj.conf b/loader/prj.conf
@@ -42,4 +42,5 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 
 CONFIG_CPP=y
-CONFIG_STD_CPP17=y
+CONFIG_STD_CPP17=y
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/platform.txt b/platform.txt
@@ -88,8 +88,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DARDUIN
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} {compiler.zephyr.ldflags} "-T{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" {compiler.zephyr} {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags}
-#recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} {compiler.zephyr.ldflags} "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" {compiler.zephyr} {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags}
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} {compiler.zephyr.ldflags} "-T{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=picolibc.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" {compiler.zephyr} {compiler.zephyr.extra_ldflags} {compiler.libraries.ldflags}
 
 ## Create eeprom
 recipe.objcopy.eep.pattern=
diff --git a/variants/arduino_portenta_c33/llext-edk/include/modules/hal/renesas/drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6M5BH.h b/variants/arduino_portenta_c33/llext-edk/include/modules/hal/renesas/drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6M5BH.h
@@ -9222,7 +9222,7 @@ typedef struct                         /*!< (@ 0x4009F000) R_IIC0 Structure
 
         struct
         {
-            __IOM uint8_t BC   : 3;    /*!< [2..0] Bit Counter                                                        */
+            __IOM uint8_t _BC   : 3;    /*!< [2..0] Bit Counter                                                        */
             __OM uint8_t  BCWP : 1;    /*!< [3..3] BC Write Protect(This bit is read as 1.)                           */
             __IOM uint8_t CKS  : 3;    /*!< [6..4] Internal Reference Clock (fIIC) Selection ( fIIC = PCLKB
                                         *   / 2^CKS )                                                                 */
diff --git a/variants/arduino_portenta_c33/llext-edk/include/zephyr/include/generated/zephyr/autoconf.h b/variants/arduino_portenta_c33/llext-edk/include/zephyr/include/generated/zephyr/autoconf.h
@@ -117,6 +117,37 @@
 #define CONFIG_ZEPHYR_LITTLEFS_MODULE 1
 #define CONFIG_ZEPHYR_LVGL_MODULE 1
 #define CONFIG_ZEPHYR_MBEDTLS_MODULE 1
+#define CONFIG_MBEDTLS 1
+#define CONFIG_MBEDTLS_BUILTIN 1
+#define CONFIG_MBEDTLS_CFG_FILE "config-tls-generic.h"
+#define CONFIG_MBEDTLS_TLS_VERSION_1_2 1
+#define CONFIG_MBEDTLS_PSK_MAX_LEN 32
+#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED 1
+#define CONFIG_MBEDTLS_SOME_AEAD_CIPHER_ENABLED 1
+#define CONFIG_MBEDTLS_SOME_CIPHER_ENABLED 1
+#define CONFIG_MBEDTLS_CIPHER_AES_ENABLED 1
+#define CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED 1
+#define CONFIG_MBEDTLS_CMAC 1
+#define CONFIG_MBEDTLS_HASH_ALL_ENABLED 1
+#define CONFIG_MBEDTLS_MD5 1
+#define CONFIG_MBEDTLS_SHA1 1
+#define CONFIG_MBEDTLS_SHA224 1
+#define CONFIG_MBEDTLS_SHA256 1
+#define CONFIG_MBEDTLS_SHA256_SMALLER 1
+#define CONFIG_MBEDTLS_SHA384 1
+#define CONFIG_MBEDTLS_SHA512 1
+#define CONFIG_MBEDTLS_POLY1305 1
+#define CONFIG_MBEDTLS_CTR_DRBG_ENABLED 1
+#define CONFIG_MBEDTLS_CIPHER 1
+#define CONFIG_MBEDTLS_MD 1
+#define CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT 1
+#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 7168
+#define CONFIG_MBEDTLS_LOG_LEVEL_DEFAULT 1
+#define CONFIG_MBEDTLS_LOG_LEVEL 3
+#define CONFIG_MBEDTLS_ENABLE_HEAP 1
+#define CONFIG_MBEDTLS_HEAP_SIZE 60000
+#define CONFIG_MBEDTLS_INIT 1
+#define CONFIG_APP_LINK_WITH_MBEDTLS 1
 #define CONFIG_ZEPHYR_MCUBOOT_MODULE 1
 #define CONFIG_ZEPHYR_SEGGER_MODULE 1
 #define CONFIG_HAS_SEGGER_RTT 1
@@ -676,8 +707,13 @@
 #define CONFIG_NET_SOCKETS_SERVICE 1
 #define CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO 15
 #define CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE 1200
+#define CONFIG_NET_SOCKETS_SOCKOPT_TLS 1
 #define CONFIG_NET_SOCKETS_TLS_PRIORITY 45
 #define CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH 1
+#define CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS 1
+#define CONFIG_NET_SOCKETS_TLS_MAX_CREDENTIALS 4
+#define CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES 4
+#define CONFIG_NET_SOCKETS_TLS_MAX_CLIENT_SESSION_COUNT 1
 #define CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY 40
 #define CONFIG_NET_SOCKETPAIR 1
 #define CONFIG_NET_SOCKETPAIR_BUFFER_SIZE 64
@@ -686,6 +722,11 @@
 #define CONFIG_NET_SOCKETS_NET_MGMT 1
 #define CONFIG_NET_SOCKETS_NET_MGMT_MAX_LISTENERS 1
 #define CONFIG_NET_SOCKETS_LOG_LEVEL 0
+#define CONFIG_TLS_CREDENTIALS 1
+#define CONFIG_TLS_CREDENTIALS_LOG_LEVEL_DEFAULT 1
+#define CONFIG_TLS_CREDENTIALS_LOG_LEVEL 3
+#define CONFIG_TLS_CREDENTIALS_BACKEND_VOLATILE 1
+#define CONFIG_TLS_MAX_CREDENTIALS_NUMBER 4
 #define CONFIG_NET_DHCPV4 1
 #define CONFIG_NET_DHCPV4_LOG_LEVEL 0
 #define CONFIG_NET_DHCPV4_INITIAL_DELAY_MAX 10
diff --git a/variants/arduino_portenta_c33/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h b/variants/arduino_portenta_c33/llext-edk/include/zephyr/include/generated/zephyr/devicetree_generated.h
diff --git a/variants/linked/linker_script.ld b/variants/linked/linker_script.ld

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ class ZephyrSocketWrapper {`
`117`	`117`	`if (ca_certificate_pem != nullptr) {`
`118`	`118`	`ret = tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,`
`119`	`119`	`ca_certificate_pem, strlen(ca_certificate_pem) + 1);`
`120`		`- Serial.println(ret);`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#pragma once`
	`2`	`+`
`1`	`3`	`#include "SocketWrapper.h"`
`2`	`4`	`#include "api/Client.h"`
`3`	`5`	`#include "unistd.h"`