morris
db3825c799
Merge branch 'fix/spi_buslock_multi_dev_acq_release_issue_v6.0' into 'release/v6.0'
...
fix(esp_hw_support): fixed spi buslock multi dev acq/release logic issue (v6.0)
See merge request espressif/esp-idf!49168
2026-07-07 14:53:55 +08:00
morris
2c62bd65b0
Merge branch 'backport/spi_slave_independent_tx_rx_length_v6.0' into 'release/v6.0'
...
feat(driver_spi): slave driver support config different tx/rx length (v6.0)
See merge request espressif/esp-idf!49964
2026-07-07 14:50:44 +08:00
morris
b3b9ebb516
Merge branch 'bugfix/i2c_set_but_not_used_variable_v6.0' into 'release/v6.0'
...
fix(i2c): remove unused but set variables (v6.0)
See merge request espressif/esp-idf!50371
2026-07-07 13:13:07 +08:00
Jiang Jiang Jian
0cb8f5ef2d
Merge branch 'fix/add_owe_check_pmf_disable_v6.0' into 'release/v6.0'
...
Add Mode/threshold checks in esp_wifi_disable_pmf_config()(v6.0)
See merge request espressif/esp-idf!48951
2026-07-07 10:46:43 +08:00
morris
f4af8b9335
Merge branch 'feature/dma2d_ppa_sleep_retention_support_v6.0' into 'release/v6.0'
...
feat(ppa): add sleep retention support for DMA2D and PPA (v6.0)
See merge request espressif/esp-idf!50350
2026-07-07 10:35:38 +08:00
Marius Vikhammer
1195a15240
Merge branch 'fix/vfs_fatfs_test_stale_partition_v6.0' into 'release/v6.0'
...
test(vfs): reformat WL FATFS in setup to avoid stale-partition flakes (v6.0)
See merge request espressif/esp-idf!50401
2026-07-07 09:49:29 +08:00
morris
8e9d45c367
Merge branch 'fix/fix_async_color_convert_csc_v6.0' into 'release/v6.0'
...
fix(dma2d): fix async color convert csc check (v6.0)
See merge request espressif/esp-idf!50239
2026-07-06 19:02:39 +08:00
Martin Vychodil
7b5116d631
test(vfs): reformat WL FATFS in setup to avoid stale-partition flakes
...
Reformat the test partition before each mount so those tests always start from
a known-empty filesystem.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-06 11:39:30 +02:00
Chen Jichang
9a6e58913a
fix(dma2d): fix async color convert csc check
2026-07-06 17:01:43 +08:00
Marius Vikhammer
d199bb2fa9
Merge branch 'fix/esp_psram_init_fix_v6.0' into 'release/v6.0'
...
fix(esp_psram): repeated call to init should return invalid state error (v6.0)
See merge request espressif/esp-idf!50274
2026-07-06 16:28:07 +08:00
Marius Vikhammer
50f4bb6f25
Merge branch 'contrib/github_pr_18724_v6.0' into 'release/v6.0'
...
fix(heap_task_info): Fix incorrect current_usage subtraction on realloc() (GitHub PR) (v6.0)
See merge request espressif/esp-idf!50277
2026-07-06 16:06:30 +08:00
Jiang Jiang Jian
ece337bf04
Merge branch 'fix/ble_mesh_disable_adv_pkt_discard_log_v6.0' into 'release/v6.0'
...
fix(ble_mesh): Disable warning logging when advertising packets are discarded (6.0)
See merge request espressif/esp-idf!50167
2026-07-06 15:13:19 +08:00
Mahavir Jain
aac5a0bb5b
Merge branch 'fix/revert_redundant_rom_pmp_18769_v6.0' into 'release/v6.0'
...
revert(esp_hw_support): Re-add separate D-ROM PMP entry on C6/H2 (v6.0)
See merge request espressif/esp-idf!50360
2026-07-06 10:01:59 +05:30
Island
797d399dee
Merge branch 'fix/ble-log-64-bit-io-setup-support_v6.0' into 'release/v6.0'
...
fix(ble_log): use BIT64 over BIT to support 64-bit IO setup (6.0)
See merge request espressif/esp-idf!50331
2026-07-06 12:22:07 +08:00
Mahavir Jain
dfba68bc53
Merge branch 'fix/aes_dma_psram_encrypted_mem_s31_v6.0' into 'release/v6.0'
...
fix(mbedtls/aes): Fix AES-DMA over encrypted PSRAM on ESP32-S31 (v6.0)
See merge request espressif/esp-idf!50253
2026-07-06 09:48:36 +05:30
Xu Si Yu
15388539b6
fix(openthread): use spi slave tx_length/rx_length and remove rx DMA bounce buffer
2026-07-06 11:58:08 +08:00
Xu Si Yu
5aea50f035
fix(openthread): replace all malloc calls with calloc to avoid hidden uninitialized memory issues
2026-07-06 11:58:08 +08:00
wanckl
3b9f4ed1a0
feat(driver_spi): slave driver support config different tx/rx length
2026-07-06 11:58:08 +08:00
Wang Meng Yang
967825b6e2
Merge branch 'bugfix/bbp_issues_v6.0' into 'release/v6.0'
...
Bugfix/bbp issues v6.0
See merge request espressif/esp-idf!50189
2026-07-06 11:16:54 +08:00
morris
b312cdf341
fix(i2c): remove unused but set variables
2026-07-06 11:11:39 +08:00
Mahavir Jain
8ac24e9b8b
Merge branch 'fix/fix_psk_hint_key_null_dereference_v6.0' into 'release/v6.0'
...
Fix/fix psk hint key null dereference (v6.0)
See merge request espressif/esp-idf!50322
2026-07-05 20:42:56 +05:30
nilesh.kale
2f8960a8ed
fix(esp_hw_support): Keep D-ROM PMP entry so newer apps boot on old bootloaders
...
ESP32-C6/H2 bootloaders <= v5.2.1 configure and lock PMP entries 3-4 as their
D-ROM region; a locked PMP entry cannot be reconfigured until CPU reset.
Commit 366e4ee944 ("Remove redundant PMP entry for ROM region") dropped the
D-ROM entry, and commit d4167fea60 (which also restructured C6/H2 PMP setup)
then renumbered the regions down, placing the application IRAM/DRAM split on
entries 3-4. On an already-deployed older bootloader those entries are locked,
so IRAM never gains execute permission and the chip resets before app_main()
(GitHub issue #18769 ).
Restore the separate (redundant) D-ROM PMP entry on indices 3-4 so the
application IRAM/DRAM split stays on entries 5-7, clear of the locked range.
This keeps newer applications bootable on older bootloaders.
Closes https://github.com/espressif/esp-idf/issues/18769
2026-07-03 20:57:18 +05:30
Song Ruo Jing
abe1d3ae48
feat(ppa): add sleep retention support for DMA2D and PPA
2026-07-03 21:57:39 +08:00
Rahul Tank
37e23c5499
Merge branch 'bugfix/queue_att_cmd_v6.0' into 'release/v6.0'
...
feat(nimble): Defer all ATT commands until connection event is sent to GAP layer (v6.0)
See merge request espressif/esp-idf!48177
2026-07-03 16:07:09 +05:30
Mahavir Jain
c65d0bb434
Merge branch 'feat/psa_its_custom_backend_v6.0' into 'release/v6.0'
...
Support custom storage backend for persistent PSA keys (v6.0)
See merge request espressif/esp-idf!48569
2026-07-03 13:45:11 +05:30
tarun.kumar
32f54e059f
fix(wifi) : Add Mode/threshold checks in esp_wifi_disable_pmf_config()
2026-07-03 13:31:54 +05:30
Jiang Jiang Jian
039b46f4cc
Merge branch 'backport/backport_some_wifi_changes_260701_v6.0' into 'release/v6.0'
...
backport/backport some wifi changes 260701 v6.0(backport v6.0)
See merge request espressif/esp-idf!50269
2026-07-03 14:12:37 +08:00
Rahul Tank
c79592004e
fix(nimble): Defer Events / ATT related information from stack
...
Defer Events/ ATT related GAP events from stack until connection
event is sent to GAP layer
2026-07-03 11:17:23 +05:30
harshal.patil
275587ea02
feat(mbedtls/psa_esp_rsa_ds): Expose persistent key buffer format/parse helpers
2026-07-03 10:25:49 +05:30
harshal.patil
3c4586abff
feat(mbedtls): Support custom storage backend for persistent PSA keys
2026-07-03 10:25:48 +05:30
Zhou Xiao
c83fdad6dd
fix(ble_log): use BIT64 over BIT to support 64-bit IO setup
...
(cherry picked from commit a2876d304e )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-03 12:04:59 +08:00
Ashish Sharma
e268dbef61
fix(esp-tls): guard against NULL PSK hint to prevent crash
2026-07-03 11:36:22 +08:00
Mahavir Jain
175d0d844b
Merge branch 'fix/align_sw_psa_drivers_and_hw_esp_psa_drivers_v6.0' into 'release/v6.0'
...
Align s/w and h/w PSA drivers (v6.0)
See merge request espressif/esp-idf!49834
2026-07-03 09:01:38 +05:30
morris
1c04de442d
Merge branch 'feature/psram_halfsleep_mode_support_v6.0' into 'release/v6.0'
...
feat(psram): allow PSRAM to enter halfsleep mode during light sleep (v6.0)
See merge request espressif/esp-idf!49759
2026-07-03 11:14:20 +08:00
Island
cd71c5c45d
Merge branch 'change/ble_update_lib_20260610_v6.0' into 'release/v6.0'
...
change(ble): [AUTO_MR] 20260610 - Update ESP BLE Controller Lib (6.0)
See merge request espressif/esp-idf!50226
2026-07-03 00:54:36 +08:00
Hrushikesh Bhosale
725e0b612d
fix(esp_http_server): merge release/v6.0 to resolve backport conflict
...
Merge branch 'release/v6.0' into backport-48352-resolve to resolve a
conflict in esp_httpd_priv.h between this backport's sdkconfig.h
include and the ctrl-socket semaphore's freertos/semphr.h include.
2026-07-02 11:41:38 +05:30
Renz Bagaporo
858675b470
fix(heap): reset alloc_stat before realloc lookup
...
Closes https://github.com/espressif/esp-idf/issues/18723
Closes https://github.com/espressif/esp-idf/pull/18724
2026-07-02 10:00:23 +09:00
Ferdinand Bachmann
a033f2ad49
fix(heap_task_info): Fix incorrect current_usage subtraction on realloc()
2026-07-02 10:00:23 +09:00
Renz Bagaporo
36147a738d
ci(heap): add task tracking realloc handle reuse test
2026-07-02 10:00:23 +09:00
Renz Bagaporo
9debd77118
fix(esp_psram): repeated call to init should return invalid state error
...
Closes https://github.com/espressif/esp-idf/issues/18722
2026-07-02 09:55:47 +09:00
yinqingzhao
3f1217869d
fix(wifi): optimizations keep alive mechanism
2026-07-01 20:48:18 +08:00
yinqingzhao
78a04be15e
fix(wifi): comment out functions from ld files
2026-07-01 20:44:32 +08:00
yinqingzhao
ac9384547d
fix(wifi): comment out pm_process_tim from ld files for esp32c61
2026-07-01 20:41:49 +08:00
yinqingzhao
1bb7f45d4d
fix(wifi): fix cache access error in wifi interrupt with psram enabled
2026-07-01 20:41:34 +08:00
Martin Vychodil
5d62a7febe
Merge branch 'fix/sd_freq_clamping_v6.0' into 'release/v6.0'
...
fix(sdmmc): Handle nonsensical max freq correctly (v6.0)
See merge request espressif/esp-idf!49531
2026-07-01 19:50:46 +08:00
harshal.patil
bb5025d983
test(mbedtls): move AES test vectors to a dedicated header
2026-07-01 16:32:18 +05:30
harshal.patil
64570337aa
fix(mbedtls/aes): Fix AES-DMA over encrypted PSRAM on ESP32-S31
...
esp_crypto_shared_gdma_done() polled the AXI RX raw interrupt status
(in_done) but never cleared it, so after the first transfer the set bit
made every subsequent call return immediately without waiting.
2026-07-01 16:32:09 +05:30
Adam Múdry
3d85e64b21
test(vfs): Test changes regarding VFS register incorrect check fix
2026-07-01 12:38:58 +02:00
Adam Múdry
28e22036f6
fix(sdmmc): Handle nonsensical max freq correctly
...
Closes https://github.com/espressif/esp-idf/issues/15250
2026-07-01 12:38:45 +02:00
Martin Vychodil
6e17e8cc9b
Merge branch 'bugfix/idfci-8839-remove-orphan-test-configs_v6.0' into 'release/v6.0'
...
fix(fatfs): re-enable fatfs and vfs psram/ccomp CI tests (v6.0)
See merge request espressif/esp-idf!50185
2026-07-01 16:38:14 +08:00