Commit Graph

1523 Commits

Author SHA1 Message Date
Armando
2c32bd209a change(fpga): added bypass rng configuration 2023-12-05 11:38:35 +08:00
cjin
797edb54fa fix(pm): place extra link opt in iram 2023-12-04 14:46:42 +08:00
Jakob Hasse
ffedd74f52 Merge branch 'fix/esp_hw_support_remove_unused_include_dirs' into 'master'
fix(esp_hw_support): Removed nonexistent include directories from cmake

Closes IDFGH-11581

See merge request espressif/esp-idf!27551
2023-12-04 12:26:43 +08:00
Darian
cc34c4fc08 Merge branch 'contrib/github_pr_12481' into 'master'
Many places in the ESP_SYSTEM are using CONFIG_FREERTOS_UNICORE instead of CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE (GitHub PR)

Closes IDFGH-11333

See merge request espressif/esp-idf!27435
2023-12-01 19:33:19 +08:00
Jakob Hasse
637d4c4381 fix(esp_hw_support): Removed unused include directories from cmake
* Closes https://github.com/espressif/esp-idf/issues/12700
2023-12-01 11:33:12 +08:00
Darian Leung
8c2949a97e change(xtensa): Deprecate ".../xtensa_timer.h" include path
This commit deprecates the "freertos/xtensa_timer.h" and "xtensa/xtensa_timer.h"
include paths. Users should use "xtensa_timer.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_timer.h"
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Darian Leung
a5d5ee7445 change(xtensa): Deprecate ".../xtensa_context.h" include path
This commit deprecates the "freertos/xtensa_context.h" and "xtensa/xtensa_context.h"
include paths. Users should use "xtensa_context.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_api.h"
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Darian Leung
2204c8e137 change(xtensa): Deprecate ".../xtensa_api.h" include path
This commit deprecates the "freertos/xtensa_api.h" and "xtensa/xtensa_api.h"
include paths. Users should use "xtensa_api.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_api.h"
- Replaced some calls with "esp_cpu_..." equivalents
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Kevin (Lao Kaiyao)
cd9d321062 Merge branch 'feature/introduce_target_esp32c5' into 'master'
feat(esp32c5): introduce target esp32c5 (stage 1)

See merge request espressif/esp-idf!27299
2023-11-29 20:31:34 +08:00
Jiang Jiang Jian
234e5e8d09 Merge branch 'feat/max_ver_c3_199' into 'master'
feat(soc): Increase max supported version of C3 to 1.99

See merge request espressif/esp-idf!26821
2023-11-29 11:17:59 +08:00
laokaiyao
bb0879b3f8 feat(esp32c5): introduce target esp32c5 2023-11-28 16:14:17 +08:00
fl0wl0w
d149c1b26f Use configuration option instead of in components not related to FreeRTOS
Mergeshttps://github.com/espressif/esp-idf/pull/12481
2023-11-28 07:49:20 +00:00
Ivan Grokhotkov
75c92c3a66
refactor(startup): implement registration of core init functions
Similar to how the secondary init functions were already registered
via ESP_SYSTEM_INIT_FN, do the same for the core init functions.
This MR doesn't actually move the init functions into respective
components yet. This has to be carefully done in follow-up MRs.
2023-11-27 10:20:51 +01:00
Michael (XIAO Xufeng)
eb93daafd0 feat(soc): Increase max supported version of C3 to 1.99 2023-11-23 06:58:18 +00:00
Wu Zheng Hui
581824d1f2 Merge branch 'feature/reinitialize_icg_map_in_modem_module_enable' into 'master'
fix(esp_hw_support): re-initialize icg map in modem_clock_module_enable

Closes WIFI-6312

See merge request espressif/esp-idf!27168
2023-11-23 11:55:34 +08:00
Jiang Jiang Jian
275a7ec2a2 Merge branch 'fix/esp32c6_sleep_pll_issue' into 'master'
fix(pm): add mac/bb power down/up prepare for fix esp32c6 pll issue

Closes BLERP-105, BLERP-213, and BLERP-234

See merge request espressif/esp-idf!26208
2023-11-22 10:29:48 +08:00
morris
106baac0bc Merge branch 'feature/rmt_receive_partial_callback' into 'master'
feat(rmt): support partial receive if the incoming packet is very long

Closes IDF-6579

See merge request espressif/esp-idf!27033
2023-11-22 06:37:46 +08:00
Lou Tian Hao
cde12242b4 Merge branch 'feature/support_ext1_clear_spec_pins' into 'master'
feat: support ext1 add or remove spec pin for chips which support ext1 wakeup

Closes IDFGH-11440

See merge request espressif/esp-idf!26999
2023-11-21 11:29:33 +08:00
Marius Vikhammer
4bb8f5c577 Merge branch 'feature/remove_esp_spi_g1' into 'master'
refactor(spi): moved spi hw sharing func to hw support

Closes IDF-8503

See merge request espressif/esp-idf!27110
2023-11-21 10:26:55 +08:00
xiaqilin
a0ecd49725 feat(pm): change power up/down register callback name 2023-11-21 10:18:55 +08:00
cjin
e98e291601 fix(pm): switch root clk src to PLL for modem reg opt and added callback 2023-11-21 10:18:32 +08:00
xiaqilin
f428f9d8c0 fix(pm): remove unuse extra_refs related code 2023-11-21 10:18:03 +08:00
cjin
ff69928064 feat(pm): change power down prepare position 2023-11-21 10:18:03 +08:00
xiaqilin
b9baf49782 fix(pm): add mac/bb power down/up prepare for fix esp32c6 pll issue 2023-11-21 10:18:03 +08:00
Lou Tianhao
ea7cfc40ae change(pm/ext1): replace esp_sleep_clear_ext1_wakeup_io by esp_sleep_disable_ext1_wakeup_io 2023-11-20 19:30:50 +08:00
morris
05e6ccbba7 feat(gdma): can read interrupt raw status 2023-11-20 17:25:57 +08:00
morris
2f72b3578a feat(gdma): distinguish abnormal and normal eof in the gdma event data 2023-11-20 17:25:57 +08:00
Lou Tianhao
b86d550ec5 change(pm/ext): remove ext0_wakeup_clear and ext1_wakeup_clear 2023-11-20 16:36:50 +08:00
Lou Tianhao
8db9f79bd2 change(pm/ext1): replace esp_sleep_set_ext1_wakeup_io by esp_sleep_enable_ext1_wakeup_io 2023-11-20 16:04:01 +08:00
Lou Tianhao
d97f45b3a8 bugfix: ext0_wakeup_prepare func when s_config.wakeup_triggers & RTC_EXT0_TRIG_EN == false 2023-11-20 16:03:57 +08:00
Marius Vikhammer
52e3f09b32 refactor(spi): moved spi hw sharing func to hw support
Common spi functionality for sharing the SPI bus between modules is moved from esp_driver_spi to
a more fitting location in esp_hw_support (shared HW resource control).

This also allows us to decouple the spi_flash driver from esp_driver_spi, removing
esp_driver_spi and esp_ringbuf from G1 builds.
2023-11-20 12:07:54 +08:00
Kevin (Lao Kaiyao)
f0129e17a8 Merge branch 'refactor/esp_driver_ana_cmpr' into 'master'
refactor(ana_cmpr): make analog comparator driver as component

Closes IDF-8521

See merge request espressif/esp-idf!27029
2023-11-17 19:07:08 +08:00
Lou Tianhao
a02f72bb81 change(pm/ext1): replace deprecated ext1 func 2023-11-17 16:20:54 +08:00
Lou Tianhao
5b91acb1a1 fix(pm/ext1): ext1_wakeup_prepare func when s_config.wakeup_triggers & RTC_EXT1_TRIG_EN == false 2023-11-17 16:20:38 +08:00
Lou Tianhao
cc0e73a11f feat(pm/ext1): support esp_sleep_enable_io_ext1_wakeup and esp_sleep_disable_io_ext1_wakeup
squash! feat(pm/ext1): support esp_sleep_enable_io_ext1_wakeup and esp_sleep_disable_io_ext1_wakeup
2023-11-17 16:20:38 +08:00
wuzhenghui
6661e11203
fix(esp_hw_support): re-initialize icg map in modem_clock_module_enable 2023-11-17 14:05:23 +08:00
laokaiyao
bc0201d6f0 refactor(ana_cmpr): make analog comparator driver as component 2023-11-17 10:05:22 +08:00
wuzhenghui
783059a592 fix(riscv): supports 1 byte and larger than 64byte range watchpoint setting 2023-11-16 18:11:57 +08:00
Wu Zheng Hui
bb95f9bcc6 Merge branch 'bugfix/fix_psram_access_faild_after_pd_cpu_wakeup' into 'master'
fix(esp_pm): fix psram access failed after pd_cpu wakeup if uart driver driven console is used

Closes WIFIBUG-238

See merge request espressif/esp-idf!27020
2023-11-14 11:50:50 +08:00
Jiang Jiang Jian
97e33fbb75 Merge branch 'bugfix/fix_lightsleep_current_leakage_on_usj_pad' into 'master'
fix(esp_hw_support): fix lightsleep current leakage on usb pad

Closes IDF-6154 and PM-18

See merge request espressif/esp-idf!26470
2023-11-14 11:17:29 +08:00
wuzhenghui
232187d12c change(esp_pm): improve POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP description
Rename PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP to PM_RESTORE_CACHE_TAGMEM_AFTER_LIGHT_SLEEP
and improve the description for it
2023-11-13 16:32:25 +08:00
Marius Vikhammer
d293ad94bd feat(pm): removed dependency on driver component 2023-11-13 15:49:12 +08:00
Marius Vikhammer
74887d81c9 refactor(system): removed dependency on driver from g1 components
esp-system and esp-hw-support, and the rest of the g1 components, now only depend on
esp_driver_spi and esp_driver_gpio. Removing the rest of the driver components from g1 builds.
2023-11-13 15:42:48 +08:00
morris
ed6ede696e Merge branch 'feature/esp_driver_mcpwm' into 'master'
feat(mcpwm): refactor mcpwm driver into a component

Closes IDF-8379

See merge request espressif/esp-idf!26738
2023-11-13 15:26:56 +08:00
wuzhenghui
0ab0d2182e fix(esp_hw_support): fix lightsleep current leakage on usb-phy controlled pad 2023-11-11 13:00:55 +08:00
Jiang Jiang Jian
221122ebeb Merge branch 'bugfix/fix_deinit_init_wifi_scan_fail_issue' into 'master'
fix(wifi): fix deinit init wifi scan fail issue

Closes WIFIBUG-200 and WIFI-5775

See merge request espressif/esp-idf!26957
2023-11-10 11:05:03 +08:00
morris
eb5183f503 feat(mcpwm): refactor mcpwm driver into a component 2023-11-09 22:05:06 +08:00
muhaidong
91bd2c8541 change(hal): remove useless code from periph_ll_wifi_bt_module_enable_clk 2023-11-09 14:17:54 +08:00
Wu Zheng Hui
a9ea49cba2 Merge branch 'bugfix/clear_ulp_wake_intr_in_wake_source_enable' into 'master'
fix(esp_hw_support): clear all type ULP wakeup intr status at ulp wakeup source enable

Closes PM-14

See merge request espressif/esp-idf!26674
2023-11-07 16:58:38 +08:00
Armando (Dou Yiwen)
0c81f41e16 Merge branch 'bugfix/fix_wrong_adc_attenuation_name' into 'master'
adc: rename ADC_ATTEN_DB_11 to ADC_ATTEN_DB_12

See merge request espressif/esp-idf!26460
2023-11-07 10:37:24 +08:00
Armando
d3be2541de fix(adc): rename ADC_ATTEN_DB_11 to ADC_ATTEN_DB_12
By design, it's 12 dB. There're errors among chips, so the actual
attenuation will be 11dB more or less
2023-11-06 18:55:49 +08:00
morris
2ef14fe55e refactor(gptimer): refactor gptimer driver into a component 2023-11-06 17:09:31 +08:00
Song Ruo Jing
9461993ec5 refactor(gpio): make gpio driver as component, and fix astyle 2023-11-03 15:42:23 +08:00
Jiang Jiang Jian
b839a70aea Merge branch 'bugfix/lp_active_slow_clock_domain_default_power_down' into 'master'
In the LP ACTIVE state, the slow clock power domain is by default in a powered-off state

Closes IDF-8410

See merge request espressif/esp-idf!26599
2023-11-02 17:04:30 +08:00
Marius Vikhammer
95703297a6 Merge branch 'ci/psram_config_fix' into 'master'
ci: fix warnings for invalid kconfig option

See merge request espressif/esp-idf!23250
2023-11-02 13:44:04 +08:00
Marius Vikhammer
77bb19c49e ci(build): fixed/ignored warnings from unknown symbols in sdkconfig.defaults 2023-11-01 01:14:00 +00:00
morris
d78750306d refactor(emac): use clock_output driver for configuring RMII reference clock 2023-10-31 14:24:48 +08:00
wuzhenghui
18f984fd9c fix(esp_hw_support): clear all type ULP wakeup intr status at ulp wakeup source enable 2023-10-30 11:18:01 +08:00
Li Shuai
fa489d3c20 change(Power Management): the xpd_xtal32k value depends on system slow clock source config option when pmu initialize 2023-10-24 17:11:53 +08:00
Xiao Xufeng
1f5fb3f921 spi_flash: fixed issue that enabling HPM-DC by default may cause app unable to restart 2023-10-24 10:38:08 +08:00
Lou Tianhao
13a405a32b change(pm): Change sleep callback implement 2023-10-23 08:13:47 +00:00
Jiang Jiang Jian
0049cc663a Merge branch 'feature/support_output_internal_clock' into 'master'
feature(gpio): Add api to support output internal clock

Closes IDF-8016 and IDF-4935

See merge request espressif/esp-idf!25753
2023-10-22 22:06:13 +08:00
wuzhenghui
d6cda1b6e1 ci(esp_hw_support): add test case for gpio output internal clock feature ci 2023-10-20 14:55:10 +08:00
wuzhenghui
7195bf19df feat(esp_hw_support): support one-to-many signal-gpio mapping output 2023-10-20 14:55:06 +08:00
wuzhenghui
6a436286dc feat(esp_hw_support): add api to gpio driver to support output internal clock on GPIO 2023-10-20 14:35:26 +08:00
Jiang Guang Ming
5f00b8a4d5 fix(esp32c3): Update esp32c3 chip revision 2023-10-20 11:01:07 +08:00
Armando (Dou Yiwen)
471f1f61ae Merge branch 'feature/support_sdmmc_ver2_on_p4' into 'master'
sdmmc: esp32p4 support

Closes IDF-6502

See merge request espressif/esp-idf!25405
2023-10-19 22:00:40 +08:00
Jiang Jiang Jian
a94bb6201b Merge branch 'bugfix/deep_sleep_force_to_sleep' into 'master'
fix(esp_hw_support): Return deep sleep APIs to the original behavior

Closes IDFGH-11192, PM-11, and IDF-7600

See merge request espressif/esp-idf!26341
2023-10-19 14:27:02 +08:00
Wan Lei
a9b6c98489 Merge branch 'refactor/spi_using_rcc_automic_lock' into 'master'
refac(spi): update periph_module_xxx with rcc_atomic_lock for periph bus

Closes IDF-8159

See merge request espressif/esp-idf!26394
2023-10-18 20:36:51 +08:00
Armando
7879b29b0c feat(dma): added a helper api to check buffer is dma aligned 2023-10-18 11:57:55 +00:00
Armando
70314b56d5 feat(sdmmc): supported sd2.0 on esp32p4 2023-10-18 11:57:55 +00:00
wuzhenghui
97e001d603 fix(esp_hw_support): fix pm tests failure caused by non-iram safe test code 2023-10-17 20:56:43 +08:00
wanlei
b81cafe42e refac(spi): update periph_module_xxx with rcc_automic_lock for periph bus 2023-10-17 11:32:23 +08:00
Michael (XIAO Xufeng)
2308292ca3 Merge branch 'bugfix/revert_pvt' into 'master'
Revert "feat(volt): chip auto adjust volt for esp32c6 & esp32h2"

See merge request espressif/esp-idf!26425
2023-10-16 12:53:07 +08:00
Mahavir Jain
dbc33ca7aa Merge branch 'feature/add_intr_priority_config_option' into 'master'
feat(mbedtls): Add config for interrupt priority in AES and RSA

Closes IDF-7963 and IDF-7964

See merge request espressif/esp-idf!26190
2023-10-16 11:33:03 +08:00
Mahavir Jain
6b62065b92 Merge branch 'fix/crypto_periphs_use_rcc_atomic_blocks' into 'master'
Use rcc atomic blocks to enable/reset crypto peripherals

See merge request espressif/esp-idf!25811
2023-10-13 22:37:58 +08:00
Michael (XIAO Xufeng)
586ab5387a Merge branch 'bugfix/remove_spiram_kconfig_hwsupport' into 'master'
fix(hw_support): remove outdated source from Kconfig file

See merge request espressif/esp-idf!26391
2023-10-13 18:49:38 +08:00
Jiang Jiang Jian
042382e87b Merge branch 'feature/support_dump_sleep_context' into 'master'
feat(esp_hw_support): Supports recording key sleep parameters into user-specified structures for debug

Closes FCS-1300

See merge request espressif/esp-idf!26359
2023-10-12 19:35:47 +08:00
zlq
9c2d470465 feat(bootloader): adjust dbias of bootloader, change clock of H2 to 64
MHz
2023-10-12 14:51:54 +08:00
Xiao Xufeng
28ba080c5e Revert "feat(volt): chip auto adjust volt for esp32c6 & esp32h2"
This reverts commit b221f87e00.
2023-10-12 14:51:54 +08:00
nilesh.kale
cf4a7bb09d feat(mbedtls): Add config for interrupt priority in AES and RSA(MPI) 2023-10-12 11:06:13 +05:30
harshal.patil
57d10477da
feat(ecdsa): use RCC atomic block to enable/reset the ECDSA peripheral 2023-10-11 14:59:04 +05:30
harshal.patil
43864f7fb4
feat(ds): use RCC atomic block to enable/reset the DS peripheral 2023-10-11 14:59:04 +05:30
harshal.patil
18b93e9564
feat(hmac): use RCC atomic block to enable/reset the HMAC peripheral 2023-10-11 14:59:04 +05:30
harshal.patil
1c6ff8ce9f
feat(ecc): use RCC atomic block to enable/reset the ECC peripheral 2023-10-11 14:59:04 +05:30
harshal.patil
c5cc4f488a
feat(mpi): use RCC atomic block to enable/reset the MPI peripheral 2023-10-11 14:59:03 +05:30
harshal.patil
3483cf61aa
fix(esp_hw_support/esp_ds): remove enabling redundant peripherals 2023-10-11 14:59:03 +05:30
Lou Tianhao
2d3f95dad4 bugfix(pm): fix esp_sleep_enable_ext1_wakeup func
regression introduced in commit<808a01e65>
2023-10-10 19:30:38 +08:00
Michael (XIAO Xufeng)
a249555f1c fix(hw_support): remove outdated source from Kconfig file
This line was moved to components/esp_psram/Kconfig.
2023-10-10 15:31:53 +08:00
KonstantinKondrashov
cd64b228b1 fix(esp_hw_support): Return deep sleep APIs to the original behavior
Closes https://github.com/espressif/esp-idf/issues/12359
2023-10-09 22:19:22 +08:00
Wan Lei
f92b18053a Merge branch 'feature/esp32p4_hp_spi_support' into 'master'
Feature/esp32p4 hp spi master driver support

Closes IDF-7502

See merge request espressif/esp-idf!24963
2023-10-09 18:37:35 +08:00
Gao Xu
d52040a86d Merge branch 'esp32p4/add_uart_support' into 'master'
UART: Add uart support for ESP32P4

Closes IDF-6511 and IDF-7506

See merge request espressif/esp-idf!25388
2023-10-09 18:11:10 +08:00
wuzhenghui
c667f5a864 feat: support dump last time sleep context 2023-10-09 10:42:10 +08:00
Lou Tian Hao
adae54faca Merge branch 'bringup/support_callback_mechanism_in_lightsleep_flow' into 'master'
Power Management: support_callback_mechanism_in_lightsleep_flow

Closes WIFI-5936

See merge request espressif/esp-idf!24597
2023-10-08 20:16:01 +08:00
wanlei
eb75aa462e feat(spi_master): p4 enable test and examples 2023-10-08 14:45:52 +08:00
gaoxu
3e3e928209 feat(uart): move periph_ll_uart_enabled to uart_ll.h 2023-10-08 10:10:02 +08:00
gaoxu
4541ad134d feat(uart): add RCC atomic block to uart/lp-uart peripheral 2023-10-08 10:10:02 +08:00
gaoxu
c7afa0dcef feat(uart): uart(hp,lp) support on esp32p4 2023-10-08 10:10:00 +08:00
Gao Xu
56f991d7d9 Merge branch 'bugfix/fix_adc_sar_set_power_mode_no_effect' into 'master'
ADC: Fixed wrong ADC reading issue caused by ADC and WiFi power conflict on ESP32C6

Closes IDF-8118

See merge request espressif/esp-idf!25927
2023-10-07 18:23:27 +08:00
Armando (Dou Yiwen)
fbecb1e543 Merge branch 'change/remove_s3_120_sdr_warning' into 'master'
mspi: remove s3 120mhz sdr warning

See merge request espressif/esp-idf!26183
2023-09-29 02:31:49 +08:00
gaoxu
8efe950077 fix(adc): power settings not taking into effect on H2 2023-09-28 17:41:42 +00:00
wuzhenghui
c8083b07bf feat(modem_clock): separate management of modem_adc_common_fe clock and modem_private_fe 2023-09-28 17:41:42 +00:00
gaoxu
817036f46f fix(adc): power settings not taking into effect on C6 2023-09-28 17:41:42 +00:00
Kevin (Lao Kaiyao)
4c6f4b39f1 Merge branch 'feature/support_i2s_on_p4' into 'master'
feat(i2s): support i2s on esp32p4

Closes IDF-6508

See merge request espressif/esp-idf!24280
2023-09-29 00:50:04 +08:00
Armando
f465bc131a change(mspi): remove s3 120mhz sdr warning 2023-09-28 08:15:17 +00:00
laokaiyao
72a0746e62 refactor(apll): move the apll soc caps to clk_tree_ll 2023-09-28 15:03:27 +08:00
laokaiyao
cf889f3c6d feat(i2s): support i2s on esp32p4 2023-09-28 15:03:27 +08:00
zlq
b221f87e00 feat(volt): chip auto adjust volt for esp32c6 & esp32h2 2023-09-28 05:55:42 +00:00
Kevin (Lao Kaiyao)
9a239b8367 Merge branch 'feature/support_analog_comparator_on_p4' into 'master'
feat(ana_cmpr): supported analog comparator on esp32p4

Closes IDF-7479

See merge request espressif/esp-idf!24873
2023-09-27 04:24:09 +08:00
Jiang Jiang Jian
2ec907e621 Merge branch 'bugfix/fix_sleep_risk_vol_param' into 'master'
bugfix(sleep): fix risk sleep vol param for esp32c6 & esp32h2

See merge request espressif/esp-idf!25993
2023-09-26 14:06:56 +08:00
Ivan Grokhotkov
8545f8595f Merge branch 'bugfix/build_fail_c6_usb_serial_jtag' into 'master'
fix build with CONFIG_ESP_CONSOLE_UART=n on C6, re-enable build tests for C6 and C2

Closes IDFGH-10698

See merge request espressif/esp-idf!24935
2023-09-25 20:39:32 +08:00
laokaiyao
ff7a11e539 feat(ana_cmpr): supported etm in analog comparator example 2023-09-25 19:57:34 +08:00
laokaiyao
bf2a5653a9 feat(ana_cmpr): supported analog comparator etm function on p4 2023-09-25 19:57:34 +08:00
Mahavir Jain
ab74fb4d92 Merge branch 'feature/locking_layer_for_ecdsa' into 'master'
feat(esp_hw_support): Added locking mechanism for the ECDSA and ECC peripherals

Closes IDF-7990

See merge request espressif/esp-idf!26029
2023-09-25 18:04:21 +08:00
Jiang Jiang Jian
217defb939 Merge branch 'bugfix/fix_modem_reject_deepsleep' into 'master'
fix(sleep): fix modem reject the deepsleep request

Closes PM-9

See merge request espressif/esp-idf!26101
2023-09-25 17:10:53 +08:00
Jiang Jiang Jian
73dcc399c3 Merge branch 'bugfix/fix_pma_bad_retention' into 'master'
fix(sleep): fix pma cfg csr regs bad retention

See merge request espressif/esp-idf!26136
2023-09-25 17:10:11 +08:00
chaijie@espressif.com
76aca4cc8a fix(sleep): fix inproper sleep vol param for esp32c6 & esp32h2 2023-09-25 16:37:35 +08:00
Lou Tianhao
450e685cb7 feat(PowerManagement/lightsleep): Support ESP_SLEEP_EVENT_CALLBACKS 2023-09-25 15:39:18 +08:00
morris
0fe1114673 Merge branch 'bugfix/shared_intr_memory_location' into 'master'
fix(intr): always allocate memory from internal ram

Closes IDFGH-11099

See merge request espressif/esp-idf!26090
2023-09-25 15:36:36 +08:00
Armando (Dou Yiwen)
b58a2ea6a6 Merge branch 'feature/support_cache_p4' into 'master'
cache: support cache driver on esp32p4

Closes IDF-7516

See merge request espressif/esp-idf!25490
2023-09-25 15:21:46 +08:00
Ivan Grokhotkov
464d278f8a
fix(esp_hw_support): fix build with CONFIG_ESP_CONSOLE_UART=n on C6
Closes https://github.com/espressif/esp-idf/issues/11924
2023-09-22 13:32:04 +02:00
C.S.M
c16b76f949 Merge branch 'bugfix/temp_clk_gate' into 'master'
fix(temperature_snesor): Put clock gate enable/disable in to sar_periph_ctrl together

Closes WIFIBUG-110

See merge request espressif/esp-idf!25992
2023-09-22 16:32:40 +08:00
morris
3dc13d58a1 fix(intr): always allocate memory from internal ram
Closes https://github.com/espressif/esp-idf/issues/12271
2023-09-22 15:13:35 +08:00
Armando
ec27891af6 change(cache): swap cache hal arg 'type' and 'level' 2023-09-22 14:19:41 +08:00
Armando
900aebd158 feat(dma): added APIs for dma specific malloc 2023-09-22 14:19:41 +08:00
Armando
cc581c3c36 change(cp_dma): check cache line by cache level 2023-09-22 14:19:41 +08:00
Armando
ea38a2e9a4 feat(cache): support cache driver on esp32p4 2023-09-22 14:19:41 +08:00
wuzhenghui
7a0684d03f fix(sleep): fix pma cfg csr regs bad retention 2023-09-22 11:47:45 +08:00
Chen Yu Dong
ac17132bb4 Merge branch 'ci/move_build_test_rules_files_folder' into 'master'
fix(ci): change build-test-rules files folder

See merge request espressif/esp-idf!26076
2023-09-22 11:28:48 +08:00
Song Ruo Jing
98abcbabea Merge branch 'feature/esp32p4_lp_io_support' into 'master'
feat(lp_io): Add support for ESP32P4

Closes IDF-7815

See merge request espressif/esp-idf!25991
2023-09-21 15:20:13 +08:00
wuzhenghui
34f89091b2 fix(sleep): fix modem reject the deepsleep request 2023-09-21 15:11:55 +08:00
morris
eac8df1380 Merge branch 'refactor/esp_timer_etm_test' into 'master'
test(etm): refactor systimer etm test case

