Skip to content

Commit cfe7021

Browse files
committed
Merge branch 'bugfix/h2_wifi_intr' into 'master'
fix(interrupt): fixed wrongly reserved interrupt for wifi on H2 See merge request espressif/esp-idf!36073
2 parents 09200d7 + a7c03a7 commit cfe7021

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

components/esp_hw_support/port/esp32h2/esp_cpu_intr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
void esp_cpu_intr_get_desc(int core_id, int intr_num, esp_cpu_intr_desc_t *intr_desc_ret)
1111
{
1212
/* On the ESP32-H2, interrupt:
13-
* - 1 is for Wi-Fi
1413
* - 6 for "permanently disabled interrupt"
1514
*
1615
* Interrupts 3, 4 and 7 are unavailable for PULP CPU as they are bound to Core-Local Interrupts (CLINT)
1716
*/
1817
// [TODO: IDF-2465]
19-
const uint32_t rsvd_mask = BIT(1) | BIT(3) | BIT(4) | BIT(6) | BIT(7);
18+
const uint32_t rsvd_mask = BIT(3) | BIT(4) | BIT(6) | BIT(7);
2019

2120
intr_desc_ret->priority = 1;
2221
intr_desc_ret->type = ESP_CPU_INTR_TYPE_NA;

tools/test_apps/system/esp_intr_dump/expected_output/esp32h2.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
CPU 0 interrupt status:
22
Int Level Type Status
33
0 * * Reserved
4-
1 * * Reserved
5-
2 1 Level Shared: LP_RTC_TIMER
4+
1 1 Level Shared: LP_RTC_TIMER
5+
2 1 Level Used: CPUFROM_CPU_0
66
3 * * Reserved
77
4 * * Reserved
8-
5 1 Level Used: CPUFROM_CPU_0
8+
5 1 Level Used: SYSTIMER_TARGET0
99
6 * * Reserved
1010
7 * * Reserved
11-
8 1 Level Used: SYSTIMER_TARGET0
12-
9 1 Level Used: TG0_WDT
13-
10 1 Level Used: UART0
11+
8 1 Level Used: TG0_WDT
12+
9 1 Level Used: UART0
13+
10 * * Free
1414
11 * * Free
1515
12 * * Free
1616
13 * * Free
@@ -32,5 +32,6 @@ CPU 0 interrupt status:
3232
29 * * Free
3333
30 * * Free
3434
31 * * Free
35-
Interrupts available for general use: 18
35+
Interrupts available for general use: 19
36+
3637
Shared interrupts: 1

0 commit comments

Comments
 (0)