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

Merge branch 'bugfix/h2_wifi_intr_v5.4' into 'release/v5.4'

Browse Source 
fix(interrupt): fixed wrongly reserved interrupt for wifi on H2 (v5.4)

See merge request espressif/esp-idf!36108
This commit is contained in:
Marius Vikhammer
2025-01-06 13:35:02 +08:00
parent c02a6fc523 79fe10fe1c
commit 4defdd90c3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_hw_support/port/esp32h2/esp_cpu_intr.c
View File

@ -10,13 +10,12 @@
void esp_cpu_intr_get_desc(int core_id, int intr_num, esp_cpu_intr_desc_t *intr_desc_ret) void esp_cpu_intr_get_desc(int core_id, int intr_num, esp_cpu_intr_desc_t *intr_desc_ret)
{ {
/* On the ESP32-H2, interrupt: /* On the ESP32-H2, interrupt:
* - 1 is for Wi-Fi
* - 6 for "permanently disabled interrupt" * - 6 for "permanently disabled interrupt"
* *
* Interrupts 3, 4 and 7 are unavailable for PULP CPU as they are bound to Core-Local Interrupts (CLINT) * Interrupts 3, 4 and 7 are unavailable for PULP CPU as they are bound to Core-Local Interrupts (CLINT)
*/ */
// [TODO: IDF-2465] // [TODO: IDF-2465]
const uint32_t rsvd_mask = BIT(1) | BIT(3) | BIT(4) | BIT(6) | BIT(7); const uint32_t rsvd_mask = BIT(3) | BIT(4) | BIT(6) | BIT(7);
intr_desc_ret->priority = 1; intr_desc_ret->priority = 1;
intr_desc_ret->type = ESP_CPU_INTR_TYPE_NA; intr_desc_ret->type = ESP_CPU_INTR_TYPE_NA;

15
tools/test_apps/system/esp_intr_dump/expected_output/esp32h2.txt
View File

@ -1,16 +1,16 @@
CPU 0 interrupt status: CPU 0 interrupt status:
Int Level Type Status Int Level Type Status
0 * * Reserved 0 * * Reserved
1 * * Reserved 1 1 Level Shared: LP_RTC_TIMER
2 1 Level Shared: LP_RTC_TIMER 2 1 Level Used: CPUFROM_CPU_0
3 * * Reserved 3 * * Reserved
4 * * Reserved 4 * * Reserved
5 1 Level Used: CPUFROM_CPU_0 5 1 Level Used: SYSTIMER_TARGET0
6 * * Reserved 6 * * Reserved
7 * * Reserved 7 * * Reserved
8 1 Level Used: SYSTIMER_TARGET0 8 1 Level Used: TG0_WDT
9 1 Level Used: TG0_WDT 9 1 Level Used: UART0
10 1 Level Used: UART0 10 * * Free
11 * * Free 11 * * Free
12 * * Free 12 * * Free
13 * * Free 13 * * Free
@ -32,5 +32,6 @@ CPU 0 interrupt status:
29 * * Free 29 * * Free
30 * * Free 30 * * Free
31 * * Free 31 * * Free
Interrupts available for general use: 18 Interrupts available for general use: 19
Shared interrupts: 1 Shared interrupts: 1