See merge request espressif/esp-idf!26062
2023-09-21 12:58:09 +08:00
Cao Sen Miao
3265bab95f fix(temperature_snesor): Put clock gate enable/disable in to sar_periph_ctrl together 2023-09-21 12:19:12 +08:00
morris
8d17265bb7 Merge branch 'feature/support_rmt_esp32p4' into 'master'
RMT driver support on ESP32-P4

Closes IDF-7476 and IDF-7730

See merge request espressif/esp-idf!25680
2023-09-20 23:11:11 +08:00
morris
a71208f96d refactor(etm): systimer etm test case
previously we use the systimer event to toggling a GPIO and assert the GPIO level,
which is not stable in CI.
Now we swicth to clear the GPIO at the systimer event.
2023-09-20 22:26:35 +08:00
Lou Tianhao
34f8f1bb2c feat(PowerManagement/lightsleep): Define and export a strong symbol of rv_core_critical_regs_restore 2023-09-20 21:49:57 +08:00
Song Ruo Jing
2d458a3f93 feat(lp_io): Add support for ESP32P4 2023-09-20 19:39:41 +08:00
Chen Yudong
2e11919f70 fix(ci): change build-test-rules files folder 2023-09-20 19:17:06 +08:00
Mahavir Jain
46a692fd22 Merge branch 'bugfix/cleanup_hmac_ds_testapps' into 'master'
fix(esp_hw_support): fix redudancy in hmac and ds test apps

Closes IDF-7993

See merge request espressif/esp-idf!25781
2023-09-20 18:45:30 +08:00
harshal.patil
6a7caa7b8e
feat(esp_hw_support): Added locking mechanism for the ECDSA and ECC peripheral 2023-09-20 16:05:50 +05:30
harshal.patil
aa4783519a
feat(esp_hw_support): Add esp_crypto_lock layer for esp32c2 2023-09-20 16:05:49 +05:30
Zim Kalinowski
d9a9a4a17f Merge branch 'fix/test_app_trim_builds' into 'master'
fix(test_apps): Trim builds of component test apps

See merge request espressif/esp-idf!25789
2023-09-20 18:32:57 +08:00
Lou Tian Hao
925a7310ca Merge branch 'feat/add_internal_pull_up_or_pull_down_option_for_deepsleep_wakeup_prepare' into 'master'
feat(pm): add internal pull-up/downs option for gpio used for deepsleep wakeup

Closes IDFGH-10994

See merge request espressif/esp-idf!25972
2023-09-20 10:44:07 +08:00
morris
6bb05cccdd feat(rmt): add driver support for esp32p4
including DMA feature
2023-09-19 12:54:14 +08:00
Gao Xu
80e3ece7d1 Merge branch 'bugfix/remove_wno_format_in_driver_hal_and_esp_hw_support_components' into 'master'
Remove -Wno-format in  hal and esp_hw_support components

Closes IDF-6792

See merge request espressif/esp-idf!25402
2023-09-19 12:12:56 +08:00
Lou Tianhao
88364b8b11 feat(pm): add internal pull-up/downs option for gpio used for deepsleep wakeup
stash
2023-09-19 11:00:59 +08:00
Jiang Jiang Jian
ea8b5c28ea Merge branch 'bugfix/fix_wifi_fail_to_enter_lightsleep_when_disconnected_esp32c6' into 'master'
fix(sleep_modem): fix lightsleep failure if enable lightsleep at phy disabled

Closes WIFI-5725 and WIFI-6208

See merge request espressif/esp-idf!25902
2023-09-19 07:16:55 +08:00
Michael (XIAO Xufeng)
efb9d9e7d4 Merge branch 'esp32_s2_s3_cpu_freq_to_pll' into 'master'
EspS2/S3: fixed the bug of insufficient voltage when the CPU switches frequency

See merge request espressif/esp-idf!25396
2023-09-18 20:01:31 +08:00
Darian Leung
287bdc5e61 fix(test_apps): Trim builds of component test apps
Some component test apps do not use the "set(COMPONENTS main)" command in their
project level "CMakeLists.txt", thus leading to their builds pulling in all
ESP-IDF components.

This commit trims the build of multiple component test apps:

- Add "set(COMPONENTS main ...)" to project level "CMakeLists.txt"
- Add missing "PRIV_REQUIRES" in some "main" component "CMakeLists.txt"

Also removed repeated configuraiton options in legacy_i2c_driver/sdkconfig.ci.defaults
as they are already specified in legacy_i2c_driver/sdkconfig.defaults
2023-09-18 17:16:37 +08:00
nilesh.kale
84d91e5bf9 fix(esp_hw_support/test_apps): fix redudancy in hmac and ds test apps 2023-09-18 10:42:54 +05:30
liuning
c6db306833 sleep_modem: split esp_wifi_internal_mac_sleep_configure, add lock for pm functions 2023-09-18 11:49:52 +08:00
liuning
90698bf1f5 fix(sleep_modem): fix lightsleep failure if enable lightsleep at phy disabled 2023-09-18 11:46:32 +08:00
gaoxu
5b4469f973 fix: remove wno format in esp_hw_support component 2023-09-18 02:43:41 +00:00
Armando (Dou Yiwen)
7894b21ef0 Merge branch 'bugfix/fix_120_ddr_pll_cali_issue' into 'master'
mspi: fixed bbpll calibration issue

Closes IDF-8237

See merge request espressif/esp-idf!25934
2023-09-14 15:46:54 +08:00
Konstantin Kondrashov
cbdb799b6f feat(esp_timer): Support systimer for ESP32P4 2023-09-13 19:13:38 +08:00
Armando
d85c96209a fix(mspi): fixed bbpll calibration issue 2023-09-13 11:22:31 +08:00
morris
ae1a9bf015 Merge branch 'feat/mcpwm_event_comparator_driver' into 'master'
feat(MCPWM): MCPWM event comparator driver

Closes IDF-7989

See merge request espressif/esp-idf!25552
2023-09-12 14:41:07 +08:00
morris
47e499de52 feat(mcpwm): clean up MCPWM ETM driver 2023-09-11 16:53:34 +08:00
Chen Jichang
7638235311 feat(mcpwm): MCPWM event comparator driver
In esp32p4, the MCPWM has a new feature, mainly ETM-oriented.
Each operator has two event comparators, can generate an event
when the count value of the timer that operator connects is equal
to the value of event comparator.
2023-09-11 16:53:34 +08:00
Planck (Lu Zeyu)
2a340c5fc5 fix(test_etm): fix vTaskDelay caused ci failure 2023-09-11 16:24:24 +08:00
hongshuqing
77a303276a esp32/esp32s2/esp32s3 cpu freq to pll
add assert for cpu_freq_to_8m

update esp32 DBIAS_XTAL_80M_160M define

delete modify of esp32

remove esp32 comment

restore esp32 modify
2023-09-11 10:40:27 +08:00
Jiang Jiang Jian
5d983c3185 Merge branch 'bugfix/esp32c6_udp_bc_mc_short_time_cause_packet_loss' into 'master'
optimize the retention step of the APM and TEE modules to set only the critical parts to level 2 priority

Closes WIFIBUG-80

See merge request espressif/esp-idf!25792
2023-09-11 10:02:13 +08:00
Jiang Jiang Jian
a1c0d9c3a1 Merge branch 'feature/ble_lib_update_h2_c6' into 'master'
ble: update h2 c6 libble to 5d7af429

Closes BLERP-7

See merge request espressif/esp-idf!25691
2023-09-07 10:25:08 +08:00
morris
94d39009b4 Merge branch 'feature/esplcd_replace_periph_func_with_atomic' into 'master'
feat(esp_lcd): Replace `periph_module` function call with new ll func

Closes IDF-8167

See merge request espressif/esp-idf!25717
2023-09-07 01:59:04 +08:00
morris
2e6015b39f Merge branch 'refactor/add_namespace_intr_cpu_id' into 'master'
refactor(intr): add namespace for intr_cpu_id_t

See merge request espressif/esp-idf!25725
2023-09-06 16:41:57 +08:00
Li Shuai
0f103817bc fix(esp32c6/power save): optimize the retention step of the APM and TEE modules to set only the critical parts that affect wifi data frame receipt to level 2 priority 2023-09-06 14:57:46 +08:00
Planck (Lu Zeyu)
86d4f9993f feat(esp_lcd): replace periph_module func with new ll func
Update periph_ctrl.h
2023-09-06 14:42:01 +08:00
Marius Vikhammer
0a630831a7 Merge branch 'feature/move_wdt_defines_to_ll' into 'master'
fix(wdt): move non-auto generated wdt values to ll

See merge request espressif/esp-idf!25757
2023-09-06 10:12:43 +08:00
morris
e8847a176f refactor(intr): add namespace for intr_cpu_id_t
previously the intr_types.h doesn't have a namespace,
it has the risk of introduing conflict in user's project.
2023-09-06 09:50:41 +08:00
cjin
574800b50a feat: added ble wake up overhead support 2023-09-05 20:40:04 +08:00
Marius Vikhammer
e3861261eb fix(wdt): move non-auto generated wdt values to ll 2023-09-05 11:52:34 +08:00
Mahavir Jain
d382eeed54 Merge branch 'esp32p4/add_hmac_ds_support' into 'master'
esp32p4/add hmac ds support

Closes IDF-7543 and IDF-6518

