feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'refactor/gpspi_linker' into 'master'

Browse Source 
change(gpspi): control hal function placement in the driver component

See merge request espressif/esp-idf!36610
This commit is contained in:
morris
2025-01-26 11:51:31 +08:00
parent fb72b2cb49 11e66825a0
commit a4a597c8c8
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_driver_spi/Kconfig
View File

@@ -24,7 +24,6 @@ menu "ESP-Driver:SPI Configurations"
default y default y
depends on !HEAP_PLACE_FUNCTION_INTO_FLASH depends on !HEAP_PLACE_FUNCTION_INTO_FLASH
select PERIPH_CTRL_FUNC_IN_IRAM select PERIPH_CTRL_FUNC_IN_IRAM
select HAL_SPI_MASTER_FUNC_IN_IRAM
select ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM select ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM
select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
help help
@@ -54,7 +53,6 @@ menu "ESP-Driver:SPI Configurations"
bool "Place SPI slave ISR function into IRAM" bool "Place SPI slave ISR function into IRAM"
default y default y
select PERIPH_CTRL_FUNC_IN_IRAM select PERIPH_CTRL_FUNC_IN_IRAM
select HAL_SPI_SLAVE_FUNC_IN_IRAM
select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
help help
Place the SPI slave ISR in to IRAM to avoid possible cache miss. Place the SPI slave ISR in to IRAM to avoid possible cache miss.

8
components/esp_driver_spi/linker.lf
View File

@@ -8,3 +8,11 @@ entries:
if SOC_SPI_SUPPORT_SLAVE_HD_VER2 = y: if SOC_SPI_SUPPORT_SLAVE_HD_VER2 = y:
spi_dma: spi_dma_get_eof_desc (noflash) spi_dma: spi_dma_get_eof_desc (noflash)
[mapping:gpspi_hal]
archive: libhal.a
entries:
if SPI_MASTER_ISR_IN_IRAM = y:
spi_hal_iram (noflash)
if SPI_SLAVE_ISR_IN_IRAM = y:
spi_slave_hal_iram (noflash)

12
components/hal/Kconfig
View File

@@ -91,18 +91,6 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
features will be added and bugs will be fixed in the IDF source features will be added and bugs will be fixed in the IDF source
but cannot be synced to ROM. but cannot be synced to ROM.
config HAL_SPI_MASTER_FUNC_IN_IRAM
bool
depends on SPI_MASTER_ISR_IN_IRAM
help
Enable this option to place SPI master hal layer functions into IRAM.
config HAL_SPI_SLAVE_FUNC_IN_IRAM
bool
depends on SPI_SLAVE_ISR_IN_IRAM
help
Enable this option to place SPI slave hal layer functions into IRAM.
config HAL_ECDSA_GEN_SIG_CM config HAL_ECDSA_GEN_SIG_CM
bool "Enable countermeasure for ECDSA signature generation" bool "Enable countermeasure for ECDSA signature generation"
depends on IDF_TARGET_ESP32H2 depends on IDF_TARGET_ESP32H2

5
components/hal/linker.lf
View File

@@ -9,11 +9,6 @@ entries:
cache_hal_esp32 (noflash) cache_hal_esp32 (noflash)
else: else:
cache_hal (noflash) cache_hal (noflash)
if SOC_GPSPI_SUPPORTED = y:
if HAL_SPI_MASTER_FUNC_IN_IRAM = y:
spi_hal_iram (noflash)
if HAL_SPI_SLAVE_FUNC_IN_IRAM = y:
spi_slave_hal_iram (noflash)
if SOC_I2C_SUPPORTED = y: if SOC_I2C_SUPPORTED = y:
i2c_hal_iram (noflash) i2c_hal_iram (noflash)
if HAL_WDT_USE_ROM_IMPL = n: if HAL_WDT_USE_ROM_IMPL = n: