Jiang Jiang Jian
f8e6e94dca
Merge branch 'feat/usb_dfu_console_soc_caps_backport_v6.1' into 'release/v6.1'
...
feat(soc): add USB DFU and OTG console caps (backport v6.1)
See merge request espressif/esp-idf!49580
2026-07-17 10:30:26 +08:00
Jiang Jiang Jian
947e534927
Merge branch 'fix/mmap_cache_flash_wr_v6.1' into 'release/v6.1'
...
fix(mmap): fixed mmap read data wrong when flash being erased/written and cache not disabled (v6.1)
See merge request espressif/esp-idf!50117
2026-07-17 10:30:14 +08:00
Jiang Jiang Jian
14f663f003
Merge branch 'fix/pbkdf2_sha256_mbedtls4_guard_v6.1' into 'release/v6.1'
...
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256 (v6.1)
See merge request espressif/esp-idf!50460
2026-07-16 18:57:43 +08:00
Jiang Jiang Jian
4fe6db39ca
Merge branch 'bugfix/bug_bounty_av_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): Fix bug bounty issues about A/V from NVIDIA (v6.1)
See merge request espressif/esp-idf!50476
2026-07-16 18:57:38 +08:00
Jiang Jiang Jian
adc1f663b4
Merge branch 'feat/add_lmp_dbg_vendor_v6.1' into 'release/v6.1'
...
feat(bt/controller): Added LMP debug vendor HCI and fixed some bugs ts on ESP32-S31 [backport v6.1]
See merge request espressif/esp-idf!50704
2026-07-16 18:56:58 +08:00
Aditya Patwardhan
9dc17f98b0
Merge branch 'backport/44987_v6.1' into 'release/v6.1'
...
feat(esp-tls): Added a PSA driver for Secure Element (backport v6.1)
See merge request espressif/esp-idf!50334
2026-07-16 15:37:49 +05:30
Jiang Jiang Jian
8158e1d350
Merge branch 'backport/esp32s31_static_cpu_retention_v6.1' into 'release/v6.1'
...
backport v6.1: fix build failure when CONFIG_PM_CPU_RETENTION_STATIC is enabled
See merge request espressif/esp-idf!50635
2026-07-16 17:38:32 +08:00
Jiang Jiang Jian
aa44022e75
Merge branch 'fix/idfgh-17712-bootloader-extra-components_v6.1' into 'release/v6.1'
...
fix(bootloader): discover BOOTLOADER_EXTRA_COMPONENT_DIRS in cmake v1 (v6.1)
See merge request espressif/esp-idf!49719
2026-07-16 17:25:19 +08:00
liqigan
1004beff62
feat(bt/controller): Added LMP debug vendor HCI and fixed some bugs ts on ESP32-S31
2026-07-16 14:30:38 +08:00
liqigan
b93794265f
fix(bt/controller): Fixed BR/EDR controller bugs found by regression tests on ESP32-S31
...
- Fixed the state machine issue caused by security related LMP procedures on ESP32-S31
- Fixed the issue of insufficient air time for ACK reception from the Central on ESP32-S31
- Fixed the page scan collision issue on ESP32-S31
- Fixed read failures for local supported features and extended features on ESP32-S31
- Fixed NULL access issue during SYNC disconnection on ESP32-S31
- Fixed ACL schedule issue during SYNC connection establishment on ESP32-S31
2026-07-16 14:30:38 +08:00
liqigan
48dd8b588f
feat(bt): Added support for slot availablity mask functionality
2026-07-16 14:30:38 +08:00
Tomas Rezucha
32e1303c3e
feat(tools): Add 'check' field to idf.py actions
2026-07-16 12:16:11 +08:00
igor.masar
f7e24571ea
feat(soc): add USB DFU and OTG console caps
...
Add USB DFU and OTG console SOC capability flags for esp32s2, esp32s3, and esp32p4.
Use these caps in Kconfig, documentation conditionals, and idf.py DFU actions so USB support
is derived from SOC capabilities instead of hardcoded target names.
2026-07-16 12:16:11 +08:00
Jiang Jiang Jian
cc979db24b
Merge branch 'backport/support_two_MAC_esp32s31_v6.1' into 'release/v6.1'
...
fix(esp32s31): restrict UNIVERSAL_MAC_ADDRESSES to Two (backport v6.1)
See merge request espressif/esp-idf!50571
2026-07-16 12:07:20 +08:00
Jiang Jiang Jian
6cb467a433
Merge branch 'bugfix/fix_bluedroid_read_multi_v6.1' into 'release/v6.1'
...
fix(ble/bluedroid): fix GATT Read Multiple response handling (6.1)
See merge request espressif/esp-idf!50710
2026-07-16 11:59:11 +08:00
Jiang Jiang Jian
b136957d7b
Merge branch 'fix/cleanup_after_failed_nvs_set_blob_v6.1' into 'release/v6.1'
...
Fixed cleanup after nvs_set_blob failed on ESP_ERR_NVS_NOT_ENOUGH_SPACE (v6.1)
See merge request espressif/esp-idf!50742
2026-07-16 11:42:53 +08:00
Jiang Jiang Jian
a21d475532
Merge branch 'fix/backport_wifi_fixes_v6.1' into 'release/v6.1'
...
Backport a few wifi fixes to v6.1 (Backport v6.1)
See merge request espressif/esp-idf!50717
2026-07-16 11:42:29 +08:00
Jiang Jiang Jian
94bda02008
Merge branch 'fix/console-security-findings_v6.1' into 'release/v6.1'
...
fix(console): Fix security code review findings (v6.1)
See merge request espressif/esp-idf!50686
2026-07-16 11:41:03 +08:00
Jiang Jiang Jian
1dfc7914b5
Merge branch 'fix/esp_idf_h4h21_ana_wait_short_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): fix xtal unstable when carry 154 and ble cases(v6.1)
See merge request espressif/esp-idf!50656
2026-07-16 11:40:13 +08:00
Jiang Jiang Jian
8f45ea4dcb
Merge branch 'cleanup/remove-idf_test-component_v6.1' into 'release/v6.1'
...
chore: remove unused idf_test component (v6.1)
See merge request espressif/esp-idf!50650
2026-07-16 11:39:15 +08:00
Jiang Jiang Jian
b78543ddb8
Merge branch 'fix/touch_read_check_v6.1' into 'release/v6.1'
...
fix(touch): fix hw_ver1 read data check (v6.1)
See merge request espressif/esp-idf!50638
2026-07-16 11:39:06 +08:00
Jiang Jiang Jian
21390d2e00
Merge branch 'refactor/move_regdma_entry_config_to_driver_layer_emac_v6.1' into 'release/v6.1'
...
refactor(emac): move sleep retention config into driver layer (v6.1)
See merge request espressif/esp-idf!50619
2026-07-16 11:36:38 +08:00
Jiang Jiang Jian
6005d5bb6a
Merge branch 'fix/lwip_sec_high_v6.1' into 'release/v6.1'
...
fix(lwip): high severity lwip fixes (v6.1)
See merge request espressif/esp-idf!50590
2026-07-16 11:35:55 +08:00
Jiang Jiang Jian
b3f2e9e67b
Merge branch 'fix/uhci_rx_fsm_v6.1' into 'release/v6.1'
...
fix(uhci): rx fsm race condition (v6.1)
See merge request espressif/esp-idf!50577
2026-07-16 11:35:38 +08:00
Jiang Jiang Jian
64218b5dd3
Merge branch 'bugfix/smp_sec_flags_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): fixed several security issues from NVIDIA (v6.1)
See merge request espressif/esp-idf!50565
2026-07-16 11:35:17 +08:00
Jiang Jiang Jian
8346b7596e
Merge branch 'feat/sec_esp_drivers_v6.1' into 'release/v6.1'
...
fix(drivers): harden multiple peripheral drivers against local DoS and memory corruption (v6.1)
See merge request espressif/esp-idf!50555
2026-07-16 11:33:01 +08:00
Jiang Jiang Jian
3299c3527d
Merge branch 'bugfix/idf_ci_hid_example_v6.1' into 'release/v6.1'
...
fix(bt/example): Add print the device name to verify if it matches in HID example (v6.1)
See merge request espressif/esp-idf!50482
2026-07-16 11:32:43 +08:00
Jiang Jiang Jian
78519ced02
Merge branch 'feat/update_openthread_submodule_and_br_lib_20260624_v6.1' into 'release/v6.1'
...
feat(openthread): update openthread submodule (v6.1)
See merge request espressif/esp-idf!50518
2026-07-16 11:30:55 +08:00
yangfeng
24369a6f81
fix(bt/bluedroid): Fix unchecked p_ctrl_cback and p_msg_cback in AVRC
...
Closes SEC-1186
2026-07-16 11:30:38 +08:00
yangfeng
e8108fefe1
fix(bt/bluedroid): Fix missing NULL check on p_cfg in AVDT_ReconfigReq
...
Closes SEC-1187
2026-07-16 11:30:38 +08:00
Sarvesh Bodakhe
faaaea8e67
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256
...
mbedtls 4.x is PSA-first: CONFIG_MBEDTLS_SHA256_C now maps to
PSA_WANT_ALG_SHA_256, and on ESP targets the hardware SHA accelerator
serves SHA-256 through PSA, leaving the legacy MBEDTLS_SHA256_C builtin
macro undefined. The inner guard on pbkdf2_sha256 was gating on bare
MBEDTLS_SHA256_C, so the function was compiled out and NAN ND-PMK
derivation (nan_derive_nd_pmk_from_passphrase) failed to link.
Guard on (MBEDTLS_SHA256_C || PSA_WANT_ALG_SHA_256) to match the idiom
already used elsewhere in the supplicant mbedtls port (tls_mbedtls.c),
covering both the legacy builtin and PSA-provided SHA-256.
2026-07-16 11:29:29 +08:00
Jiang Jiang Jian
5595996fe8
Merge branch 'feat/update_pmu_pau_reg_description_v6.1' into 'release/v6.1'
...
feat(soc): update esp32c61 PMU & PAU reg header descriptions (v6.1)
See merge request espressif/esp-idf!50431
2026-07-16 11:28:44 +08:00
Jiang Jiang Jian
66ed442256
Merge branch 'fix/fatfs_vulnerabilities_v6.1' into 'release/v6.1'
...
fix(fatfs): harden against runZero 2026 FatFs bugs (v6.1)
See merge request espressif/esp-idf!50424
2026-07-16 11:28:22 +08:00
Jiang Jiang Jian
f6eadf3e95
Merge branch 'fix/fix_mpll_enable_order_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): fix esp32s31 mpll initialization (v6.1)
See merge request espressif/esp-idf!50430
2026-07-16 11:28:17 +08:00
Jiang Jiang Jian
0196213a13
Merge branch 'fix/ble_mesh_fixed_issues_v6.1' into 'release/v6.1'
...
Resolve reported BLE mesh stack issues (6.1)
See merge request espressif/esp-idf!50408
2026-07-16 11:27:36 +08:00
Jiang Jiang Jian
f174b3baa6
Merge branch 'fix/vfs_fatfs_test_stale_partition_v6.1' into 'release/v6.1'
...
test(vfs): reformat WL FATFS in setup to avoid stale-partition flakes (v6.1)
See merge request espressif/esp-idf!50400
2026-07-16 11:27:21 +08:00
Jiang Jiang Jian
0e479cbf81
Merge branch 'bugfix/i2c_set_but_not_used_variable_v6.1' into 'release/v6.1'
...
fix(i2c): remove unused but set variables (v6.1)
See merge request espressif/esp-idf!50370
2026-07-16 10:48:53 +08:00
Jiang Jiang Jian
301caa6d45
Merge branch 'docs/ulp_fsm_instruction_v6.1' into 'release/v6.1'
...
docs(ulp): clarify ULP FSM instruction cycle timing (v6.1)
See merge request espressif/esp-idf!50365
2026-07-16 10:48:39 +08:00
Jiang Jiang Jian
e813155ec4
Merge branch 'feature/dma2d_ppa_sleep_retention_support_v6.1' into 'release/v6.1'
...
feat(ppa): add sleep retention support for DMA2D and PPA (v6.1)
See merge request espressif/esp-idf!50342
2026-07-16 10:48:27 +08:00
Jiang Jiang Jian
479ff2c98b
Merge branch 'change/change_regdma_malloc_caps_v6.1' into 'release/v6.1'
...
change(esp_hw_support): change regdma malloc caps to allow getting memory in the DMA pool (v6.1)
See merge request espressif/esp-idf!50257
2026-07-16 10:44:21 +08:00
Jiang Jiang Jian
3e573b992b
Merge branch 'fix/fix_async_color_convert_csc_v6.1' into 'release/v6.1'
...
fix(dma2d): fix async color convert csc check (v6.1)
See merge request espressif/esp-idf!50238
2026-07-16 10:43:55 +08:00
Jiang Jiang Jian
68137eca5d
Merge branch 'fix/fix_ble_rtc_register_issue_after_reset_v6.1' into 'release/v6.1'
...
fix(ble): fix ble rtc reset issues on esp32-h4 and esp32-s31 (6.1)
See merge request espressif/esp-idf!50204
2026-07-16 10:43:26 +08:00
Jiang Jiang Jian
7a0db8d0aa
Merge branch 'fix/ble_mesh_disable_adv_pkt_discard_log_v6.1' into 'release/v6.1'
...
fix(ble_mesh): Disable warning logging when advertising packets are discarded (6.1)
See merge request espressif/esp-idf!50168
2026-07-16 10:42:18 +08:00
Jiang Jiang Jian
590dab22f9
Merge branch 'fix/fix_rgb_frame_buffer_alignment_v6.1' into 'release/v6.1'
...
fix(gdma): fix buffer alignment when psram ecc enabled (v6.1)
See merge request espressif/esp-idf!49996
2026-07-16 10:40:18 +08:00
Jiang Jiang Jian
b259c51ee3
Merge branch 'change/update_c61_gdma_header_v6.1' into 'release/v6.1'
...
change(ahb_dma): update c61 eco3 header files (v6.1)
See merge request espressif/esp-idf!49835
2026-07-16 10:38:55 +08:00
Konstantin Kondrashov
5bc1dfc166
fix(bootloader): handle extra component dirs in v1 subproject
...
Closes https://github.com/espressif/esp-idf/issues/18651
2026-07-16 10:37:12 +08:00
Mahavir Jain
1918bb2b10
Merge branch 'bugfix/memory-safety-and-validation_v6.1' into 'release/v6.1'
...
fix(security): findings from project Vanessa (v6.1)
See merge request espressif/esp-idf!50390
2026-07-15 21:52:48 +05:30
Michael.B
48f5135a8d
spi_flash: fix PSRAM rodata phys2cache mapping
...
Use the full rodata page range when converting flash physical addresses back to cache addresses for XIP PSRAM. RISC-V extram stack coredump tests are temporarily skipped in CI until coredump supports PSRAM task stacks (IDF-15623).
2026-07-15 18:57:08 +08:00
Xiao Xufeng
8b7b2008da
bootloader_utils: fixed missing unmap in load_partition_table when table verify failed
2026-07-15 18:57:08 +08:00
Xiao Xufeng
3e8389cc31
fix(mmap): fixed some API read wrong data via mmap when flash being erased/written while XIP on PSRAM
...
Before:
The cache won't be disabled when XIP on psram. But during flash
erasing/programming, read data will be courrupt.
When XIP in psram is enabled, the image is not mapped to the cache so
usually there will be no flash access. The only way to read from flash
is via the driver or use mmap. The driver has protection during erasing,
while th mmap region not.
Now:
Mmap APIs provide a flag to make mmap->unmap region mutually exclusive
to flash erase/programming when XIP from psram. SPI Flash write APIs
will benefit from this. When the flag is used, no concurrent access to
mapped region will happen while writing; otherwise the cache will be
disable to avoid data corruption.
Most ESP-IDF APIs calls mmap with this flag. As for users calling
mmap-like APIs directly, they can choose whether to enable this by a
flag.
Closes https://github.com/espressif/esp-idf/issues/14897
2026-07-15 18:57:08 +08:00