See merge request espressif/esp-idf!25148
2023-09-04 16:45:56 +08:00
harshal.patil
b8c208cdb3
feat(ds): add Digital Signature peripheral support for esp32p4 2023-09-01 15:44:21 +05:30
harshal.patil
095c2a3324
feat(hmac): add HMAC peripheral support for esp32p4 2023-09-01 15:41:39 +05:30
Sudeep Mohanty
5cd989f23b fix(interrupts): Cleanup pending tags in the code base regarding interrupt vectors 2023-09-01 17:18:39 +08:00
Omar Chebib
d3afca3020 Merge branch 'fix/esp32p4_supports_interrupts' into 'master'
feat(riscv): Add support to ESP32-P4's CLIC interrupt controller

Closes IDF-7795 and IDF-7793

See merge request espressif/esp-idf!25383
2023-09-01 11:48:39 +08:00
morris
cf61f63bc2 Merge branch 'feature/hw_crc_esp32p4' into 'master'
feat(gdma): support hardware crc calculation on esp32p4

Closes IDF-7497

See merge request espressif/esp-idf!25307
2023-08-31 14:46:32 +08:00
Song Ruo Jing
91aab6bda0 Merge branch 'feature/add_uart_iram_safe_check' into 'master'
feat(uart): Add sdkconfig.ci.iram_safe test for UART driver

See merge request espressif/esp-idf!25618
2023-08-31 12:57:46 +08:00
Omar Chebib
8ca191e4c1 fix(esp32p4): Fixed interrupt handling to use the CLIC controller 2023-08-31 12:16:08 +08:00
morris
b962fdee89 refactor(gdma): add reset and clock control in LL driver 2023-08-31 02:11:47 +00:00
morris
200eb866dc feat(gdma): support hardware crc calculation
On ESP32-P4, the GDMA peripherals support CRC calculating.
2023-08-31 02:11:47 +00:00
Song Ruo Jing
767698b90d feat(uart): Add sdkconfig.ci.iram_safe test for UART driver 2023-08-30 11:30:03 +08:00
morris
47bb157cab refactor(twai): add reset and clock control to twai LL layer 2023-08-29 22:19:57 +08:00
Erhan Kurubas
f0fba3fc4c Merge branch 'fix/bp_wp_in_panic' into 'master'
Fix bp/wp logic when debugger is connected

See merge request espressif/esp-idf!25582
2023-08-29 18:23:36 +08:00
morris
cd9f48823d Merge branch 'refactor/rcc_critical_section_follow_up' into 'master'
refactor(lp_periph): move enable and reset control to LL driver

See merge request espressif/esp-idf!25498
2023-08-29 08:40:02 +08:00
Erhan Kurubas
7549995754 fix(readme): add esp32p4 etm test app to the supported targets table 2023-08-28 10:46:56 +02:00
Erhan Kurubas
65dcc565a7 fix(breakpoint): fix bp/wp logic when debugger is connected 2023-08-28 10:46:56 +02:00
Jiang Jiang Jian
24914d15d8 Merge branch 'feature/manage_modem_etm_clock_indepently' into 'master'
feat(esp_hw_support): manage modem_etm clock in modem_clock for bt/154 indepently

Closes IDF-8013

See merge request espressif/esp-idf!25284
2023-08-28 13:35:58 +08:00
morris
4a45479336 refactor(lp_periph): move enable and reset control to LL driver 2023-08-28 05:17:56 +00:00
morris
ab42d63054 fix(ci): pre-commit failure on readme check 2023-08-28 05:17:56 +00:00
Jiang Jiang Jian
52aea44fa0 Merge branch 'bugfix/esp32c6_udp_bc_mc_rx_loss_rate_is_high' into 'master'
fix esp32c6 UDP BC/MC RX loss rate is high when light sleep is enabled

Closes WIFIBUG-85

See merge request espressif/esp-idf!25309
2023-08-28 12:50:29 +08:00
Armando (Dou Yiwen)
d4d6241db0 Merge branch 'feature/esp32p4_build_test' into 'master'
ci: enable ci build stage on esp32p4

Closes IDF-7524 and IDF-7525

See merge request espressif/esp-idf!25343
2023-08-25 13:35:20 +08:00
Marius Vikhammer
e07023292a Merge branch 'feature/p4_spinlocks' into 'master'
esp32p4: support spinlocks

Closes IDF-7771

See merge request espressif/esp-idf!25036
2023-08-25 11:43:38 +08:00
Armando
7dbd3f6909 feat(ci): Enable p4 example, test_apps and unit tests CI build 2023-08-24 12:51:19 +08:00
Marius Vikhammer
0d9f9e6816 feat(core-systems): add support for spinlock/compare and set on esp32p4 2023-08-24 10:30:25 +08:00
morris
911c388cf8 feat(etm): add core driver support for esp32-p4
esp_etm core driver support:
- channel allocator
- gpio etm sub driver
- gptimer etm sub driver
2023-08-23 15:11:56 +08:00
morris
3b50c716d8 Merge branch 'feature/gptimer_ll_enable_reset' into 'master'
HW-Support: Add Atomic Code Block for Reset and Clock Control

See merge request espressif/esp-idf!25401
2023-08-23 15:11:42 +08:00
morris
035c7c145c feat(clk_cali): always enable timer group0 for clock calibration
Calibration registers are located in the timer group0,
this commit is going to always enable it when the calibration is used by app
2023-08-22 17:05:35 +08:00
morris
a9c813ca3e feat(hw_support): add atomic code block for peripheral bus clock and reset 2023-08-22 17:05:35 +08:00
Sudeep Mohanty
4e51c6b049 feat(freertos): Added changes for multi-core RISC-V port for FreeRTOS
This commit updates the FreeRTOS port layer for multi-core RISC-V targets.
2023-08-22 15:35:15 +08:00
Li Shuai
0c9eba8a2a fix(esp32c6/power save): improve TEE and APM module retention priority to 2 to avoid the wifi fail to read the rxbuf link and trigger the rxbuf overflow error 2023-08-21 12:28:51 +00:00
Jiang Jiang Jian
6e9708a489 Merge branch 'feature/add_ci_for_esp_wifi_powersave_example' into 'master'
ci(wifi): add pytest case for wifi powersave example

See merge request espressif/esp-idf!25227
2023-08-21 10:49:50 +08:00
Planck (Lu Zeyu)
e99a1e1bdd fix(intr_flags_to_level): fix value returned one more than correct value 2023-08-18 19:49:50 +08:00
morris
4ee4158a8f Merge branch 'bugfix/async_memcpy_dst_align_check' into 'master'
fix(async_memcpy): destination alignment check against cache line size

Closes IDF-7494

See merge request espressif/esp-idf!25359
2023-08-16 12:57:19 +08:00
Marius Vikhammer
f83c29f242 Merge branch 'feature/esp32p4_docs_build' into 'master'
ESP32-P4 build docs

Closes IDF-7520 and IDF-7773

See merge request espressif/esp-idf!25026
2023-08-16 11:49:43 +08:00
Marius Vikhammer
27baef2424 docs(esp32p4): added building docs for ESP32-P4 2023-08-16 10:13:47 +08:00
morris
595c3fe6a2 fix(async_memcpy): destination alignment check against cache line size
On ESP32P4, becasue we need to invalidate the destination buffer,
if the buffer is not aligned to cache line, then it might break
other date structure, randomly.
2023-08-15 17:40:17 +08:00
Michael (XIAO Xufeng)
8845767bc0 Merge branch 'feat/sub_power_modes_docs' into 'master'
sleep_modes: add docs and test app for sub power modes on S2, S3, C2, C3.

See merge request espressif/esp-idf!23142
2023-08-15 10:57:48 +08:00
Xiao Xufeng
fca7fd8613 ci(sleep_mode): Update test app for new sub modes on S2, S3, C2, C3 2023-08-11 17:20:16 +08:00
Armando (Dou Yiwen)
337aeb4b78 Merge branch 'feature/add_esp32p4_hello_world' into 'master'
esp32p4: introduced new chip ESP32P4: Hello World! 🌏

Closes IDF-7523

See merge request espressif/esp-idf!25013
2023-08-10 16:04:55 +08:00
wuzhenghui
a425d8816a feat(esp_hw_support): manage modem_etm clock in modem_clock for bt/154 indepently 2023-08-09 20:19:50 +08:00
Lou Tianhao
808a01e656 feat(pm/deepsleep): Support EXT1_WAKEUP_MODE_PER_PIN 2023-08-09 19:46:25 +08:00
Armando
06782d1623 change(esp32p4): update rtc interrupt registration todo list 2023-08-09 19:33:36 +08:00
Armando
00df6b378d refactor(sar): build sar_periph_ctrl related files by chip 2023-08-09 19:33:36 +08:00
Armando
706d684418 feat(esp32p4): introduced new target esp32p4, supported hello_world 2023-08-09 19:33:25 +08:00
Xiao Xufeng
5ee8add38c refactor(esp_hw_support): Move rtc_8md256 and rtc_power_modes test apps to esp_hw_support 2023-08-09 14:57:57 +08:00
wuzhenghui
e9c6083729 fix(light_sleep): shouldn't backup uart fifo reg in pd_top light sleep 2023-08-08 16:45:17 +08:00
Lou Tian Hao
791360336a Merge branch 'feature/support_pd_hp_aon_domain_in_deepsleep' into 'master'
Feature: support pd hp aon domain in deepsleep

See merge request espressif/esp-idf!25175
2023-08-07 17:28:40 +08:00
Armando
de68029de9 change(header): modify p4 headers issues from check_header_py 2023-08-04 14:13:59 +02:00
morris
55ea6b78a7 Merge branch 'feature/async_memcpy_rewrite' into 'master'
feat(async_memcpy): refactor driver code to support different DMA backends

