xtensa/esp32s2: Add rtc heap support

arch/xtensa/Kconfig

@@ -53,6 +53,7 @@ config ARCH_CHIP_ESP32S2
 	select XTENSA_HAVE_INTERRUPTS
 	select ARCH_HAVE_BOOTLOADER
 	select ARCH_HAVE_RESET
+	select ARCH_HAVE_TEXT_HEAP
 	select ARCH_VECNOTIRQ
 	select LIBC_ARCH_ATOMIC
 	select LIBC_ARCH_MEMCPY

arch/xtensa/src/esp32s2/Kconfig

@@ -476,6 +476,13 @@ config ESP32S2_ULP_COPROC_RESERVE_MEM
 	int "Reserved ULP co-processor DRAM"
 	default 0
 
+comment "Additional Heaps"
+
+config ESP32S2_RTC_HEAP
+	bool "Use the RTC memory as a separate heap"
+	select ARCH_HAVE_EXTRA_HEAPS
+	default n
+
 endmenu # Memory Configuration
 
 config ESP32S2_GPIO_IRQ

arch/xtensa/src/esp32s2/Make.defs

@@ -98,6 +98,18 @@ ifeq ($(CONFIG_WATCHDOG),y)
 CHIP_CSRCS += esp32s2_wdt_lowerhalf.c
 endif
 
+ifeq ($(CONFIG_ARCH_HAVE_EXTRA_HEAPS),y)
+CHIP_CSRCS += esp32s2_extraheaps.c
+endif
+
+ifeq ($(CONFIG_ESP32S2_RTC_HEAP),y)
+CHIP_CSRCS += esp32s2_rtcheap.c
+endif
+
+ifeq ($(CONFIG_ARCH_USE_TEXT_HEAP),y)
+CHIP_CSRCS += esp32s2_textheap.c
+endif
+
 ifeq ($(CONFIG_ESP32S2_FREERUN),y)
 CHIP_CSRCS += esp32s2_freerun.c
 endif

arch/xtensa/src/esp32s2/esp32s2_extraheaps.c

@@ -0,0 +1,62 @@
+/****************************************************************************
+ * arch/xtensa/src/esp32s2/esp32s2_extraheaps.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <string.h>
+#include <assert.h>
+#include <debug.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
+#include "hardware/esp32s2_soc.h"
+
+#ifdef CONFIG_ESP32S2_RTC_HEAP
+#include "esp32s2_rtcheap.h"
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_extraheaps_init
+ *
+ * Description:
+ *   Initialize any extra heap.
+ *
+ ****************************************************************************/
+
+void up_extraheaps_init()
+{
+#ifdef CONFIG_ESP32S2_RTC_HEAP
+  /* Initialize the RTC heap */
+
+  esp32s2_rtcheap_initialize();
+#endif
+}
+

arch/xtensa/src/esp32s2/esp32s2_rtcheap.c

