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

feat(cache): supported cache panic driver on h4

Browse Source
This commit is contained in:
armando
2025-08-04 16:30:29 +08:00
parent 2a586022c4
commit 7a1e5f540e
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_system/port/soc/esp32h4/cache_err_int.c
View File

@@ -19,8 +19,6 @@
#include "hal/cache_ll.h" #include "hal/cache_ll.h"
#include "esp_private/cache_err_int.h" #include "esp_private/cache_err_int.h"
// TODO: [ESP32H4] IDF-12288 inherited from verification branch, need check
static const char *TAG = "CACHE_ERR"; static const char *TAG = "CACHE_ERR";
const char cache_error_msg[] = "Cache access error"; const char cache_error_msg[] = "Cache access error";
@@ -64,6 +62,13 @@ void esp_cache_err_int_init(void)
esprv_int_set_priority(ETS_CACHEERR_INUM, SOC_INTERRUPT_LEVEL_MEDIUM); esprv_int_set_priority(ETS_CACHEERR_INUM, SOC_INTERRUPT_LEVEL_MEDIUM);
ESP_DRAM_LOGV(TAG, "access error intr clr & ena mask is: 0x%x", CACHE_LL_L1_ACCESS_EVENT_MASK); ESP_DRAM_LOGV(TAG, "access error intr clr & ena mask is: 0x%x", CACHE_LL_L1_ACCESS_EVENT_MASK);
/**
* Here we
* 1. enable the cache fail tracer to take cache error interrupt into effect.
* 2. clear potential cache error interrupt raw bits
* 3. enable cache error interrupt en bits
*/
cache_ll_l1_enable_fail_tracer(0, true);
/* On the hardware side, start by clearing all the bits responsible for cache access error */ /* On the hardware side, start by clearing all the bits responsible for cache access error */
cache_ll_l1_clear_access_error_intr(0, CACHE_LL_L1_ACCESS_EVENT_MASK); cache_ll_l1_clear_access_error_intr(0, CACHE_LL_L1_ACCESS_EVENT_MASK);
/* Then enable cache access error interrupts. */ /* Then enable cache access error interrupts. */

24
components/hal/esp32h4/include/hal/cache_ll.h
View File

@@ -10,6 +10,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "soc/cache_reg.h" #include "soc/cache_reg.h"
#include "soc/cache_struct.h"
#include "soc/ext_mem_defs.h" #include "soc/ext_mem_defs.h"
#include "hal/cache_types.h" #include "hal/cache_types.h"
#include "hal/assert.h" #include "hal/assert.h"
@@ -813,42 +814,53 @@ static inline bool cache_ll_vaddr_to_cache_level_id(uint32_t vaddr_start, uint32
return valid; return valid;
} }
/**
* Enable the Cache fail tracer
*
* @param cache_id cache ID
* @param en enable / disable
*/
static inline void cache_ll_l1_enable_fail_tracer(uint32_t cache_id, bool en)
{
CACHE.trace_ena.l1_cache_trace_ena = en;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Interrupt * Interrupt
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
/** /**
* @brief Enable Cache access error interrupt * @brief Enable Cache access error interrupt
* *
* @param cache_id Cache ID, not used on C3. For compabitlity * @param cache_id Cache ID
* @param mask Interrupt mask * @param mask Interrupt mask
*/ */
static inline void cache_ll_l1_enable_access_error_intr(uint32_t cache_id, uint32_t mask) static inline void cache_ll_l1_enable_access_error_intr(uint32_t cache_id, uint32_t mask)
{ {
SET_PERI_REG_MASK(CACHE_L1_CACHE_ACS_FAIL_INT_ENA_REG, mask); CACHE.l1_cache_acs_fail_int_ena.val |= mask;
} }
/** /**
* @brief Clear Cache access error interrupt status * @brief Clear Cache access error interrupt status
* *
* @param cache_id Cache ID, not used on C3. For compabitlity * @param cache_id Cache ID
* @param mask Interrupt mask * @param mask Interrupt mask
*/ */
static inline void cache_ll_l1_clear_access_error_intr(uint32_t cache_id, uint32_t mask) static inline void cache_ll_l1_clear_access_error_intr(uint32_t cache_id, uint32_t mask)
{ {
SET_PERI_REG_MASK(CACHE_L1_CACHE_ACS_FAIL_INT_CLR_REG, mask); CACHE.l1_cache_acs_fail_int_clr.val = mask;
} }
/** /**
* @brief Get Cache access error interrupt status * @brief Get Cache access error interrupt status
* *
* @param cache_id Cache ID, not used on C3. For compabitlity * @param cache_id Cache ID
* @param mask Interrupt mask * @param mask Interrupt mask
* *
* @return Status mask * @return Status mask
*/ */
static inline uint32_t cache_ll_l1_get_access_error_intr_status(uint32_t cache_id, uint32_t mask) static inline uint32_t cache_ll_l1_get_access_error_intr_status(uint32_t cache_id, uint32_t mask)
{ {
return GET_PERI_REG_MASK(CACHE_L1_CACHE_ACS_FAIL_INT_ST_REG, mask); return CACHE.l1_cache_acs_fail_int_st.val & mask;
} }
#ifdef __cplusplus #ifdef __cplusplus