diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig index be5b9c4fdf9..9556521373f 100644 --- a/arch/xtensa/src/esp32/Kconfig +++ b/arch/xtensa/src/esp32/Kconfig @@ -986,6 +986,13 @@ config ESP32_ONESHOT Enable a wrapper around the low level timer/counter functions to support one-shot timer. +config ESP32_FREERUN + bool "TIM free-running wrapper" + default n + ---help--- + Enable a wrapper around the low level timer/counter functions to + support a free-running timer. + endmenu # Timer/counter Configuration endif # ESP32_TIMER diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs index 7eb14de2d71..97c3ca80a28 100644 --- a/arch/xtensa/src/esp32/Make.defs +++ b/arch/xtensa/src/esp32/Make.defs @@ -160,6 +160,10 @@ CHIP_CSRCS += esp32_oneshot_lowerhalf.c endif endif +ifeq ($(CONFIG_ESP32_FREERUN),y) +CHIP_CSRCS += esp32_freerun.c +endif + ifeq ($(CONFIG_ESP32_PARTITION),y) CHIP_CSRCS += esp32_partition.c endif diff --git a/arch/xtensa/src/esp32/esp32_freerun.c b/arch/xtensa/src/esp32/esp32_freerun.c new file mode 100644 index 00000000000..f1489da9db8 --- /dev/null +++ b/arch/xtensa/src/esp32/esp32_freerun.c @@ -0,0 +1,340 @@ +/**************************************************************************** + * arch/xtensa/src/esp32/esp32_freerun.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 + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "esp32_freerun.h" +#include "esp32_clockconfig.h" + +#ifdef CONFIG_ESP32_FREERUN + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define MAX_TIMERS 4 +#define MAX_US_RESOLUTION 819 +#define ESP32_TIMER_WIDTH 64 + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: esp32_freerun_handler + * + * Description: + * Timer interrupt callback. When the freerun timer counter overflows, + * this interrupt will occur. We will just increment an overflow counter. + * + * Input Parameters: + * irq - IRQ associated to that interrupt + * arg - An opaque argument provided when the interrupt was registered + * + * Returned Value: + * OK + * + ****************************************************************************/ + +#ifndef CONFIG_CLOCK_TIMEKEEPING +static int esp32_freerun_handler(int irq, void *context, void *arg) +{ + struct esp32_freerun_s *freerun = (struct esp32_freerun_s *) arg; + + DEBUGASSERT(freerun != NULL); + DEBUGASSERT(freerun->overflow < UINT64_MAX); + freerun->overflow++; + ESP32_TIM_SETALRM(freerun->tch, true); /* Re-enables the alarm */ + ESP32_TIM_ACKINT(freerun->tch); /* Clear the Interrupt */ + return OK; +} +#endif /* CONFIG_CLOCK_TIMEKEEPING */ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: esp32_freerun_initialize + * + * Description: + * Initialize the freerun timer wrapper. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure + * chan Timer counter channel to be used. + * resolution The required resolution of the timer in units of + * microseconds. NOTE that the range is restricted to the + * range of uint16_t (excluding zero). + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +int esp32_freerun_initialize(struct esp32_freerun_s *freerun, int chan, + uint16_t resolution) +{ + uint16_t pre; + int ret = OK; + + tmrinfo("chan=%d resolution=%d usecs\n", chan, resolution); + + DEBUGASSERT(freerun != NULL); + DEBUGASSERT(chan >= 0); + DEBUGASSERT(chan < MAX_TIMERS); + DEBUGASSERT(resolution > 0); + + /* We can't have a resolution bigger than this. + * The ESP32 prescaler doesn't support. + * max resolution = (max prescaler * USEC_PER_SEC) / esp_clk_apb_freq() + */ + + DEBUGASSERT(resolution <= MAX_US_RESOLUTION); + irqstate_t flags; + + freerun->tch = esp32_tim_init(chan); + if (freerun->tch == NULL) + { + tmrerr("ERROR: Failed to allocate TIM %d\n", chan); + ret = -EBUSY; + } + else + { + /* Initialize the remaining fields in the state structure. */ + + freerun->chan = chan; + freerun->resolution = resolution; + freerun->max_timeout = (UINT64_C(1) << (ESP32_TIMER_WIDTH - 1)); + + /* Ensure timer is disabled. + * Change the prescaler divider with the timer enabled can lead to + * unpredictable results. + */ + + ESP32_TIM_STOP(freerun->tch); + + /* Calculate the suitable prescaler for a period + * for the requested resolution. + */ + + pre = esp_clk_apb_freq() * resolution / USEC_PER_SEC; + + /* Configure TIMER prescaler */ + + ESP32_TIM_SETPRE(freerun->tch, pre); + + /* Configure TIMER mode */ + + ESP32_TIM_SETMODE(freerun->tch, ESP32_TIM_MODE_UP); + + /* Clear TIMER counter value */ + + ESP32_TIM_CLEAR(freerun->tch); + + /* Set the maximum timeout */ + + ESP32_TIM_SETALRVL(freerun->tch, freerun->max_timeout); + +#ifndef CONFIG_CLOCK_TIMEKEEPING + + /* Set the interrupt */ + + freerun->overflow = 0; + + /* Enable autoreload */ + + ESP32_TIM_SETARLD(freerun->tch, true); + + /* Enable TIMER alarm */ + + ESP32_TIM_SETALRM(freerun->tch, true); + + /* Clear Interrupt Bits Status */ + + ESP32_TIM_ACKINT(freerun->tch); + + /* Register the handler */ + + flags = enter_critical_section(); + ret = ESP32_TIM_SETISR(freerun->tch, esp32_freerun_handler, freerun); + leave_critical_section(flags); + if (ret == OK) + { + ESP32_TIM_ENABLEINT(freerun->tch); + } + +#endif + /* Finally, start the TIMER */ + + ESP32_TIM_START(freerun->tch); + } + + return ret; +} + +/**************************************************************************** + * Name: esp32_freerun_counter + * + * Description: + * Read the counter register of the free-running timer. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure. This + * structure must have been previously initialized via a call to + * esp32_freerun_initialize(); + * ts The location in which to return the time from the free-running + * timer. + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +#ifndef CONFIG_CLOCK_TIMEKEEPING + +int esp32_freerun_counter(struct esp32_freerun_s *freerun, + struct timespec *ts) +{ + uint64_t usec; + uint64_t counter; + uint64_t verify; + uint32_t overflow; + uint32_t sec; + int pending; + irqstate_t flags; + + DEBUGASSERT(freerun != NULL); + DEBUGASSERT(ts != NULL); + DEBUGASSERT(freerun->tch != NULL); + + /* Temporarily disable the overflow counter. */ + + flags = enter_critical_section(); + + overflow = freerun->overflow; + ESP32_TIM_GETCTR(freerun->tch, &counter); + pending = ESP32_TIM_CHECKINT(freerun->tch); + ESP32_TIM_GETCTR(freerun->tch, &verify); + + /* If an interrupt was pending before we re-enabled interrupts, + * then the overflow needs to be incremented. + */ + + if (pending) + { + ESP32_TIM_ACKINT(freerun->tch); + + /* Increment the overflow count and use the value of the + * guaranteed to be AFTER the overflow occurred. + */ + + overflow++; + counter = verify; + + /* Update freerun overflow counter. */ + + freerun->overflow = overflow; + } + + leave_critical_section(flags); + + tmrinfo("counter=%" PRIu64 " (%" PRIu64 ") overflow=%" PRIu32 + ", pending=%i\n", + counter, verify, overflow, pending); + + usec = ((((uint64_t)overflow * freerun->max_timeout) + counter) + * freerun->resolution); + + /* And return the value of the timer */ + + sec = (uint32_t)(usec / USEC_PER_SEC); + ts->tv_sec = sec; + ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; + + tmrinfo("usec=%llu ts=(%lu, %lu)\n", + usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); + + return OK; +} + +#endif /* CONFIG_CLOCK_TIMEKEEPING */ + +/**************************************************************************** + * Name: esp32_freerun_uninitialize + * + * Description: + * Stop the free-running timer and release all resources that it uses. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure. This + * structure must have been previously initialized via a call to + * esp32_freerun_initialize(); + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +int esp32_freerun_uninitialize(struct esp32_freerun_s *freerun) +{ + int ret; + DEBUGASSERT(freerun != NULL); + DEBUGASSERT(freerun->tch != NULL); + + /* Stop timer */ + + ESP32_TIM_STOP(freerun->tch); + + /* Disable int */ + + ESP32_TIM_DISABLEINT(freerun->tch); + + /* Detach handler */ + + ret = ESP32_TIM_SETISR(freerun->tch, NULL, NULL); + + /* Free the timer */ + + esp32_tim_deinit(freerun->tch); + freerun->tch = NULL; + + return ret; +} + +#endif /* CONFIG_ESP32_ONESHOT */ diff --git a/arch/xtensa/src/esp32/esp32_freerun.h b/arch/xtensa/src/esp32/esp32_freerun.h new file mode 100644 index 00000000000..c43b33a577f --- /dev/null +++ b/arch/xtensa/src/esp32/esp32_freerun.h @@ -0,0 +1,142 @@ +/**************************************************************************** + * arch/xtensa/src/esp32/esp32_freerun.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 __ARCH_XTENSA_SRC_ESP32_FREERUN_H +#define __ARCH_XTENSA_SRC_ESP32_FREERUN_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include "esp32_tim.h" + +#ifdef CONFIG_ESP32_FREERUN + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/* The freerun client must allocate an instance of this structure and called + * esp32_freerun_initialize() before using the freerun facilities. The + * client should not access the contents of this structure directly since + * the contents are subject to change. + */ + +struct esp32_freerun_s +{ + uint8_t chan; /* The timer/counter in use */ + uint32_t overflow; /* Timer counter overflow */ + uint16_t resolution; /* Timer resolution */ + uint64_t max_timeout; /* Maximum timeout to overflow */ + FAR struct esp32_tim_dev_s *tch; /* Handle returned by esp32_tim_init() */ +}; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: esp32_freerun_initialize + * + * Description: + * Initialize the freerun timer wrapper. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure + * chan Timer counter channel to be used. + * resolution The required resolution of the timer in units of + * microseconds. NOTE that the range is restricted to the + * range of uint16_t (excluding zero). + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +int esp32_freerun_initialize(struct esp32_freerun_s *freerun, int chan, + uint16_t resolution); + +/**************************************************************************** + * Name: esp32_freerun_counter + * + * Description: + * Read the counter register of the free-running timer. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure. This + * structure must have been previously initialized via a call to + * esp32_freerun_initialize(); + * ts The location in which to return the time remaining on the + * oneshot timer. + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +int esp32_freerun_counter(struct esp32_freerun_s *freerun, + struct timespec *ts); + +/**************************************************************************** + * Name: esp32_freerun_uninitialize + * + * Description: + * Stop the free-running timer and release all resources that it uses. + * + * Input Parameters: + * freerun Caller allocated instance of the freerun state structure. This + * structure must have been previously initialized via a call to + * esp32_freerun_initialize(); + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +int esp32_freerun_uninitialize(struct esp32_freerun_s *freerun); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* CONFIG_ESP32_FREERUN */ +#endif /* __ARCH_XTENSA_SRC_ESP32_FREERUN_H */ diff --git a/arch/xtensa/src/esp32/esp32_tim.c b/arch/xtensa/src/esp32/esp32_tim.c index c7883596197..88cd8c681ff 100644 --- a/arch/xtensa/src/esp32/esp32_tim.c +++ b/arch/xtensa/src/esp32/esp32_tim.c @@ -93,6 +93,7 @@ static int esp32_tim_setisr(FAR struct esp32_tim_dev_s *dev, xcpt_t handler, static void esp32_tim_enableint(FAR struct esp32_tim_dev_s *dev); static void esp32_tim_disableint(FAR struct esp32_tim_dev_s *dev); static void esp32_tim_ackint(FAR struct esp32_tim_dev_s *dev); +static int esp32_tim_checkint(FAR struct esp32_tim_dev_s *dev); /**************************************************************************** * Private Data @@ -117,7 +118,8 @@ struct esp32_tim_ops_s esp32_tim_ops = .setisr = esp32_tim_setisr, .enableint = esp32_tim_enableint, .disableint = esp32_tim_disableint, - .ackint = esp32_tim_ackint + .ackint = esp32_tim_ackint, + .checkint = esp32_tim_checkint }; #ifdef CONFIG_ESP32_TIMER0 @@ -681,6 +683,47 @@ static void esp32_tim_ackint(FAR struct esp32_tim_dev_s *dev) } } +/**************************************************************************** + * Name: esp32_tim_checkint + * + * Description: + * Check the interrupt status bit. + * + ****************************************************************************/ + +static int esp32_tim_checkint(FAR struct esp32_tim_dev_s *dev) +{ + int ret = 0; + uint32_t reg_value; + + DEBUGASSERT(dev); + + /* Timer 0 from group 0 or 1 */ + + if (((struct esp32_tim_priv_s *)dev)->base == TIMG_T0CONFIG_REG(0) || + ((struct esp32_tim_priv_s *)dev)->base == TIMG_T0CONFIG_REG(1)) + { + reg_value = esp32_tim_getreg(dev, TIM0_INT_ST_OFFSET); + if (reg_value & TIMG_T0_INT_ST) + { + ret = 1; + } + } + + /* Timer 1 from group 0 or 1 */ + + else + { + reg_value = esp32_tim_getreg(dev, TIM1_INT_ST_OFFSET); + if (reg_value & TIMG_T1_INT_ST) + { + ret = 1; + } + } + + return ret; +} + /**************************************************************************** * Public Functions ****************************************************************************/ @@ -699,7 +742,7 @@ FAR struct esp32_tim_dev_s *esp32_tim_init(int timer) { FAR struct esp32_tim_priv_s *tim = NULL; - /* Get timer instance */ + /* First, take the data structure associated with the timer instance */ switch (timer) { @@ -742,7 +785,13 @@ FAR struct esp32_tim_dev_s *esp32_tim_init(int timer) } } - if (tim->inuse == true) + /* Verify if it is in use */ + + if (tim->inuse == false) + { + tim->inuse = true; /* If it was not, now it is */ + } + else { tmrerr("ERROR: TIMER %d is already in use\n", timer); tim = NULL; diff --git a/arch/xtensa/src/esp32/esp32_tim.h b/arch/xtensa/src/esp32/esp32_tim.h index 586f4412cb9..b602477372b 100644 --- a/arch/xtensa/src/esp32/esp32_tim.h +++ b/arch/xtensa/src/esp32/esp32_tim.h @@ -53,6 +53,7 @@ #define ESP32_TIM_ENABLEINT(d) ((d)->ops->enableint(d)) #define ESP32_TIM_DISABLEINT(d) ((d)->ops->disableint(d)) #define ESP32_TIM_ACKINT(d) ((d)->ops->ackint(d)) +#define ESP32_TIM_CHECKINT(d) ((d)->ops->checkint(d)) /**************************************************************************** * Public Types @@ -106,6 +107,7 @@ struct esp32_tim_ops_s CODE void (*enableint)(FAR struct esp32_tim_dev_s *dev); CODE void (*disableint)(FAR struct esp32_tim_dev_s *dev); CODE void (*ackint)(FAR struct esp32_tim_dev_s *dev); + CODE int (*checkint)(FAR struct esp32_tim_dev_s *dev); }; /****************************************************************************