Jiang Jiang Jian
d6da4da7d3
Merge branch 'bugfix/sdmmc-ddr-response-buffer-leak_v6.1' into 'release/v6.1'
...
fix(sdmmc): free DMA response buffer on DDR mode switch failure (v6.1)
See merge request espressif/esp-idf!50885
2026-08-31 11:12:34 +08:00
Jiang Jiang Jian
aa98c93718
Merge branch 'feat/optimize_for_esp32h4_light_sleep_ble_current_v6.1' into 'release/v6.1'
...
Feat/optimize for esp32h4 light sleep ble current (6.1)
See merge request espressif/esp-idf!50789
2026-08-31 11:11:41 +08:00
Jiang Jiang Jian
37ae031039
Merge branch 'feature/enable_zb_for_esp32p4_v6.1' into 'release/v6.1'
...
feat(soc): enable zb* extensions for esp32p4 greater v3 (v6.1)
See merge request espressif/esp-idf!50778
2026-08-31 11:09:40 +08:00
Jiang Jiang Jian
e8bc6e4385
Merge branch 'feat/support_bluedroid_le_coc_and_eatt_v6.1' into 'release/v6.1'
...
feat(ble/bluedroid): Support bluedroid LE COC and EATT features (6.1)
See merge request espressif/esp-idf!50716
2026-08-31 11:07:59 +08:00
Jiang Jiang Jian
89dea7df57
Merge branch 'ble-log-console-migration-notice_v6.1' into 'release/v6.1'
...
Ble log console repository migration (6.1)
See merge request espressif/esp-idf!50608
2026-08-31 11:06:42 +08:00
Jiang Jiang Jian
42dfe996d8
Merge branch 'fix/reverse-extended-address-byte-order-in-esp-radio-spiel_v6.1' into 'release/v6.1'
...
fix(openthread): add APIs to clear a single src match short and extended entry in esp radio spinel (v6.1)
See merge request espressif/esp-idf!50452
2026-08-31 11:03:50 +08:00
Jiang Jiang Jian
e4c40573cf
Merge branch 'feat/ble_log_compression_module_cfg_update_v6.1' into 'release/v6.1'
...
Feat/ble log compression module cfg update (6.1)
See merge request espressif/esp-idf!49876
2026-08-31 11:00:26 +08:00
Jiang Jiang Jian
c5355945ae
Merge branch 'fix/esp_idf_h4_pmu_icg_mapping_6.1' into 'release/v6.1'
...
fix(esp_hw_support): pmu_icg_mapping define mistake(v6.1)
See merge request espressif/esp-idf!51912
2026-08-31 10:56:22 +08:00
Jiang Jiang Jian
40feb79578
Merge branch 'feat/support_esp32s31_xtal_fosc_force_pu_v6.1' into 'release/v6.1'
...
feat: update XTAL sleep FPU parameters to save power (v6.1)
See merge request espressif/esp-idf!51896
2026-08-31 10:54:55 +08:00
Jiang Jiang Jian
d293398710
Merge branch 'fix/fix_esp32p4_missing_pvt_clock_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): fix esp32p4 PVT clock lost (v6.1)
See merge request espressif/esp-idf!51866
2026-08-31 10:54:25 +08:00
Jiang Jiang Jian
f6f21f26c6
Merge branch 'fix/owe_prevent_double_free_v6.1' into 'release/v6.1'
...
fix(wifi): Prevent double free in owe failure path (v6.1)
See merge request espressif/esp-idf!51640
2026-08-31 10:53:10 +08:00
Jiang Jiang Jian
74d300692d
Merge branch 'bugfix/backport_wifi_issues_v6.1_0804' into 'release/v6.1'
...
Bugfix/backport wifi issues v6.1
See merge request espressif/esp-idf!51488
2026-08-31 10:52:42 +08:00
Marius Vikhammer
cf176efff5
Merge branch 'fix/esp-timer-restart-expiry-race_v6.1' into 'release/v6.1'
...
fix(esp_timer): prevent restart expiry race (v6.1)
See merge request espressif/esp-idf!51804
2026-08-31 10:20:38 +08:00
Mahavir Jain
876e6044bf
Merge branch 'fix/esp_http_server-ws-frame-header-strictness_v6.1' into 'release/v6.1'
...
Fix(esp http server): ws frame header strictness (v6.1)
See merge request espressif/esp-idf!51856
2026-08-30 21:55:43 +05:30
Mahavir Jain
1dbe2cb8b2
Merge branch 'feat/enable_dpu_region_protection_for_esp32s31_v6.1' into 'release/v6.1'
...
feat: enable cpu region protection for esp32s31 (v6.1)
See merge request espressif/esp-idf!52003
2026-08-30 21:55:12 +05:30
Rahul Tank
bf93402138
Merge branch 'bugfix/nimble_issues_26082026_v6.1' into 'release/v6.1'
...
fix(nimble): Fix few nimble issues 26082026 (v6.1)
See merge request espressif/esp-idf!52075
2026-08-29 21:17:04 +05:30
harshal.patil
0580cff0e4
change(esp_hw_support): harden the ESP32-S31 PSRAM region permissions
...
Both PSRAM layouts were mapped as a single RWX window, so everything in external
RAM - the heap included - was executable.
PSRAM used as data only is now RW, and under XIP-from-PSRAM it is split per
section as ESP32-P4 does: .text RX, .rodata read-only, and the MMU-page
alignment gaps and the reclaimed heap RW, so neither is executable.
Both describe the layout that esp_psram_init() produces, and the entries are
locked, so - again as on ESP32-P4 - they are only narrowed when
CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION says that layout applies. Without
it the application owns the region and PSRAM stays RWX.
The per-section entries cost one PMP entry more than the 16 available, so the CPU
subsystem and peripheral windows are chained as TOR entries, taking one entry
instead of three.
soc.h is corrected against the S31 bus address map: the peripheral window base
was 1 MB too low, and the LP peripheral top, derived from a register base plus a
size rather than from the map, was 16 KB short. SOC_NON_CACHEABLE_OFFSET_FLASH
is added.
2026-08-28 18:06:56 +05:30
Mahavir Jain
e7499410fa
fix(esp_hw_support): run ESP32-P4 PMA programming from IRAM
...
The bootloader locks PMA entries on core 0 only (PMA is per-hart), so
core 1 applies its PMA configuration with effective writes. Executing
that from flash momentarily makes the flash aperture non-cacheable
while reprogramming its entry, which executes ciphertext with flash
encryption enabled (illegal instruction -> CPU lockup).
2026-08-28 18:06:56 +05:30
Mahavir Jain
939043ea83
fix(bootloader_support): do not gate application region protection on bootloader config
...
CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE is bootloader-scoped;
disabling it must not strip the application's PMP/PMA configuration.
The application now always applies region protection.
2026-08-28 18:06:56 +05:30
Mahavir Jain
5ff870a33e
fix(esp_hw_support): fix ESP32-S31 CPU lockup with flash encryption during PMA setup
...
Run esp_cpu_configure_invalid_regions() from IRAM: it reprograms the PMA
entry that keeps the flash aperture cacheable, so an instruction fetched
from flash inside the reprogramming window bypasses the cache and, with
flash encryption enabled, executes ciphertext (illegal instruction ->
CPU lockup).
Also move the PSRAM PMA entry to index 7 so that the application layout
matches the entry earlier bootloaders programmed and locked, keeping the
full layout effective under such bootloaders.
2026-08-28 18:06:56 +05:30
Mahavir Jain
dedb644938
change(esp_hw_support): drop the frozen PMP entry layout for ESP32-S31
...
Freezing PMP entry indices as a bootloader<->application ABI (pmp_layout.h)
is only needed on targets where an already-shipped bootloader locks PMP
entries (C5, C6, C61, H2, P4). No such bootloader has ever shipped for
ESP32-S31 and, per the v6.2 PMP ownership policy, the bootloader never
configures or locks any PMP entry on this target - so there is no ABI to
freeze. Program all entries by plain index (as on ESP32-H4/H21) and state
that the application-owned layout is not an ABI.
2026-08-28 18:06:56 +05:30
nilesh.kale
8f3d9e7445
feat: enable cpu region protection for esp32s31
2026-08-28 18:06:56 +05:30
morris
4dbfecac7e
Merge branch 'feat/dac_driver_treat_zero_as_default_clk_src_v6.1' into 'release/v6.1'
...
feat(dac): use default clock source for zero config (v6.1)
See merge request espressif/esp-idf!52158
2026-08-28 15:10:11 +08:00
morris
11da85e65b
Merge branch 'feat/isp_dpc_support_v6.1' into 'release/v6.1'
...
feat(isp): support isp dpc dead pixel correction (v6.1)
See merge request espressif/esp-idf!51469
2026-08-28 15:01:10 +08:00
Wang Meng Yang
af7a66da7c
Merge branch 'bugfix/hid_host_oob_read_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): fixed possible 1-byte OOB read in bta_hh_ctrl_dat_act (v6.1)
See merge request espressif/esp-idf!50971
2026-08-28 14:31:25 +08:00
Marius Vikhammer
929a3f18d3
Merge branch 'bugfix/heap_task_tracking_isr_safe_v6.1' into 'release/v6.1'
...
fix(heap): use critical section for task tracking locks (v6.1)
See merge request espressif/esp-idf!52011
2026-08-28 14:26:40 +08:00
Mahavir Jain
b0b7cca32c
Merge branch 'change/mmu_psram_anti_fi_bootloader_size_v6.1' into 'release/v6.1'
...
change(hal): exclude PSRAM anti-FI check from bootloader build (v6.1)
See merge request espressif/esp-idf!51608
2026-08-28 11:28:08 +05:30
Wang Meng Yang
a28e43fd36
Merge branch 'fix/aireview_obex_v6.1' into 'release/v6.1'
...
fix(bt_obex): fix some bugs in bluedroid obex (v6.1)
See merge request espressif/esp-idf!52004
2026-08-28 13:38:35 +08:00
morris
649433af0d
Merge branch 'fix/isp_error_when_rgb888_input_v6.1' into 'release/v6.1'
...
fix(isp): initialize Color defaults for RGB DMA output (v6.1)
See merge request espressif/esp-idf!51646
2026-08-28 11:34:42 +08:00
gaoxu
61c4fbcba5
feat(isp): support ISP DPC, add tests and use it in multi pipeline example
2026-08-28 11:14:33 +08:00
gaoxu
4b1b7a8f9c
fix(isp): initialize Color defaults for RGB DMA output
2026-08-28 11:02:19 +08:00
morris
b8e9a18e95
feat(dac): use default clock source for zero config
2026-08-28 10:16:31 +08:00
morris
43e6da1796
Merge branch 'refactor/dac_priv_dma_callbacks_v6.1' into 'release/v6.1'
...
refactor(dac): move DMA interrupt handling behind dac_priv_dma callbacks (v6.1)
See merge request espressif/esp-idf!52150
2026-08-28 10:15:29 +08:00
morris
f0cfc287b6
Merge branch 'docs/clarify_p4_no_wifi_ble_v6.1' into 'release/v6.1'
...
docs: Clarify that ESP32-P4 does not have Wi-Fi or Bluetooth in the introduction (v6.1)
See merge request espressif/esp-idf!51502
2026-08-28 10:11:51 +08:00
morris
1a0aa28792
Merge branch 'docs/update_get_started_s31_v6.1' into 'release/v6.1'
...
docs: Update Get Started for ESP32-S31 (v6.1)
See merge request espressif/esp-idf!51722
2026-08-28 10:11:19 +08:00
morris
b4f9033645
Merge branch 'feature/add_asrc_sleep_retention_v6.1' into 'release/v6.1'
...
feat(asrc): Add sleep retention
See merge request espressif/esp-idf!51807
2026-08-28 10:10:37 +08:00
hejiaxin
21270aea18
fix(bt_obex): fix some bugs in bluedroid obex
...
- fix goepc wait state switch
- fix psm unbind's mismatch
- fix some resources leak
- fix goep connection's incorrect ternimation when congesting
- Add some NULL ptr check
2026-08-28 10:09:29 +08:00
morris
f7502ee0cb
Merge branch 'isp_dma_one_frame_v6.1' into 'release/v6.1'
...
feat(isp): support isp dma input and add example (v6.1)
See merge request espressif/esp-idf!50754
2026-08-28 10:05:35 +08:00
Wang Meng Yang
7b8c5df2f6
Merge branch 'bugfix/qos_div_zero_v6.1' into 'release/v6.1'
...
fix(bt): update ESP32 libbtdm_app.a to fix several issues (v6.1)
See merge request espressif/esp-idf!52052
2026-08-28 09:44:26 +08:00
Marius Vikhammer
06ac9a5a72
Merge branch 'fix/bootloader_log_format_drom_vaddr_v6.1' into 'release/v6.1'
...
fix(bootloader): use correct format specifier for MMU_LL_END_DROM_ENTRY_VADDR (v6.1)
See merge request espressif/esp-idf!51055
2026-08-28 09:30:22 +08:00
Wang Meng Yang
95d4f21533
Merge branch 'fix/aireview_critical_v6.1' into 'release/v6.1'
...
fix: Fix some critical bugs in classic bt (v6.1)
See merge request espressif/esp-idf!51288
2026-08-28 09:18:04 +08:00
Wang Meng Yang
6c4435b285
Merge branch 'bugfix/avrcp_version_compatibility_v6.1' into 'release/v6.1'
...
fix(bt): Fix the issue of AVRCP version compatibility (v6.1)
See merge request espressif/esp-idf!52086
2026-08-28 08:58:40 +08:00
Wang Meng Yang
5abb8c7386
Merge branch 'bugfix/a2dp_sink_nego_sbc_v6.1' into 'release/v6.1'
...
fix(bt): do not cap AVDTP Discover results by local SEP count (v6.1)
See merge request espressif/esp-idf!51750
2026-08-28 08:39:37 +08:00
Wang Meng Yang
8036c800a2
Merge branch 'change/refactor_hidh_datapath_v6.1' into 'release/v6.1'
...
Change/refactor hidh datapath[backport v6.1]
See merge request espressif/esp-idf!51278
2026-08-28 08:31:57 +08:00
Wang Meng Yang
6684208ded
Merge branch 'bugfix/a2dp_api_init_check_v6.1' into 'release/v6.1'
...
fix(bt): Fix compatibility with A2DP API legacy usage methods (v6.1)
See merge request espressif/esp-idf!51327
2026-08-28 08:02:15 +08:00
Wang Meng Yang
33c6931f9e
Merge branch 'docs/update_coexist_docs_v6.1' into 'release/v6.1'
...
docs(coex): enable coexist docs for c61 h21 h4 s31 (v6.1)
See merge request espressif/esp-idf!51376
2026-08-28 07:49:54 +08:00
Alexey Lapshin
9b554b76ae
feat(soc): enable zb* extensions for esp32p4 greater v3
2026-08-27 22:48:54 +07:00
Roland Dobai
9090ed4c05
Merge branch 'fix/kconfig_bool_defaults_v6.1' into 'release/v6.1'
...
fix(kconfig): use 'n' instead of '0'/'false' for bool defaults
See merge request espressif/esp-idf!52032
2026-08-27 15:28:20 +02:00
Euripedes Rocha
252d8b8177
Merge branch 'feat/gmac_s31_followup_2nd_v6.1' into 'release/v6.1'
...
feat(esp_eth): add ioctl for 1G PHY master/slave mode (v6.1)
See merge request espressif/esp-idf!51709
2026-08-27 15:14:03 +02:00
Hu Rui
f7dc7a638d
refactor(dac): move DMA interrupt handling behind dac_priv_dma callbacks
2026-08-27 20:25:24 +08:00