This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c16432412205b1c8145c36575748076d003dffe7 Author: Gustavo Henrique Nihei <[email protected]> AuthorDate: Mon Mar 7 17:37:09 2022 -0300 esp32s2-saola-1: Initialize Watchdog Timers on bringup Signed-off-by: Gustavo Henrique Nihei <[email protected]> --- .../esp32s2/common/include/esp32s2_board_wdt.h | 73 ++++++++++++++++++ boards/xtensa/esp32s2/common/src/Make.defs | 4 + .../xtensa/esp32s2/common/src/esp32s2_board_wdt.c | 89 ++++++++++++++++++++++ .../esp32s2-saola-1/configs/watchdog/defconfig | 51 +++++++++++++ .../esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c | 14 ++++ 5 files changed, 231 insertions(+) diff --git a/boards/xtensa/esp32s2/common/include/esp32s2_board_wdt.h b/boards/xtensa/esp32s2/common/include/esp32s2_board_wdt.h new file mode 100644 index 0000000..f309cf1 --- /dev/null +++ b/boards/xtensa/esp32s2/common/include/esp32s2_board_wdt.h @@ -0,0 +1,73 @@ +/**************************************************************************** + * boards/xtensa/esp32s2/common/include/esp32s2_board_wdt.h + * + * 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. + * + ****************************************************************************/ + +#ifndef __BOARDS_XTENSA_ESP32S2_COMMON_INCLUDE_ESP32S2_BOARD_WDT_H +#define __BOARDS_XTENSA_ESP32S2_COMMON_INCLUDE_ESP32S2_BOARD_WDT_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#ifndef __ASSEMBLY__ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef CONFIG_WATCHDOG + +/**************************************************************************** + * Name: board_wdt_init + * + * Description: + * Configure the watchdog timer driver. + * + * Returned Value: + * Zero (OK) is returned on success; A negated errno value is returned + * to indicate the nature of any failure. + * + ****************************************************************************/ + +int board_wdt_init(void); + +#endif /* CONFIG_WATCHDOG */ + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* __BOARDS_XTENSA_ESP32S2_COMMON_INCLUDE_ESP32S2_BOARD_WDT_H */ diff --git a/boards/xtensa/esp32s2/common/src/Make.defs b/boards/xtensa/esp32s2/common/src/Make.defs index e019319..6fc1ebe 100644 --- a/boards/xtensa/esp32s2/common/src/Make.defs +++ b/boards/xtensa/esp32s2/common/src/Make.defs @@ -18,6 +18,10 @@ # ############################################################################# +ifeq ($(CONFIG_WATCHDOG),y) + CSRCS += esp32s2_board_wdt.c +endif + DEPPATH += --dep-path src VPATH += :src CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src) diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_board_wdt.c b/boards/xtensa/esp32s2/common/src/esp32s2_board_wdt.c new file mode 100644 index 0000000..57c9fd7 --- /dev/null +++ b/boards/xtensa/esp32s2/common/src/esp32s2_board_wdt.c @@ -0,0 +1,89 @@ +/**************************************************************************** + * boards/xtensa/esp32s2/common/src/esp32s2_board_wdt.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 <debug.h> + +#include "esp32s2_board_wdt.h" +#include "esp32s2_wdt_lowerhalf.h" +#include "esp32s2_wdt.h" + +#include "esp32s2-saola-1.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: board_wdt_init + * + * Description: + * Configure the watchdog timer driver. + * + * Returned Value: + * Zero (OK) is returned on success; A negated errno value is returned + * to indicate the nature of any failure. + * + ****************************************************************************/ + +int board_wdt_init(void) +{ + int ret = OK; + +#ifdef CONFIG_ESP32S2_MWDT0 + ret = esp32s2_wdt_initialize("/dev/watchdog0", ESP32S2_WDT_MWDT0); + if (ret < 0) + { + syslog(LOG_ERR, "Failed to initialize MWDT0: %d\n", ret); + return ret; + } +#endif /* CONFIG_ESP32S2_MWDT0 */ + +#ifdef CONFIG_ESP32S2_MWDT1 + ret = esp32s2_wdt_initialize("/dev/watchdog1", ESP32S2_WDT_MWDT1); + if (ret < 0) + { + syslog(LOG_ERR, "Failed to initialize MWDT1: %d\n", ret); + return ret; + } +#endif /* CONFIG_ESP32S2_MWDT1 */ + +#ifdef CONFIG_ESP32S2_RWDT + ret = esp32s2_wdt_initialize("/dev/watchdog2", ESP32S2_WDT_RWDT); + if (ret < 0) + { + syslog(LOG_ERR, "Failed to initialize RWDT: %d\n", ret); + return ret; + } +#endif /* CONFIG_ESP32S2_RWDT */ + + return ret; +} + diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig new file mode 100644 index 0000000..7ec1279 --- /dev/null +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/watchdog/defconfig @@ -0,0 +1,51 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +# CONFIG_ARCH_LEDS is not set +# CONFIG_NSH_ARGCAT is not set +# CONFIG_NSH_CMDOPT_HEXDUMP is not set +# CONFIG_NSH_CMDPARMS is not set +CONFIG_ARCH="xtensa" +CONFIG_ARCH_BOARD="esp32s2-saola-1" +CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y +CONFIG_ARCH_CHIP="esp32s2" +CONFIG_ARCH_CHIP_ESP32S2=y +CONFIG_ARCH_CHIP_ESP32S2WROVER=y +CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_XTENSA=y +CONFIG_BOARD_LOOPSPERMSEC=16717 +CONFIG_BUILTIN=y +CONFIG_DEBUG_FULLOPT=y +CONFIG_DEBUG_SYMBOLS=y +CONFIG_ESP32S2_DATA_CACHE_0KB=y +CONFIG_ESP32S2_MWDT0=y +CONFIG_ESP32S2_MWDT1=y +CONFIG_ESP32S2_UART0=y +CONFIG_EXAMPLES_WATCHDOG=y +CONFIG_FS_PROCFS=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_IDLETHREAD_STACKSIZE=3072 +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INTELHEX_BINARY=y +CONFIG_NSH_ARCHINIT=y +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_LINELEN=64 +CONFIG_NSH_READLINE=y +CONFIG_PREALLOC_TIMERS=4 +CONFIG_RAM_SIZE=114688 +CONFIG_RAM_START=0x20000000 +CONFIG_RAW_BINARY=y +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_WAITPID=y +CONFIG_START_DAY=6 +CONFIG_START_MONTH=12 +CONFIG_START_YEAR=2011 +CONFIG_SYSTEM_NSH=y +CONFIG_UART0_SERIAL_CONSOLE=y +CONFIG_WATCHDOG=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c index f6dd5ed..198ca5c 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c @@ -54,6 +54,10 @@ # include "esp32s2_rt_timer.h" #endif +#ifdef CONFIG_WATCHDOG +# include "esp32s2_board_wdt.h" +#endif + #include "esp32s2-saola-1.h" /**************************************************************************** @@ -99,6 +103,16 @@ int esp32s2_bringup(void) } #endif +#ifdef CONFIG_WATCHDOG + /* Configure watchdog timer */ + + ret = board_wdt_init(); + if (ret < 0) + { + syslog(LOG_ERR, "Failed to initialize watchdog timer: %d\n", ret); + } +#endif + #ifdef CONFIG_DEV_GPIO ret = esp32s2_gpio_init(); if (ret < 0)
