From 10d02c6c5cb6db7d2e684a74c201f84ac425ea89 Mon Sep 17 00:00:00 2001 From: Li Shuai Date: Mon, 27 Mar 2023 17:36:16 +0800 Subject: [PATCH 1/3] power save: add txq memory to mac retention link to fix tx m f null failure --- .../esp_hw_support/port/esp32c6/private_include/pmu_param.h | 6 +++--- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_hw_support/port/esp32c6/private_include/pmu_param.h b/components/esp_hw_support/port/esp32c6/private_include/pmu_param.h index caff125218..eba0df4dff 100644 --- a/components/esp_hw_support/port/esp32c6/private_include/pmu_param.h +++ b/components/esp_hw_support/port/esp32c6/private_include/pmu_param.h @@ -332,9 +332,9 @@ typedef struct pmu_sleep_machine_constant { .power_supply_wait_time_us = 2, \ .power_up_wait_time_us = 2, \ .regdma_s2m_work_time_us = 172, \ - .regdma_s2a_work_time_us = 430, \ - .regdma_m2a_work_time_us = 239, \ - .regdma_a2s_work_time_us = 338, \ + .regdma_s2a_work_time_us = 480, \ + .regdma_m2a_work_time_us = 278, \ + .regdma_a2s_work_time_us = 382, \ .regdma_rf_on_work_time_us = 70, \ .regdma_rf_off_work_time_us = 23, \ .xtal_wait_stable_time_us = 250, \ diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index 5c65c34956..29fb9c7950 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -31,7 +31,7 @@ hal_mac_tx_get_blockack = 0x40000bfc; //hal_mac_tx_set_ppdu = 0x40000c00; ic_get_trc = 0x40000c04; //ic_mac_deinit = 0x40000c08; -/* ic_mac_init = 0x40000c0c; */ +ic_mac_init = 0x40000c0c; ic_interface_enabled = 0x40000c10; is_lmac_idle = 0x40000c14; lmacAdjustTimestamp = 0x40000c18; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 515b89441b..6484d097a3 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 515b89441b26f0c76daedb10ac0f411a4c67cccb +Subproject commit 6484d097a356caae907327d5ce87d60a822ab25a From 0e54382fafe77f7e96492308c6dd0ccd61f5a8ae Mon Sep 17 00:00:00 2001 From: liuning Date: Tue, 28 Mar 2023 16:05:26 +0800 Subject: [PATCH 2/3] esp_coex: fix esp32 wifi schm interrupted by ble suddenly act --- components/esp_coex/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_coex/lib b/components/esp_coex/lib index 125056ce87..28e2858208 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit 125056ce875d4c0898c5cbe51b6ee12537000924 +Subproject commit 28e2858208c0f8720c43618e90dbbfaf6035ebf5 From dff3c07e4257ddd40a6f9effd3b5cb33cfc72bc9 Mon Sep 17 00:00:00 2001 From: baohongde Date: Tue, 28 Mar 2023 16:14:54 +0800 Subject: [PATCH 3/3] components/coexist: Set coex scan status when ble connecting --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index aec338b1aa..c97f994fb8 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit aec338b1aaeb522bd9507f1cd2ba51f807392390 +Subproject commit c97f994fb851265bcdea08495ece555a6d0009c2