See merge request espressif/esp-idf!25050
2023-08-04 17:52:13 +08:00
wuzhenghui
8b5052f213 fix(light_sleep): save vddsdio_config before lightsleep 2023-08-04 11:58:07 +08:00
wuzhenghui
0b0e8ab80b fix(light_sleep): suspend/resume cache correspondingly after light sleep 2023-08-04 11:56:55 +08:00
wuzhenghui
c34cdd05e9 fix(esp_hw_support): manage i2c_ana_mst clock witch modem clock driver 2023-08-04 10:39:43 +08:00
Lou Tianhao
caddc10bf3 feat(pm/deepsleep): support pd hp aon domain in deepsleep 2023-08-03 17:23:02 +08:00
morris
fd3d1aa101 feat(async_memcpy): refactor driver code to support different DMA backen
To support AHB and AXI DMA memory copy for the same target (esp32p4).
2023-08-03 12:02:09 +08:00
Wu Zheng Hui
016cb6a19a Merge branch 'bugfix/fix_cache_data_mem_corrupt_after_sleep' into 'master'
fix(lightsleep): Suspend cache before goto sleep to avoid cache load wrong data

Closes IDFCI-1760

See merge request espressif/esp-idf!25084
2023-08-02 11:02:01 +08:00
Lou Tian Hao
3f6be5938b Merge branch 'docs/rewrite_all_low_to_any_low_when_not_esp32' into 'master'
Docs: rewrite_all_low_to_any_low_when_not_esp32

See merge request espressif/esp-idf!24997
2023-08-01 20:56:36 +08:00
Xu Si Yu
36511a3005 Merge branch 'feature/add_sleep_test_for_ot_ci' into 'master'
OpenThread CI: add a test case of sleepy device

See merge request espressif/esp-idf!24715
2023-08-01 20:38:29 +08:00
Mahavir Jain
53ff7d43db Merge branch 'ci/fix_test_switch_ota' into 'master'
fix(app_update): Fix CI test_switch_ota by increasing deepsleep

See merge request espressif/esp-idf!24801
2023-08-01 16:49:25 +08:00
wuzhenghui
26618ad536 fix(lightsleep): suspend cache before goto sleep
There is a possibility that the cache is still accessing the
SPI flashwhen sleep isolating SPI IO, so it is necessary to
wait for the cache to be free before requesting sleep.
2023-08-01 16:29:04 +08:00
Lou Tianhao
f33188fb35 docs(pm/sleep): rewrite_all_low_to_any_low_when_not_esp32 2023-08-01 11:53:14 +08:00
Xu Si Yu
753f74cb99 feat(openthread): add sleep debug message 2023-07-31 17:01:37 +08:00
Song Ruo Jing
8b574fb87f remove(clk): remove warning log if RC_FAST clock calibration is needed on esp32h2 2023-07-26 20:29:58 +08:00
Armando (Dou Yiwen)
6bc9a39010 Merge branch 'feature/add_esp32p4_esp_system_support' into 'master'
system: added p4 base support for system related parts

See merge request espressif/esp-idf!24850
2023-07-25 16:50:40 +08:00
morris
facb9a02d3 Merge branch 'bugfix/fix_gdma_build_failure_on_p4' into 'master'
fix(gdma): fixed compilation failure of gdma

See merge request espressif/esp-idf!24964
2023-07-25 15:10:40 +08:00
Armando
e11b154c99 feat(interrupt): mtvt, mtvec base support on p4 2023-07-25 05:59:10 +00:00
Armando
c156e56684 feat(spinlock): added spinlock base support on p4 2023-07-25 05:59:10 +00:00
Armando
019e68bb15 feat(interrupt): added clic support on p4 2023-07-25 05:59:10 +00:00
Armando
c76de79f4c feat(cpu): added cpu utils base support on p4 2023-07-25 05:59:10 +00:00
Armando
bc182ef010 feat(brc_predictor): p4 base support for branch predictor 2023-07-25 05:59:10 +00:00
morris
6d46cf739c feat(gdma): test non-cacheable DMA descriptor
To avoid different DMA descriptors reside in the same cache line,
we want the CPU to access the DMA descriptor in a non-cachable way
2023-07-25 10:59:07 +08:00
laokaiyao
274e1c0089 fix(gdma): fixed compilation failure of gdma 2023-07-24 19:36:31 +08:00
Lou Tian Hao
57c6c0a1a3 Merge branch 'bringup/esp32h2_deep_sleep_for_rebase' into 'master'
esp32h2: support deep_sleep

Closes IDF-6268, IDF-6572, and IDF-7406

See merge request espressif/esp-idf!24438
2023-07-24 10:47:51 +08:00
Lou Tianhao
0d30bbe855 change(pm/deepsleep): rewrite the option all low as any low for esp32s2, esp32s3, esp32c6 and esp32h2 2023-07-21 20:44:15 +08:00
Lou Tianhao
44cd96b543 change(pm/deepsleep): remove disable rtcio before hold it when ext1 wakeup 2023-07-21 20:44:09 +08:00
Kevin (Lao Kaiyao)
7219e50579 Merge branch 'feature/gdma_support_err_eof_callback' into 'master'
feat(gdma): supported rx err_eof interrupt

See merge request espressif/esp-idf!24557
2023-07-21 14:41:46 +08:00
KonstantinKondrashov
28aec9594a fix(app_update): Fix CI test_switch_ota by increasing deepsleep
It increases the deepsleep time from 2000 to 20000.
2000 is too small for esp32-s3 chip.
2023-07-21 13:58:20 +08:00
Song Ruo Jing
4b9f601ac3 Merge branch 'feature/esp32p4_clock_prework_support' into 'master'
feat(clk): Add support to get xtaL freq for ESP32P4

See merge request espressif/esp-idf!24927
2023-07-21 00:12:18 +08:00
Ivan Grokhotkov
e6c3f62281 Merge branch 'feature/esp_intr_dump' into 'master'
system: add esp_intr_dump API to debug interrupt allocation

Closes IDF-4281 and IDF-6066

See merge request espressif/esp-idf!23877
2023-07-20 19:53:58 +08:00
Song Ruo Jing
b8a8713f96 feat(clk): Add support to get xtaL freq for ESP32P4 2023-07-20 18:13:13 +08:00
laokaiyao
3c2233d48b feat(gdma): supported rx err_eof interrupt 2023-07-20 14:19:39 +08:00
Lou Tianhao
e70763f9a4 feat(pm/deepsleep): Support EXT1 wakeup for esp32h2 deep_sleep 2023-07-20 11:43:57 +08:00
Lou Tianhao
7bd92287c4 change(pm/deepsleep): Update deep_sleep pmu analog parameter for esp32h2 2023-07-20 11:43:57 +08:00
Lou Tianhao
dcacd8cdf8 feat(pm/deepsleep): Support deep_sleep example and deep_sleep_wake_stub example for esp32h2 2023-07-20 11:43:57 +08:00
Ivan Grokhotkov
0ebe2cecfa
feat(system): add an error log and a hint on failed interrupt alloc
When interrupt allocation fails, esp_intr_alloc will now print a
message telling that no free interrupt was found. This message is
then checked in hints.yml, to give a link to the troubleshooting
guide.
2023-07-19 16:47:41 +02:00
Ivan Grokhotkov
621afc48b1
feat(system): add esp_intr_dump function to debug interrupt alloc
esp_intr_dump function can be used to print the list of allocated and
free interrupts. It can be used as a debugging aid when interrupt
allocation fails.
2023-07-19 16:47:40 +02:00
morris
57879e772d feat(gdma): support channel allocator on esp32p4
There's two GDMA groups on ESP32P4, one is connected to AHB bus,
and another one is connected AXI bus.
We now have two seperate APIs for allocating DMA channels,
depends on the bus type.
2023-07-19 18:18:07 +08:00
Mahavir Jain
6431091ce6
fix(esp32h2): correct typo in chip revision prompt 2023-07-18 20:46:45 +05:30
Mahavir Jain
3466204d18 Merge branch 'fix/esp_ptr_check_sign_compare' into 'master'
fix(esp_hw_support): Fix different signed comparison in `esp_ptr_in_drom`

Closes IDFGH-10398 and IDFGH-10632

See merge request espressif/esp-idf!24791
2023-07-17 12:33:56 +08:00
Darian
4fc2e5cb95 Merge branch 'feature/usb_host_restrict_ahb_errata_workaround_to_esp32s2_eco0' into 'master'
USB Host: Restrict ESP32-S2 AHB errata workaround to only ECO0 chips

Closes IDF-3328

See merge request espressif/esp-idf!23873
2023-07-15 19:01:03 +08:00
wuzhenghui
a5c992c8af fix(esp_pm): fix PM_SLP_IRAM_OPT/PM_RTOS_IDLE_OPT feature
- Fix flash accessed code to resolve issues with PM_SLP_IRAM_OPT/PM_RTOS_IDLE_OPT enabled
2023-07-14 21:21:19 +08:00
wuzhenghui
6c14e1de9f fix: put vddsdio configure api always in iram if pd_flash is enabled
- Put vddsdio configure api always in iram if pd_flash is enabled to ensure access flash at flash unavailable time
2023-07-14 20:12:59 +08:00
wuzhenghui
9f993705a6 fix: wait spi bus idle before hold CS pin
- Wait for spi bus idle before holding CS pin to prevent hold selected state during sleep
2023-07-14 20:12:59 +08:00
wuzhenghui
b9550a1609 feat: support cache safe assertion check
- Add support for cache safe assertion check to ensure that code expected to be in RAM is in IRAM
2023-07-14 20:12:59 +08:00
Jiang Jiang Jian
4b484574cd Merge branch 'bugfix/esp32c6_eco1_ble_lpclk_main_xtal' into 'master'
support 40 MHz XTAL as BLE low power clock source of esp32c6 eco1

