From 313008851bbe9b85750d5f18da346e9e0509e445 Mon Sep 17 00:00:00 2001 From: linruihao Date: Thu, 18 Dec 2025 10:49:46 +0800 Subject: [PATCH 1/3] fix(coex): fix some esp32 coexistence bugs - fix ble scan may restart twice in coex scenarios - fix bredr page/pscan coex request/release not match - fix bredr incorrect inquiry length calculation - update bredr page/inquiry pti - add coex pti protection for entire page/inquiry event --- components/esp_coex/lib | 2 +- components/esp_rom/esp32/ld/esp32.rom.ld | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/esp_coex/lib b/components/esp_coex/lib index 23b0e0c87b7..28761900446 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit 23b0e0c87b7f92e7a41466d148a53c9a03ca899f +Subproject commit 28761900446e46452e252c46092f54ec52fb4707 diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 85bcb7ad4b7..0723044656c 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -1381,7 +1381,6 @@ PROVIDE ( esp_rom_spiflash_config_clk = 0x40062bc8 ); PROVIDE ( g_rom_spiflash_chip = 0x3ffae270 ); PROVIDE ( SPI_write_enable = 0x40062320 ); PROVIDE ( hci_le_rd_rem_used_feats_cmd_handler = 0x400417b4 ); -PROVIDE ( hci_per_inq_mode_cmd_handler = 0x400519b0 ); PROVIDE ( llcp_length_req_handler = 0x40043808 ); PROVIDE ( llcp_unknown_rsp_handler = 0x40043ba8 ); PROVIDE ( llcp_channel_map_req_handler = 0x4004291c ); From 8e0e32530f8bbf20fed8bfe4c667718524df4b0c Mon Sep 17 00:00:00 2001 From: linruihao Date: Thu, 16 Apr 2026 16:07:34 +0800 Subject: [PATCH 2/3] feat(coex): supports external coexisence when bluetooth is enabled --- components/esp_coex/Kconfig | 5 +---- components/esp_coex/lib | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/esp_coex/Kconfig b/components/esp_coex/Kconfig index bc37b3820b2..cf322d5e3da 100644 --- a/components/esp_coex/Kconfig +++ b/components/esp_coex/Kconfig @@ -23,15 +23,12 @@ menu "Wireless Coexistence" config ESP_COEX_EXTERNAL_COEXIST_ENABLE bool "External Coexistence" default n - depends on (!(BT_ENABLED||NIMBLE_ENABLED)&&(!IDF_TARGET_ESP32)) + depends on (!BT_CONTROLLER_ENABLED && !IDF_TARGET_ESP32) || SOC_EXTERNAL_COEX_ADVANCE help If enabled, HW External coexistence arbitration is managed by GPIO pins. It can support three types of wired combinations so far which are 1-wired/2-wired/3-wired. User can select GPIO pins in application code with configure interfaces. - This function depends on BT-off - because currently we do not support external coex and internal coex simultaneously. - config ESP_COEX_POWER_MANAGEMENT bool "Support power management under coexistence" default n diff --git a/components/esp_coex/lib b/components/esp_coex/lib index 28761900446..79e618f033e 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit 28761900446e46452e252c46092f54ec52fb4707 +Subproject commit 79e618f033e926d134decc6d95bb1b1850bd032c From fd352e5317176642b2446542f3639a003908ac67 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 1 Jun 2026 14:53:04 +0800 Subject: [PATCH 3/3] fix(wifi): fix some wifi bugs 260601 1. feat(wifi): sync coexistence head file 2. fix(coex): fix ci g_wifi_coex_basic_md5 check fail issue --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 81d46c52102..ba434430e88 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 81d46c52102bf8896facf86ad9994011d59a5ab5 +Subproject commit ba434430e888f5c5338d81784dea07595df9532d