michaelh/zephyr
1
0
Fork 0
Code Releases Activity

esp32s2: drivers: interrupt_controller: add interrupt allocation support

Browse source 
through the reuse of current esp32 interrupt allocator.

Signed-off-by: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
This commit is contained in:
Glauber Maroto Ferreira 2021-08-13 15:29:03 -03:00 • committed by Anas Nashif
commit 2c031caed0
7 changed files with 127 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/interrupt_controller/CMakeLists.txt
View file

@ -21,5 +21,6 @@ zephyr_library_sources_ifdef(CONFIG_RV32M1_INTMUX intc_rv32m1_intmux.c
zephyr_library_sources_ifdef(CONFIG_SAM0_EIC intc_sam0_eic.c)
zephyr_library_sources_ifdef(CONFIG_SHARED_IRQ intc_shared_irq.c)
zephyr_library_sources_ifdef(CONFIG_SOC_ESP32 intc_esp32.c)
zephyr_library_sources_ifdef(CONFIG_SOC_ESP32S2 intc_esp32.c)
zephyr_library_sources_ifdef(CONFIG_SWERV_PIC intc_swerv_pic.c)
zephyr_library_sources_ifdef(CONFIG_VEXRISCV_LITEX_IRQ intc_vexriscv_litex.c)

2
drivers/interrupt_controller/Kconfig.esp32
View file

@ -5,7 +5,7 @@
config INTC_ESP32_DECISIONS_LOG
bool "Enables ESP32 interrupt allocator logging"
depends on SOC_ESP32
depends on SOC_ESP32 || SOC_ESP32S2
select LOG
help
Enable this option to visualize information on decisions made by the

10
dts/xtensa/espressif/esp32s2.dtsi
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h>
/ {
#address-cells = <1>;
@ -31,6 +32,15 @@
reg = <0x3ffb0000 0x50000>;
};
intc: interrupt-controller@3f4c2000 {
#interrupt-cells = <1>;
compatible = "espressif,esp32-intc";
interrupt-controller;
reg = <0x3f4c2000 0x114>;
label = "INTC_0";
status = "okay";
};
uart0: uart@3f400000 {
compatible = "espressif,esp32s2-uart";
reg = <0x3f400000 0x400>;

109
include/dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h Normal file
View file

@ -0,0 +1,109 @@
/*
* Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_ESP32S2_XTENSA_INTMUX_H_
#define ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_ESP32S2_XTENSA_INTMUX_H_
#define WIFI_MAC_INTR_SOURCE 0 /* WiFi MAC, level */
#define WIFI_MAC_NMI_SOURCE 1 /* WiFi MAC, NMI, use if MAC needs fix in NMI */
#define WIFI_PWR_INTR_SOURCE 2
#define WIFI_BB_INTR_SOURCE 3 /* WiFi BB, level, we can do some calibartion */
#define BT_MAC_INTR_SOURCE 4 /* will be cancelled */
#define BT_BB_INTR_SOURCE 5 /* BB, level */
#define BT_BB_NMI_SOURCE 6 /* BT BB, NMI, use if BB have bug to fix in NMI */
#define RWBT_INTR_SOURCE 7 /* RWBT, level */
#define RWBLE_INTR_SOURCE 8 /* RWBLE, level */
#define RWBT_NMI_SOURCE 9 /* RWBT, NMI, use if RWBT has bug to fix in NMI */
#define RWBLE_NMI_SOURCE 10 /* RWBLE, NMI, use if RWBT has bug to fix in NMI */
#define SLC0_INTR_SOURCE 11 /* SLC0, level */
#define SLC1_INTR_SOURCE 12 /* SLC1, level */
#define UHCI0_INTR_SOURCE 13 /* UHCI0, level */
#define UHCI1_INTR_SOURCE 14 /* UHCI1, level */
#define TG0_T0_LEVEL_INTR_SOURCE 15 /* TIMER_GROUP0, TIMER0, level */
#define TG0_T1_LEVEL_INTR_SOURCE 16 /* TIMER_GROUP0, TIMER1, level */
#define TG0_WDT_LEVEL_INTR_SOURCE 17 /* TIMER_GROUP0, WATCHDOG, level */
#define TG0_LACT_LEVEL_INTR_SOURCE 18 /* TIMER_GROUP0, LACT, level */
#define TG1_T0_LEVEL_INTR_SOURCE 19 /* TIMER_GROUP1, TIMER0, level */
#define TG1_T1_LEVEL_INTR_SOURCE 20 /* TIMER_GROUP1, TIMER1, level */
#define TG1_WDT_LEVEL_INTR_SOURCE 21 /* TIMER_GROUP1, WATCHDOG, level */
#define TG1_LACT_LEVEL_INTR_SOURCE 22 /* TIMER_GROUP1, LACT, level */
#define GPIO_INTR_SOURCE 23 /* interrupt of GPIO, level */
#define GPIO_NMI_SOURCE 24 /* interrupt of GPIO, NMI */
#define GPIO_INTR_SOURCE2 25 /* interrupt of GPIO, level */
#define GPIO_NMI_SOURCE2 26 /* interrupt of GPIO, NMI */
#define DEDICATED_GPIO_INTR_SOURCE 27 /* interrupt of dedicated GPIO, level */
#define FROM_CPU_INTR0_SOURCE 28 /* int0 from a CPU, level */
#define FROM_CPU_INTR1_SOURCE 29 /* int1 from a CPU, level */
#define FROM_CPU_INTR2_SOURCE 30 /* int2 from a CPU, level, for DPORT Access */
#define FROM_CPU_INTR3_SOURCE 31 /* int3 from a CPU, level, for DPORT Access */
#define SPI1_INTR_SOURCE 32 /* SPI1, level, flash r/w, do not use this */
#define SPI2_INTR_SOURCE 33 /* SPI2, level */
#define SPI3_INTR_SOURCE 34 /* SPI3, level */
#define I2S0_INTR_SOURCE 35 /* I2S0, level */
#define I2S1_INTR_SOURCE 36 /* I2S1, level */
#define UART0_INTR_SOURCE 37 /* UART0, level */
#define UART1_INTR_SOURCE 38 /* UART1, level */
#define UART2_INTR_SOURCE 39 /* UART2, level */
#define SDIO_HOST_INTR_SOURCE 40 /* SD/SDIO/MMC HOST, level */
#define PWM0_INTR_SOURCE 41 /* PWM0, level, Reserved */
#define PWM1_INTR_SOURCE 42 /* PWM1, level, Reserved */
#define PWM2_INTR_SOURCE 43 /* PWM2, level */
#define PWM3_INTR_SOURCE 44 /* PWM3, level */
#define LEDC_INTR_SOURCE 45 /* LED PWM, level */
#define EFUSE_INTR_SOURCE 46 /* efuse, level, not likely to use */
#define TWAI_INTR_SOURCE 47 /* twai, level */
#define USB_INTR_SOURCE 48 /* interrupt of USB, level */
#define RTC_CORE_INTR_SOURCE 49 /* rtc core, level, include rtc watchdog */
#define RMT_INTR_SOURCE 50 /* remote controller, level */
#define PCNT_INTR_SOURCE 51 /* pulse count, level */
#define I2C_EXT0_INTR_SOURCE 52 /* I2C controller1, level */
#define I2C_EXT1_INTR_SOURCE 53 /* I2C controller0, level */
#define RSA_INTR_SOURCE 54 /* RSA accelerator, level */
#define SHA_INTR_SOURCE 55 /* interrupt of RSA accelerator, level */
#define AES_INTR_SOURCE 56 /* interrupt of SHA accelerator, level */
#define SPI2_DMA_INTR_SOURCE 57 /* SPI2 DMA, level */
#define SPI3_DMA_INTR_SOURCE 58 /* interrupt of SPI3 DMA, level */
#define WDT_INTR_SOURCE 59 /* will be cancelled */
#define TIMER1_INTR_SOURCE 60 /* will be cancelled */
#define TIMER2_INTR_SOURCE 61 /* will be cancelled */
#define TG0_T0_EDGE_INTR_SOURCE 62 /* TIMER_GROUP0, TIMER0, EDGE */
#define TG0_T1_EDGE_INTR_SOURCE 63 /* TIMER_GROUP0, TIMER1, EDGE */
#define TG0_WDT_EDGE_INTR_SOURCE 64 /* TIMER_GROUP0, WATCH DOG, EDGE */
#define TG0_LACT_EDGE_INTR_SOURCE 65 /* TIMER_GROUP0, LACT, EDGE */
#define TG1_T0_EDGE_INTR_SOURCE 66 /* TIMER_GROUP1, TIMER0, EDGE */
#define TG1_T1_EDGE_INTR_SOURCE 67 /* TIMER_GROUP1, TIMER1, EDGE */
#define TG1_WDT_EDGE_INTR_SOURCE 68 /* TIMER_GROUP1, WATCHDOG, EDGE */
#define TG1_LACT_EDGE_INTR_SOURCE 69 /* TIMER_GROUP0, LACT, EDGE */
#define CACHE_IA_INTR_SOURCE 70 /* Cache Invalid Access, level */
#define SYSTIMER_TARGET0_EDGE_INTR_SOURCE 71 /* system timer 0, edge */
#define SYSTIMER_TARGET1_EDGE_INTR_SOURCE 72 /* system timer 1, edge */
#define SYSTIMER_TARGET2_EDGE_INTR_SOURCE 73 /* system timer 2, edge */
#define ASSIST_DEBUG_INTR_SOURCE 74 /* Assist debug module, level */
#define PMS_PRO_IRAM0_ILG_INTR_SOURCE 75 /* illegal IRAM1 access, level */
#define PMS_PRO_DRAM0_ILG_INTR_SOURCE 76 /* illegal DRAM0 access, level */
#define PMS_PRO_DPORT_ILG_INTR_SOURCE 77 /* illegal DPORT access, level */
#define PMS_PRO_AHB_ILG_INTR_SOURCE 78 /* illegal AHB access, level */
#define PMS_PRO_CACHE_ILG_INTR_SOURCE 79 /* illegal CACHE access, level */
#define PMS_DMA_APB_I_ILG_INTR_SOURCE 80 /* illegal APB access, level */
#define PMS_DMA_RX_I_ILG_INTR_SOURCE 81 /* illegal DMA RX access, level */
#define PMS_DMA_TX_I_ILG_INTR_SOURCE 82 /* illegal DMA TX access, level */
#define SPI_MEM_REJECT_CACHE_INTR_SOURCE 83 /* SPI0 Cache access and
* SPI1 access rejected, level
*/
#define DMA_COPY_INTR_SOURCE 84 /* DMA copy, level */
#define SPI4_DMA_INTR_SOURCE 85 /* SPI4 DMA, level */
#define SPI4_INTR_SOURCE 86 /* SPI4, level */
#define ICACHE_PRELOAD_INTR_SOURCE 87 /* ICache preload operation, level */
#define DCACHE_PRELOAD_INTR_SOURCE 88 /* DCache preload operation, level */
#define APB_ADC_INTR_SOURCE 89 /* APB ADC, level */
#define CRYPTO_DMA_INTR_SOURCE 90 /* encrypted DMA, level */
#define CPU_PERI_ERROR_INTR_SOURCE 91 /* CPU peripherals error, level */
#define APB_PERI_ERROR_INTR_SOURCE 92 /* APB peripherals error, level */
#define DCACHE_SYNC_INTR_SOURCE 93 /* data cache sync done, level */
#define ICACHE_SYNC_INTR_SOURCE 94 /* instruction cache sync done, level */
#define MAX_INTR_SOURCE 95 /* total number of interrupt sources */
#endif

3
soc/xtensa/esp32s2/Kconfig.defconfig
View file

@ -20,6 +20,9 @@ config XIP
config ISR_STACK_SIZE
default 2048
config HEAP_MEM_POOL_SIZE
default 32768
config IRQ_OFFLOAD_INTNUM
default 7

1
soc/xtensa/esp32s2/Kconfig.soc
View file

@ -5,6 +5,7 @@ config SOC_ESP32S2
bool "ESP32S2"
select XTENSA
select ATOMIC_OPERATIONS_C
select DYNAMIC_INTERRUPTS
if SOC_ESP32S2

2
soc/xtensa/esp32s2/soc.c
View file

@ -8,6 +8,7 @@
#include "soc.h"
#include <soc/rtc_cntl_reg.h>
#include <soc/timer_group_reg.h>
#include <drivers/interrupt_controller/intc_esp32.h>
#include <xtensa/config/core-isa.h>
#include <xtensa/corebits.h>
@ -117,6 +118,7 @@ void __attribute__((section(".iram1"))) __start(void)
*wdt_rtc_protect = 0;
#endif
esp_intr_initialize();
/* Start Zephyr */
z_cstart();