Closes WIFI-5909 and WIFI-6114

See merge request espressif/esp-idf!24235
2023-07-14 16:26:56 +08:00
Jiang Jiang Jian
0c496896ba Merge branch 'bugfix/wifi_bcn_timeout_m_f_probe_req_l0' into 'master'
fix bcn_timeout and disconnect with error code 201, m f probe req l=0 issue

Closes WIFI-5722

See merge request espressif/esp-idf!24077
2023-07-14 11:31:47 +08:00
cjin
9578fdc250 ble : remove extra retention cnt upon deinit temporarily 2023-07-14 10:49:17 +08:00
cjin
cf744f9466 ble: support eco1 BLE light sleep 2023-07-14 10:49:14 +08:00
Wu Zheng Hui
e9b6472753 Merge branch 'bugfix/enable_i2c_master_clock_in_bbpll_configure' into 'master'
fix(rtc_clk): fix i2c master clock missing in bbpll configure

Closes WIFI-6147

See merge request espressif/esp-idf!24765
2023-07-14 00:40:21 +08:00
Laukik Hase
b61e3777b8
fix(esp_hw_support): Fix different signed comparison in esp_ptr_in_drom
- Closes https://github.com/espressif/esp-idf/issues/11653
- Closes https://github.com/espressif/esp-idf/issues/11865
2023-07-13 18:35:42 +05:30
Li Shuai
efa4eeafd0 light sleep: enable system clock in PMU HP sleep state when selecting a 40 MHz XTAL as low power clock source of ble 2023-07-13 20:44:56 +08:00
Li Shuai
21781b1ab1 modem clock: provide a protected wifipwr clock enable/disable interface to fix the bug of selecting xtal as the low power clock source for ble 2023-07-13 20:44:56 +08:00
Li Shuai
9950b6a527 modem clock: gatable clock interface which can gate or ungate modem clock domain 2023-07-13 20:44:56 +08:00
Chen Ji Chang
7ec38eb309 Merge branch 'bugfix/update_all_esp32xxx/rom/gpio.h_comments' into 'master'
gpio: Update the incorrect comments in rom/gpio.h

Closes IDFGH-10490

See merge request espressif/esp-idf!24487
2023-07-13 19:44:31 +08:00
Darian Leung
8450f3119e soc: Move revision MAX/MIN static assert to esp_hw_support
Previously, "soc/chip_revision.h" contained a static assert to check that the
CONFIG_ESP_REV_MIN_FULL <= CONFIG_ESP_REV_MAX_FULL. There are two issues with
this assert:

- Contained in a header file, so it is only compiled if the "chip_revision.h"
is included somewhere
- CONFIG_ESP_REV_MIN_FULL and CONFIG_ESP_REV_MAX_FULL are defined in
"esp_hw_support", which is a G0 component. This creates a reverse dependency
of G0 on G1.

This commit moves the static assert "revision.c" in "esp_hw_support".
2023-07-13 12:37:35 +02:00
Li Shuai
19809bdebf power save: fix bcn_timeout and disconnect with error code 201, m f probe req l=0 issue 2023-07-13 16:59:31 +08:00
wuzhenghui
14ea226351 fix(rtc_clk): fix i2c master clock missing in bbpll configure 2023-07-13 14:07:35 +08:00
Chen Jichang
b9c22b126a bugfix(driver/gpio):update the incorrect comment
There are some register description errors in parts of rom/gpio.h
This commit update the incorrect comments in rom/gpio.h And now
esp_rom_gpio.h is recommend instead of rom/gpio.h. So this commit adds
macro SIG_GPIO_OUT_IDX in esp_rom_gpio_connect_out_signal
function and removes the reference to gpio.h in some source files.

Closes https://github.com/espressif/esp-idf/issues/11737
2023-07-13 10:52:50 +08:00
morris
56a376c696 feat(esp_gdma): add hal interface for common operations
GDMA driver will be adapted to more DMA peripherals in the future.
This commit is to extract a minimal interface in the hal layer
2023-07-10 13:45:57 +08:00
Song Ruo Jing
ea48030514 Merge branch 'refactor/rtcio_caps_responsibility' into 'master'
refactor(driver/rtcio): Re-wrap RTCIO APIs with more accurate soc_caps

Closes IDF-7406

See merge request espressif/esp-idf!24522
2023-07-07 14:25:47 +08:00
Armando (Dou Yiwen)
adb93a3770 Merge branch 'feature/add_esp32p4_soc_support_part_3' into 'master'
soc: added soc headers for esp32p4 (part 3)

See merge request espressif/esp-idf!24481
2023-07-07 11:44:46 +08:00
Wu Zheng Hui
94613a5904 Merge branch 'bugfix/fix_deepsleep_wakestub_example_ci_failure_master' into 'master'
ci: fix deepsleep wakestub example ci failure

See merge request espressif/esp-idf!24466
2023-07-07 11:38:14 +08:00
Kevin (Lao Kaiyao)
a6e2ea141a Merge branch 'refactor/adc_2nd_step_calib_coeff_stuff' into 'master'
adc_calib: refactor 2nd step coeff

Closes IDF-7653

See merge request espressif/esp-idf!24397
2023-07-06 20:32:31 +08:00
Armando
2f6ce0cc17 fix(regi2c): wrong ADC_CALI_PD_WORKAROUND on c6, h2 2023-07-06 17:54:31 +08:00
laokaiyao
edc1abc8ea refactor(adc_calib): Simplify 2nd step coefficient calculation
- remove unnecessary variables and calculations
- improve readability of code
2023-07-06 14:22:03 +08:00
Jin Chen
d918b5226c Merge branch 'ble_dev/support_esp32h2_modem_clock_selection' into 'master'
ble: support esp32h2 modem clock selection

Closes EBLE50Y23-129

See merge request espressif/esp-idf!24387
2023-07-06 13:58:11 +08:00
wuzhenghui
05d15a2eed sleep: enrich top_domain_pd_allowed function description 2023-07-05 11:16:44 +00:00
Song Ruo Jing
4985caa38f refactor(driver/rtcio): Re-wrap RTCIO APIs with more accurate soc_caps 2023-07-05 11:47:51 +08:00
Li Shuai
f4c3b07436 fix(rtc_clk): fix the issue of missing configuration for calibration cycles of the internal 32 kHz RC 2023-07-04 11:23:07 +08:00
cjin
3d2342df6c ble: support esp32h2 modem clock selection 2023-07-03 16:05:42 +08:00
xiaqilin
59ffcd07d6 ieee802154: change BLE_BB/ieee802154_BB 2023-07-03 02:21:58 +00:00
xiaqilin
95afd4b9af openthread: add openthread autostart for sleep device 2023-07-03 02:21:58 +00:00
xiaqilin
485a9d44cf ieee802154: add sleep state 2023-07-03 02:21:58 +00:00
xiaqilin
dc4b3f24bc ieee802154: support light sleep 2023-07-03 02:21:58 +00:00
Lou Tian Hao
7c2ac1feb6 Merge branch 'bringup/esp32h2_light_sleep_for_rebase' into 'master'
esp32h2: support light_sleep

Closes IDF-6266 and IDF-7359

See merge request espressif/esp-idf!23567
2023-06-28 10:37:18 +08:00
morris
7fc9d3fe69 Merge branch 'test/check_soc_header_file_compile' into 'master'
soc: check the soc header files can compile

Closes IDF-5721

See merge request espressif/esp-idf!24393
2023-06-27 13:30:19 +08:00
Wu Zheng Hui
173d0951ee Merge branch 'feature/improve_pd_vddsido_help_doc' into 'master'
Power Management: improve ESP_SLEEP_PSRAM/FLASH_LEAKAGE_WORKAROUND help doc

Closes IDFGH-10297

See merge request espressif/esp-idf!24301
2023-06-26 23:01:31 +08:00
morris
1c0be26531 fix(soc): soc header files can pass CI check 2023-06-26 23:00:45 +08:00
Lou Tianhao
6ee0f89676 Power Management: fix hp xtal wait bug for esp32h2 and esp32c6 2023-06-26 21:05:17 +08:00
Lou Tianhao
a329b15e7e Power Management: support pu xtal in light sleep for esp32h2 2023-06-26 21:05:16 +08:00
Lou Tianhao
117008143b bugfix: remove the workaround implemented in MR 22773 about the lp_timer 2023-06-26 21:05:16 +08:00
Lou Tianhao
7fd74057a3 example: bringup light sleep example for esp32h2 2023-06-26 21:05:16 +08:00
Lou Tianhao
2657d8f307 Power Management: change the IO hold interface for esp32c6 2023-06-26 21:05:16 +08:00
Lou Tianhao
ca55b91242 Power Management: update pmu init and sleep parameter 2023-06-26 21:05:16 +08:00
Lou Tianhao
b06cadddb3 Power Management: fix REGDMA clock issue when wake up form light sleep 2023-06-26 21:05:10 +08:00
Lou Tianhao
8457998505 Power Management: fix REGDMA power issue when TOP domain powered down during light sleep for esp32h2 2023-06-26 20:58:59 +08:00
Lou Tianhao
b4210682c8 Power Management: support TOP domain powered down in light sleep for esp32h2 2023-06-26 20:58:59 +08:00
Lou Tianhao
46cf3ecdc2 Power Management: support PAU REGDMA feature for esp32h2 2023-06-26 20:58:59 +08:00
Lou Tianhao
6ea441c815 Power Management: support CPU powered down in light sleep for esp32h2 2023-06-26 20:57:55 +08:00
Lou Tianhao
63d32ab620 Power Management: support DFS and PMU feature for esp32h2 2023-06-26 20:57:55 +08:00
Kevin (Lao Kaiyao)
028c7bee0d Merge branch 'feature/support_new_adc_cali_scheme_on_c6' into 'master'
adc_calib: support calibration v2 on esp32c6

