Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/csi_error_event' into 'master'

Browse Source 
Add MIPI-CSI error event

Closes IDF-12075

See merge request espressif/esp-idf!49258
This commit is contained in:
Gao Xu
2026-07-13 17:59:29 +08:00
parent ea07001c2c 129f11f6d8
commit 31d519d52d
8 changed files with 355 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c
+69
View File
@@ -19,6 +19,7 @@
#include "esp_cam_ctlr_interface.h"
#include "esp_cam_ctlr_csi_internal.h"
#include "hal/mipi_csi_ll.h"
#include "hal/mipi_csi_periph.h"
#include "hal/color_hal.h"
#include "hal/efuse_hal.h"
#include "soc/chip_revision.h"
@@ -30,8 +31,12 @@
#if CONFIG_CAM_CTLR_MIPI_CSI_ISR_CACHE_SAFE
#define CSI_MEM_ALLOC_CAPS (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
#define CSI_INTR_ALLOC_FLAGS (ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM)
#define CSI_ISR_ATTR IRAM_ATTR
#else
#define CSI_MEM_ALLOC_CAPS MALLOC_CAP_DEFAULT
#define CSI_INTR_ALLOC_FLAGS ESP_INTR_FLAG_LOWMED
#define CSI_ISR_ATTR
#endif
typedef struct csi_platform_t {
@@ -43,6 +48,7 @@ static const char *TAG = "CSI";
static csi_platform_t s_platform;
static bool csi_dma_trans_done_callback(dw_gdma_channel_handle_t chan, const dw_gdma_trans_done_event_data_t *event_data, void *user_data);
static void s_csi_default_isr(void *arg);
static esp_err_t s_del_csi_ctlr(csi_controller_t *ctlr);
static esp_err_t s_ctlr_del(esp_cam_ctlr_t *cam_ctlr);
static esp_err_t s_register_event_callbacks(esp_cam_ctlr_handle_t handle, const esp_cam_ctlr_evt_cbs_t *cbs, void *user_data);
@@ -296,6 +302,12 @@ esp_err_t s_del_csi_ctlr(csi_controller_t *ctlr)
}
#endif // CONFIG_PM_ENABLE
if (ctlr->intr_handle) {
mipi_csi_host_ll_enable_intr(ctlr->hal.host_dev, MIPI_CSI_HOST_LL_INTR_ERR_ALL, false);
ESP_RETURN_ON_ERROR(esp_intr_free(ctlr->intr_handle), TAG, "failed to free csi host interrupt");
ctlr->intr_handle = NULL;
}
if (ctlr->dma_chan) {
ESP_RETURN_ON_ERROR(dw_gdma_del_channel(ctlr->dma_chan), TAG, "failed to delete dwgdma channel");
}
@@ -449,15 +461,72 @@ esp_err_t s_register_event_callbacks(esp_cam_ctlr_handle_t handle, const esp_cam
if (cbs->on_trans_finished) {
ESP_RETURN_ON_FALSE(esp_ptr_in_iram(cbs->on_trans_finished), ESP_ERR_INVALID_ARG, TAG, "on_trans_finished callback not in IRAM");
}
if (cbs->on_error) {
ESP_RETURN_ON_FALSE(esp_ptr_in_iram(cbs->on_error), ESP_ERR_INVALID_ARG, TAG, "on_error callback not in IRAM");
}
if (user_data) {
ESP_RETURN_ON_FALSE(esp_ptr_internal(user_data), ESP_ERR_INVALID_ARG, TAG, "user_data not in internal RAM");
}
#endif
bool enable_error_intr = false;
// The error interrupt service is lazy installed, only when an on_error callback is registered.
if (cbs->on_error && !ctlr->intr_handle) {
ESP_RETURN_ON_ERROR(esp_intr_alloc(soc_mipi_csi_signals[ctlr->csi_id].host_irq_id, CSI_INTR_ALLOC_FLAGS,
s_csi_default_isr, ctlr, &ctlr->intr_handle),
TAG, "failed to allocate csi host interrupt");
enable_error_intr = true;
}
ctlr->cbs.on_get_new_trans = cbs->on_get_new_trans;
ctlr->cbs.on_trans_finished = cbs->on_trans_finished;
ctlr->cbs.on_error = cbs->on_error;
ctlr->cbs_user_data = user_data;
if (enable_error_intr) {
// clear any stale status, then unmask all error interrupts
mipi_csi_host_ll_clear_intr_status(ctlr->hal.host_dev, MIPI_CSI_HOST_LL_INTR_ERR_ALL);
mipi_csi_host_ll_enable_intr(ctlr->hal.host_dev, MIPI_CSI_HOST_LL_INTR_ERR_ALL, true);
}
return ESP_OK;
}
static void CSI_ISR_ATTR s_csi_default_isr(void *arg)
{
bool need_yield = false;
csi_controller_t *ctlr = (csi_controller_t *)arg;
uint32_t status = mipi_csi_host_ll_get_intr_status(ctlr->hal.host_dev);
// clear the detected error sources before invoking the callback
mipi_csi_host_ll_clear_intr_status(ctlr->hal.host_dev, status);
if (ctlr->cbs.on_error) {
esp_cam_ctlr_error_event_data_t edata = {};
if (status & (MIPI_CSI_HOST_LL_INTR_PHY_FATAL | MIPI_CSI_HOST_LL_INTR_PHY)) {
edata.csi_host_err_evts |= ESP_CAM_CTLR_CSI_HOST_ERR_PHY;
}
if (status & (MIPI_CSI_HOST_LL_INTR_PKT_FATAL | MIPI_CSI_HOST_LL_INTR_ECC_CORRECTED)) {
edata.csi_host_err_evts |= ESP_CAM_CTLR_CSI_HOST_ERR_PACKET;
}
if (status & (MIPI_CSI_HOST_LL_INTR_BNDRY_FRAME_FATAL | MIPI_CSI_HOST_LL_INTR_SEQ_FRAME_FATAL)) {
edata.csi_host_err_evts |= ESP_CAM_CTLR_CSI_HOST_ERR_FRAME;
}
if (status & (MIPI_CSI_HOST_LL_INTR_CRC_FRAME_FATAL | MIPI_CSI_HOST_LL_INTR_PLD_CRC_FATAL)) {
edata.csi_host_err_evts |= ESP_CAM_CTLR_CSI_HOST_ERR_CRC;
}
if (status & MIPI_CSI_HOST_LL_INTR_DATA_ID) {
edata.csi_host_err_evts |= ESP_CAM_CTLR_CSI_HOST_ERR_DATA_ID;
}
need_yield = ctlr->cbs.on_error(&(ctlr->base), &edata, ctlr->cbs_user_data);
}
if (need_yield) {
portYIELD_FROM_ISR();
}
}
esp_err_t s_csi_ctlr_enable(esp_cam_ctlr_handle_t handle)
{
ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
components/esp_driver_cam/csi/src/esp_cam_ctlr_csi_internal.h
+4 -6
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -8,13 +8,10 @@
#include <stdint.h>
#include <stdbool.h>
#include <esp_types.h>
#include <stddef.h>
#include "sdkconfig.h"
#include "esp_attr.h"
#include "esp_log.h"
#include "esp_check.h"
#include "esp_heap_caps.h"
#include "freertos/FreeRTOS.h"
#include "esp_intr_alloc.h"
#include "esp_cam_ctlr_csi.h"
#include "hal/mipi_csi_hal.h"
#include "hal/mipi_csi_types.h"
@@ -67,6 +64,7 @@ struct csi_controller_t {
void *cbs_user_data; //callback userdata
dw_gdma_channel_handle_t dma_chan; //dwgdma channel handle
size_t csi_transfer_size; //csi transfer size for dwgdma
intr_handle_t intr_handle; //csi host error interrupt handle
#if CONFIG_PM_ENABLE
esp_pm_lock_handle_t pm_lock; //Power management lock
#endif