Xtensa ESP32: Automatically mount /proc at start-up.

2016-12-19 09:43:16 -06:00 · 2016-12-19 09:43:16 -06:00 · 886ce88b4f
commit 886ce88b4f
parent b47255a6de
5 changed files with 85 additions and 37 deletions
--- a/arch/xtensa/src/common/xtensa_irqdispatch.c
+++ b/arch/xtensa/src/common/xtensa_irqdispatch.c
@ -99,14 +99,14 @@ uint32_t *xtensa_irq_dispatch(int irq, uint32_t *regs)
  if (regs != CURRENT_REGS)
    {
 #if XCHAL_CP_NUM > 0
-      /* If an interrupt level context switch has occurred, then save the
-       * co-processor state in in the suspended thread's co-processor save
-       * area.
-       *
-       * NOTE 1. The state of the co-processor has not been altered and
-       *         still represents the to-be-suspended thread.
-       * NOTE 2. We saved a reference  TCB of the original thread on entry.
-       */
+       /* If an interrupt level context switch has occurred, then save the
+        * co-processor state in in the suspended thread's co-processor save
+        * area.
+        *
+        * NOTE 1. The state of the co-processor has not been altered and
+        *         still represents the to-be-suspended thread.
+        * NOTE 2. We saved a reference  TCB of the original thread on entry.
+        */

       xtensa_coproc_savestate(&tcb->xcp.cpstate);

--- a/arch/xtensa/src/common/xtensa_vectors.S
+++ b/arch/xtensa/src/common/xtensa_vectors.S
@ -280,9 +280,14 @@ _double_exception_vector:
 	s32i	a0, sp, (4 * REG_PS)
 	rsr		a0, DEPC						/* Save interruptee's PC */
 	s32i	a0, sp, (4 * REG_PC)
-	rsr		a0, EXCSAVE_1					/* Save interruptee's a0 -- REVISIT */
+	rsr		a0, EXCSAVE						/* Save interruptee's a0 -- REVISIT */
 	s32i	a0, sp, (4 * REG_A0)

+	rsr		a0, EXCCAUSE					/* Save the EXCCAUSE register */
+	s32i	a0, sp, (4 * REG_EXCCAUSE)
+	rsr		a0, EXCVADDR					/* Save the EXCVADDR register */
+	s32i	a0, sp, (4 * REG_EXCVADDR)
+
 	s32i	a2, sp, (4 * REG_A2)
 	movi	a2, XTENSA_DOUBLE_EXCEPTION		/* Argument 1: Error code */
 	call0	_xtensa_panic					/* Does not return */
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@ -51,8 +51,9 @@ CONFIG_DEBUG_ALERT=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
-# CONFIG_ARCH_HAVE_CUSTOMOPT is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
 CONFIG_DEBUG_FULLOPT=y

 #
@ -77,6 +78,10 @@ CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_FAMILY_LX6=y
 # CONFIG_XTENSA_USE_OVLY is not set
 CONFIG_XTENSA_CP_INITSET=0x0001
+
+#
+# ESP32 Peripheral Selection
+#
 CONFIG_ESP32_UART=y
 # CONFIG_ESP32_SPI2 is not set
 # CONFIG_XTENSA_TIMER1 is not set
@ -84,24 +89,20 @@ CONFIG_ESP32_UART=y
 CONFIG_ESP32_UART0=y
 # CONFIG_ESP32_UART1 is not set
 # CONFIG_ESP32_UART2 is not set
-CONFIG_ESP32_BT_RESERVE_DRAM=0
-CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
-CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
-# CONFIG_ESP32_GPIO_IRQ is not set
-CONFIG_ESP32_UART0_TXPIN=0
-CONFIG_ESP32_UART0_RXPIN=0
-
-#
-# ESP32 Peripheral Selection
-#

 #
 # Memory Configuration
 #
+CONFIG_ESP32_BT_RESERVE_DRAM=0
+CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_GPIO_IRQ is not set

 #
 # UART configuration
 #
+CONFIG_ESP32_UART0_TXPIN=0
+CONFIG_ESP32_UART0_RXPIN=0

 #
 # Architecture Options
@ -174,7 +175,11 @@ CONFIG_ESP32CORE_XTAL_40MZ=y
 # CONFIG_ESP32CORE_XTAL_26MHz is not set
 # CONFIG_ESP32CORE_RUN_IRAM is not set
 # CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set

 #
 # RTOS Features
@ -205,6 +210,7 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_SPINLOCK is not set
 # CONFIG_SMP is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
@ -222,6 +228,8 @@ CONFIG_SCHED_WAITPID=y
 #
 # CONFIG_MUTEX_TYPES is not set
 CONFIG_NPTHREAD_KEYS=4
+# CONFIG_PTHREAD_CLEANUP is not set
+# CONFIG_CANCELLATION_POINTS is not set

 #
 # Performance Monitoring
@ -536,6 +544,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 # CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_IPv4_ADDRCONV is not set
+# CONFIG_LIBC_IPv6_ADDRCONV is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set

@ -598,10 +608,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
@ -623,6 +633,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@ -761,7 +772,7 @@ CONFIG_NSH_FILEIOSIZE=512
 #
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
-# CONFIG_NSH_ARCHINIT is not set
+CONFIG_NSH_ARCHINIT=y
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set

--- a/configs/esp32-core/smp/defconfig
+++ b/configs/esp32-core/smp/defconfig
@ -51,8 +51,9 @@ CONFIG_DEBUG_ALERT=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
-# CONFIG_ARCH_HAVE_CUSTOMOPT is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
 CONFIG_DEBUG_FULLOPT=y

 #
@ -77,6 +78,10 @@ CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_FAMILY_LX6=y
 # CONFIG_XTENSA_USE_OVLY is not set
 CONFIG_XTENSA_CP_INITSET=0x0001
+
+#
+# ESP32 Peripheral Selection
+#
 CONFIG_ESP32_UART=y
 # CONFIG_ESP32_SPI2 is not set
 # CONFIG_XTENSA_TIMER1 is not set
@ -84,24 +89,20 @@ CONFIG_ESP32_UART=y
 CONFIG_ESP32_UART0=y
 # CONFIG_ESP32_UART1 is not set
 # CONFIG_ESP32_UART2 is not set
-CONFIG_ESP32_BT_RESERVE_DRAM=0
-CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
-CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
-# CONFIG_ESP32_GPIO_IRQ is not set
-CONFIG_ESP32_UART0_TXPIN=0
-CONFIG_ESP32_UART0_RXPIN=0
-
-#
-# ESP32 Peripheral Selection
-#

 #
 # Memory Configuration
 #
+CONFIG_ESP32_BT_RESERVE_DRAM=0
+CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_GPIO_IRQ is not set

 #
 # UART configuration
 #
+CONFIG_ESP32_UART0_TXPIN=0
+CONFIG_ESP32_UART0_RXPIN=0

 #
 # Architecture Options
@ -174,7 +175,11 @@ CONFIG_ESP32CORE_XTAL_40MZ=y
 # CONFIG_ESP32CORE_XTAL_26MHz is not set
 # CONFIG_ESP32CORE_RUN_IRAM is not set
 # CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set

 #
 # RTOS Features
@ -225,6 +230,8 @@ CONFIG_SCHED_WAITPID=y
 #
 # CONFIG_MUTEX_TYPES is not set
 CONFIG_NPTHREAD_KEYS=4
+# CONFIG_PTHREAD_CLEANUP is not set
+# CONFIG_CANCELLATION_POINTS is not set

 #
 # Performance Monitoring
@ -539,6 +546,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 # CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_IPv4_ADDRCONV is not set
+# CONFIG_LIBC_IPv6_ADDRCONV is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set

@ -601,10 +610,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
@ -629,6 +638,7 @@ CONFIG_EXAMPLES_SMP_STACKSIZE=2048
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@ -767,7 +777,7 @@ CONFIG_NSH_FILEIOSIZE=512
 #
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
-# CONFIG_NSH_ARCHINIT is not set
+CONFIG_NSH_ARCHINIT=y
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set

--- a/configs/esp32-core/src/esp32_bringup.c
+++ b/configs/esp32-core/src/esp32_bringup.c
@ -38,7 +38,11 @@
 ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
+#include <sys/mount.h>
+#include <syslog.h>
+
 #include "esp32-core.h"

 /****************************************************************************
@ -65,5 +69,23 @@

 int esp32_bringup(void)
 {
+  int ret;
+
+#ifdef CONFIG_FS_PROCFS
+  /* Mount the procfs file system */
+
+  ret = mount(NULL, "/proc", "procfs", 0, NULL);
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to mount procfs at /proc: %d\n", ret);
+    }
+#endif
+
+  /* If we got here then perhaps not all initialization was successful, but
+   * at least enough succeeded to bring-up NSH with perhaps reduced
+   * capabilities.
+   */
+
+  UNUSED(ret);
  return OK;
 }