Closes IDF-7610

See merge request espressif/esp-idf!24343
2023-06-26 18:30:19 +08:00
wuzhenghui
95c79e7ec5 Kconfig: improve ESP_SLEEP_PSRAM/FLASH_LEAKAGE_WORKAROUND help doc
Closes https://github.com/espressif/esp-idf/issues/11558
2023-06-26 11:51:56 +08:00
Armando
c448597f24 kconfig: introduced CONFIG_IDF_ENV_BRINGUP for new chip bringup usage 2023-06-26 03:30:23 +00:00
laokaiyao
f949819976 adc_calib: support calibration v2 on esp32c6 2023-06-26 10:40:36 +08:00
wuzhenghui
6fe405bffc ci: fix failed ci test jobs 2023-06-21 15:24:50 +08:00
wuzhenghui
679ae47271 sleep: enable sleep reject when entering deep sleep and return err if sleep request is rejected 2023-06-21 11:27:40 +08:00
Wu Zheng Hui
1be9eee3ca Merge branch 'bugfix/fix_esp32s3_psram_access_failed_in_dfs_master' into 'master'
esp_pm: fix esp32s3 psram access failed when dfs is enabled

Closes IDF-7400 and IDF-4120

See merge request espressif/esp-idf!24144
2023-06-19 17:58:03 +08:00
wuzhenghui
4196eddff1 esp_hw_support: add modem module mac reset api 2023-06-19 12:53:09 +08:00
Island
81e418b1f2 Merge branch 'ble_dev/support_ble_light_sleep_using_extra_link' into 'master'
ESP32C6: Add BLE light sleep support using extra link

Closes IDF-6528

See merge request espressif/esp-idf!23720
2023-06-19 11:47:58 +08:00
wuzhenghui
9074bee47c ci: add access psram with DFS unity test 2023-06-19 10:15:08 +08:00
wuzhenghui
8334403f3c bugfix: fix esp32s3 psram access failed when dfs is enabled 2023-06-19 10:15:04 +08:00
cjin
d2d65a72a0 btbb: support register retention in esp32c6 2023-06-16 15:37:03 +08:00
cjin
f3457133f6 ble:added esp32c6 light sleep support 2023-06-16 15:37:03 +08:00
Song Ruo Jing
921713fff4 uart: Support LP_UART port with UART driver on esp32c6 2023-06-16 07:31:40 +00:00
Jakob Hasse
006e675656 Merge branch 'bugfix/extern_c_decl' into 'master'
esp_hw_support: Added extern "C" declaration

Closes IDF-2860

See merge request espressif/esp-idf!24217
2023-06-14 23:23:37 +08:00
Michael (XIAO Xufeng)
702e97e9be Merge branch 'feat/kconfig_c3_v1.0_dev' into 'master'
esp32c3: add development option for v1.0 chips

See merge request espressif/esp-idf!24205
2023-06-14 15:03:50 +08:00
Armando (Dou Yiwen)
17d6768e65 Merge branch 'feature/add_target_esp32p4' into 'master'
esp32p4: introduce the target

See merge request espressif/esp-idf!24155
2023-06-14 10:16:44 +08:00
Jakob Hasse
e87ac7255c esp_hw_support: Added extern "C" declaration 2023-06-13 13:44:21 +02:00
Michael (XIAO Xufeng)
1490424ab6 esp32c3: add development support option for v1.0 chips 2023-06-13 17:39:13 +08:00
Konstantin Kondrashov
ac188ad074 Merge branch 'bugfix/mac_ext_order_for_c6_h2' into 'master'
esp_hw_support: Change the byte order of MAC for IEEE802154 (C6 and H2 chips)

Closes IDF-6809

See merge request espressif/esp-idf!23988
2023-06-13 16:08:13 +08:00
Armando
101e6a18eb esp32p4: introduce the target
Add esp32p4 target to tools and Kconfig
Create directories and files that are essential for `idf.py --preview set-target esp32p4`
2023-06-13 15:16:11 +08:00
Armando (Dou Yiwen)
f9cd9e3e32 Merge branch 'feature/add_log_when_mspi_timing_tuning_is_enabled' into 'master'
mspi: added timing tuning start, and success log

See merge request espressif/esp-idf!24052
2023-06-12 18:22:13 +08:00
morris
575ad2bd6f Merge branch 'bugfix/adc_outof_bound_read' into 'master'
adc: fix out of bound read

See merge request espressif/esp-idf!24134
2023-06-12 14:13:57 +08:00
Armando
b5142b248d mspi: added timing tuning start, and success log 2023-06-12 11:44:24 +08:00
Wu Zheng Hui
2b6551f84d Merge branch 'bugfix/support_esp326_xtal_xpd' into 'master'
esp32c6: support xtal xpd

Closes IDF-7318

See merge request espressif/esp-idf!22932
2023-06-12 11:28:59 +08:00
morris
88600bd91b driver: minor code clean up to pass coverity scan test 2023-06-10 16:21:12 +08:00
Konstantin Kondrashov
f875978fb3 Merge branch 'bugfix/incorrect_time_after_ota' into 'master'
esp_hw_support: Fix invalid system time if s_esp_rtc_time_us & s_rtc_last_ticks were moved around

Closes IDFGH-7930

See merge request espressif/esp-idf!23030
2023-06-09 00:30:52 +08:00
KonstantinKondrashov
f7dfd1f48e mac_addr(C6 and H2): Fix byte order of MAC_EXT and change format of IEEE802154 MAC
The changes only related to C6 and H2 chips where CONFIG_SOC_IEEE802154_SUPPORTED=y.
For this case these APIs return 8 bytes
    esp_efuse_mac_get_default() -> 8 bytes
    esp_efuse_mac_get_custom() -> 8 bytes
    esp_read_mac(..., ESP_MAC_IEEE802154) -> 8 bytes
The rest cases len is 6 bytes
2023-06-08 23:11:32 +08:00
Mahavir Jain
c20f640d51 Merge branch 'feature/anti_dpa_configuration_c6_h2' into 'master'
esp32c6/esp32h2: crypto: add support for DPA protection configuration

Closes IDF-6973

See merge request espressif/esp-idf!23921
2023-06-08 22:49:21 +08:00
KonstantinKondrashov
cb6e2133f0 esp_hw_support: Fix invalid system time if s_esp_rtc_time_us & s_rtc_last_ticks were moved around
The commit fixes the case:
If variables in RTC RAM have been moved around by the linker,
they will be filled with garbage data. Any reset other than OTA would work fine
because the variables would still be initialized from the initial bootup.

So now system time will be valid even after OTA.

Closes https://github.com/espressif/esp-idf/issues/9448
2023-06-08 21:59:21 +08:00
Michael (XIAO Xufeng)
54712f9d9d Merge branch 'bugfix/esp32_package_name' into 'master'
esp32: stop using deprecated name PICOD2 to avoid confusion

See merge request espressif/esp-idf!24109
2023-06-08 21:06:37 +08:00
wuzhenghui
71563e0995 sleep: Fix domain power down status cannot get updated accordingly with the allowance of retention in runtime 2023-06-08 17:26:18 +08:00
wuzhenghui
8a1e63c8ad feature: support xtal_xpd pmu parameters 2023-06-08 17:23:52 +08:00
Mahavir Jain
1696be719c
crypto: add support for DPA protection configuration in C6/H2
- Technical details covered in section "15.3.2 Anti-DPA Attack Security
Control" chapter of the ESP32-C6 TRM
- Default configuration sets the security level low for the DPA
protection
- This change applies to all the crypto peripherals where the clock
frequency is dynamically adjusted to create randomness in the power
consumption trajectory
- This configuration helps to make the SCA attacks difficult on the
crypto peripherals
2023-06-08 11:09:23 +05:30
Xiao Xufeng
91fc40cfd9 esp32: stop using deprecated name PICOD2 to avoid confusion 2023-06-08 02:09:12 +08:00
laokaiyao
71ef56f988
gdma: support on_recv_done callback 2023-06-07 11:38:32 +08:00
morris
630b1b079e drivers: fix issue reported by coverity 2023-06-06 14:16:09 +08:00
xuxiao
722c60c14b esp_wifi: itwt add setup timeout timer to track response frame 2023-06-02 21:10:32 +08:00
wuzhenghui
713da85988 bugfix: fix sleep failed caused by uart clk lost 2023-06-02 20:52:25 +08:00
wuzhenghui
2981d38000 bugfix: fix some flash funcs called in sleep wakeup process 2023-05-31 17:56:46 +08:00