@@ -0,0 +1,226 @@
+/****************************************************************************
+ * arch/xtensa/src/esp32s2/esp32s2_rtcheap.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/mm/mm.h>
+
+#include "esp32s2_rtcheap.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct mm_heap_s *g_rtcheap;
+
+/****************************************************************************
+ * Extern values declaration
+ ****************************************************************************/
+
+/* These values come from the linker scripts. Check boards/xtensa/esp32s2.  */
+
+extern uint8_t _srtcheap[];
+extern uint8_t _ertcheap[];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_initialize
+ *
+ * Description:
+ *   Initialize the RTC heap.
+ *
+ ****************************************************************************/
+
+void esp32s2_rtcheap_initialize(void)
+{
+  void *start;
+  size_t size;
+
+  start = (void *)_srtcheap;
+  size  = _ertcheap - _srtcheap;
+  g_rtcheap = mm_initialize("rtcheap", start, size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_malloc
+ *
+ * Description:
+ *   Allocate memory from the RTC heap.
+ *
+ * Parameters:
+ *   size - Size (in bytes) of the memory region to be allocated.
+ *
+ * Return Value:
+ *   Adress of the allocated memory space. NULL, if allocation fails.
+ *
+ ****************************************************************************/
+
+void *esp32s2_rtcheap_malloc(size_t size)
+{
+  return mm_malloc(g_rtcheap, size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_calloc
+ *
+ * Description:
+ *   Calculates the size of the allocation and allocate memory from
+ *   the RTC heap.
+ *
+ * Parameters:
+ *   n         - Size (in types) of the memory region to be allocated.
+ *   elem_size - Size (in bytes) of the type to be allocated.
+ *
+ * Return Value:
+ *   Adress of the allocated memory space. NULL, if allocation fails.
+ *
+ ****************************************************************************/
+
+void *esp32s2_rtcheap_calloc(size_t n, size_t elem_size)
+{
+  return mm_calloc(g_rtcheap, n, elem_size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_realloc
+ *
+ * Description:
+ *   Reallocate memory from the RTC heap.
+ *
+ * Parameters:
+ *   ptr  - Adress to be reallocate.
+ *   size - Size (in bytes) to be reallocate.
+ *
+ * Return Value:
+ *   Adress of the possibly moved memory space. NULL, if allocation fails.
+ *
+ ****************************************************************************/
+
+void *esp32s2_rtcheap_realloc(void *ptr, size_t size)
+{
+  return mm_realloc(g_rtcheap, ptr, size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_zalloc
+ *
+ * Description:
+ *   Allocate and zero memory from the RTC heap.
+ *
+ * Parameters:
+ *   size - Size (in bytes) of the memory region to be allocated.
+ *
+ * Return Value:
+ *   Adress of the allocated memory space. NULL, if allocation fails.
+ *
+ ****************************************************************************/
+
+void *esp32s2_rtcheap_zalloc(size_t size)
+{
+  return mm_zalloc(g_rtcheap, size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_free
+ *
+ * Description:
+ *   Free memory from the RTC heap.
+ *
+ * Parameters:
+ *   mem - Adress to be freed.
+ *
+ ****************************************************************************/
+
+void esp32s2_rtcheap_free(void *mem)
+{
+  mm_free(g_rtcheap, mem);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_memalign
+ *
+ * Description:
+ *   memalign requests more than enough space from malloc, finds a region
+ *   within that chunk that meets the alignment request and then frees any
+ *   leading or trailing space.
+ *
+ *   The alignment argument must be a power of two (not checked).  8-byte
+ *   alignment is guaranteed by normal malloc calls.
+ *
+ * Parameters:
+ *   alignment - Requested alignment.
+ *   size - Size (in bytes) of the memory region to be allocated.
+ *
+ * Return Value:
+ *   Adress of the allocated adress. NULL, if allocation fails.
+ *
+ ****************************************************************************/
+
+void *esp32s2_rtcheap_memalign(size_t alignment, size_t size)
+{
+  return mm_memalign(g_rtcheap, alignment, size);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_heapmember
+ *
+ * Description:
+ *   Check if an address lies in the RTC heap.
+ *
+ * Parameters:
+ *   mem - The address to check.
+ *
+ * Return Value:
+ *   True if the address is a member of the RTC heap. False if not.
+ *
+ ****************************************************************************/
+
+bool esp32s2_rtcheap_heapmember(void *mem)
+{
+  return mm_heapmember(g_rtcheap, mem);
+}
+
+/****************************************************************************
+ * Name: esp32s2_rtcheap_mallinfo
+ *
+ * Description:
+ *   mallinfo returns a copy of updated current heap information for the
+ *   user heap.
+ *
+ * Parameters:
+ *   None.
+ *
+ * Return Value:
+ *   info - Where memory information will be copied.
+ *
+ ****************************************************************************/
+
+struct mallinfo esp32s2_rtcheap_mallinfo(void)
+{
+  return mm_mallinfo(g_rtcheap);
+}