pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(lp-core): added support for using ETM events as wake-up source

Browse Source
This commit is contained in:
Marius Vikhammer
2024-07-01 12:11:41 +08:00
parent fd18bb608b
commit de2a66ebe0
23 changed files with 404 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/ulp/lp_core/include/lp_core_etm.h
+60
View File
@@ -0,0 +1,60 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include "esp_err.h"
#include "esp_etm.h"
#include "hal/lp_core_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief LP-Core ETM event configuration
*/
typedef struct {
lp_core_etm_event_type_t event_type; /*!< LP-Core ETM event type */
} lp_core_etm_event_config_t;
/**
* @brief LP-Core ETM task configuration
*/
typedef struct {
lp_core_etm_task_type_t task_type; /*!< LP-Core ETM task type */
} lp_core_etm_task_config_t;
/**
* @brief Create a ETM event for LP-Core
*
* @note The created ETM event object can be deleted later by calling `esp_etm_del_event`
*
* @param[in] config LP-Core ETM event configuration
* @param[out] out_event Returned ETM event handle
* @return
* - ESP_OK: Get ETM event successfully
* - ESP_ERR_INVALID_ARG: Get ETM event failed because of invalid argument
* - ESP_FAIL: Get ETM event failed because of other error
*/
esp_err_t lp_core_new_etm_event(const lp_core_etm_event_config_t *config, esp_etm_event_handle_t *out_event);
/**
* @brief Create a ETM task for LP-Core
*
* @note The created ETM task object can be deleted later by calling `esp_etm_del_task`
*
* @param[in] config LP-Core ETM task configuration
* @param[out] out_task Returned ETM task handle
* @return
* - ESP_OK: Get ETM task successfully
* - ESP_ERR_INVALID_ARG: Get ETM task failed because of invalid argument
* - ESP_FAIL: Get ETM task failed because of other error
*/
esp_err_t lp_core_new_etm_task(const lp_core_etm_task_config_t *config, esp_etm_task_handle_t *out_task);
#ifdef __cplusplus
}
#endif
components/ulp/lp_core/lp_core.c
+1 -1
View File
@@ -126,7 +126,7 @@ esp_err_t ulp_lp_core_run(ulp_lp_core_cfg_t* cfg)
}
#endif
if (cfg->wakeup_source & (ULP_LP_CORE_WAKEUP_SOURCE_LP_UART | ULP_LP_CORE_WAKEUP_SOURCE_LP_IO | ULP_LP_CORE_WAKEUP_SOURCE_ETM)) {
if (cfg->wakeup_source & (ULP_LP_CORE_WAKEUP_SOURCE_LP_UART | ULP_LP_CORE_WAKEUP_SOURCE_LP_IO)) {
ESP_LOGE(TAG, "Wake-up source not yet supported");
return ESP_ERR_INVALID_ARG;
}
components/ulp/lp_core/lp_core/lp_core_utils.c
+9 -1
View File
@@ -15,6 +15,10 @@
#include "hal/uart_ll.h"
#include "hal/rtc_io_ll.h"
#if !CONFIG_IDF_TARGET_ESP32P4
#include "hal/lp_aon_ll.h"
#endif
#if SOC_ETM_SUPPORTED
#include "hal/etm_ll.h"
#endif
@@ -52,7 +56,11 @@ void ulp_lp_core_update_wakeup_cause(void)
if ((lp_core_ll_get_wakeup_source() & LP_CORE_LL_WAKEUP_SOURCE_ETM) \
&& etm_ll_is_lpcore_wakeup_triggered()) {
lp_wakeup_cause |= LP_CORE_LL_WAKEUP_SOURCE_ETM;
etm_ll_clear_lpcore_wakeup_status();
#if CONFIG_IDF_TARGET_ESP32P4
lp_core_ll_clear_etm_wakeup_status();
#else
lp_aon_ll_clear_lpcore_etm_wakeup_flag();
#endif
}
#endif /* SOC_ETM_SUPPORTED */
components/ulp/lp_core/lp_core_etm.c
+90
View File
@@ -0,0 +1,90 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include "lp_core_etm.h"
#include "esp_private/etm_interface.h"
#include "esp_err.h"
#include "esp_check.h"
#include "esp_heap_caps.h"
#include "soc/soc_etm_source.h"
#define LP_CORE_ETM_EVENT_TABLE(event) \
(uint32_t [LP_CORE_EVENT_MAX]){ \
[LP_CORE_EVENT_ERR_INTR] = ULP_EVT_ERR_INTR, \
[LP_CORE_EVENT_START_INTR] = ULP_EVT_START_INTR, \
}[event]
#define LP_CORE_ETM_TASK_TABLE(task) \
(uint32_t [LP_CORE_TASK_MAX]){ \
[LP_CORE_TASK_WAKEUP_CPU] = ULP_TASK_WAKEUP_CPU, \
}[task]
const static char* TAG = "lp-core-etm";
static esp_err_t lp_core_del_etm_event(esp_etm_event_t *event)
{
free(event);
return ESP_OK;
}
static esp_err_t lp_core_del_etm_task(esp_etm_task_t *task)
{
free(task);
return ESP_OK;
}
esp_err_t lp_core_new_etm_task(const lp_core_etm_task_config_t *config, esp_etm_task_handle_t *out_task)
{
esp_etm_task_t *task = NULL;
esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE(config && out_task, ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
ESP_GOTO_ON_FALSE(config->task_type < LP_CORE_TASK_MAX, ESP_ERR_INVALID_ARG, err, TAG, "invalid task type");
task = heap_caps_calloc(1, sizeof(esp_etm_task_t), MALLOC_CAP_DEFAULT);
ESP_GOTO_ON_FALSE(task, ESP_ERR_NO_MEM, err, TAG, "no memory for ETM task");
uint32_t task_id = LP_CORE_ETM_TASK_TABLE(config->task_type);
ESP_GOTO_ON_FALSE(task_id != 0, ESP_ERR_NOT_SUPPORTED, err, TAG, "not supported task type");
// fill the ETM task object
task->task_id = task_id;
task->trig_periph = ETM_TRIG_PERIPH_LP_CORE;
task->del = lp_core_del_etm_task;
ESP_LOGD(TAG, "new task @%p, task_id=%"PRIu32, task, task_id);
*out_task = task;
return ESP_OK;
err:
if (task) {
lp_core_del_etm_task(task);
}
return ret;
}
esp_err_t lp_core_new_etm_event(const lp_core_etm_event_config_t *config, esp_etm_event_handle_t *out_event)
{
esp_etm_event_t *event = NULL;
esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE(config && out_event, ESP_ERR_INVALID_ARG, err, TAG, "invalid argument");
ESP_GOTO_ON_FALSE(config->event_type < LP_CORE_EVENT_MAX, ESP_ERR_INVALID_ARG, err, TAG, "invalid event type");
event = heap_caps_calloc(1, sizeof(esp_etm_event_t), MALLOC_CAP_DEFAULT);
ESP_GOTO_ON_FALSE(event, ESP_ERR_NO_MEM, err, TAG, "no memory for ETM event");
uint32_t event_id = LP_CORE_ETM_EVENT_TABLE(config->event_type);
ESP_GOTO_ON_FALSE(event_id != 0, ESP_ERR_NOT_SUPPORTED, err, TAG, "not supported event type");
// fill the ETM event object
event->event_id = event_id;
event->trig_periph = ETM_TRIG_PERIPH_LP_CORE;
event->del = lp_core_del_etm_event;
*out_event = event;
return ESP_OK;
err:
if (event) {
lp_core_del_etm_event(event);
}
return ret;
}