From 039ef51db50992db68764626d5cf73a32d53d6cb Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 25 Sep 2023 15:12:44 +0800 Subject: [PATCH 1/6] fix(wifi): fix some wifi issues 1. fix enable psram wapi dhcp fail issue 2. fix c6 esp_wifi_set_max_tx_power fail issue 3. fix wrong wifi mode connect crash issue 4. fix null data sequence number issue --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 4 ++-- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- components/esp_wifi/lib | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 08e613cc54..a89d376f2e 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1876,7 +1876,7 @@ ieee80211_ampdu_start_age_timer = 0x40001fb4; ieee80211_encap_esfbuf = 0x40001fb8; ieee80211_is_tx_allowed = 0x40001fbc; ieee80211_output_pending_eb = 0x40001fc0; -ieee80211_output_process = 0x40001fc4; +/* ieee80211_output_process = 0x40001fc4; */ ieee80211_set_tx_desc = 0x40001fc8; /*sta_input = 0x40001fcc;*/ wifi_get_macaddr = 0x40001fd0; @@ -1947,7 +1947,7 @@ ieee80211_output_raw_process = 0x400020f4; ieee80211_raw_frame_sanity_check = 0x400020fc; ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100; ieee80211_alloc_tx_buf = 0x40002108; -ieee80211_output_do = 0x4000210c; +/* ieee80211_output_do = 0x4000210c; */ /* ieee80211_send_nulldata = 0x40002110; */ ieee80211_setup_robust_mgmtframe = 0x40002114; ieee80211_encap_null_data = 0x4000211c; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index b2f63271c7..c2b132ae80 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1802,7 +1802,7 @@ ieee80211_ampdu_start_age_timer = 0x40001858; /*ieee80211_encap_esfbuf = 0x4000185c;*/ ieee80211_is_tx_allowed = 0x40001860; ieee80211_output_pending_eb = 0x40001864; -ieee80211_output_process = 0x40001868; +/*ieee80211_output_process = 0x40001868;*/ ieee80211_set_tx_desc = 0x4000186c; rom_sta_input = 0x40001870; wifi_get_macaddr = 0x40001874; diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld index ba01cb6665..e5bd02bd98 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld @@ -36,7 +36,7 @@ ieee80211_ampdu_start_age_timer = 0x40000b84; ieee80211_encap_esfbuf = 0x40000b88; ieee80211_is_tx_allowed = 0x40000b8c; ieee80211_output_pending_eb = 0x40000b90; -ieee80211_output_process = 0x40000b94; +/*ieee80211_output_process = 0x40000b94;*/ ieee80211_set_tx_desc = 0x40000b98; //sta_input = 0x40000b9c; wifi_get_macaddr = 0x40000ba0; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index f7e8058c22..45fb53a148 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -2119,7 +2119,7 @@ ieee80211_ampdu_start_age_timer = 0x40005a60; /* ieee80211_encap_esfbuf = 0x40005a6c; */ ieee80211_is_tx_allowed = 0x40005a78; ieee80211_output_pending_eb = 0x40005a84; -ieee80211_output_process = 0x40005a90; +/*ieee80211_output_process = 0x40005a90;*/ ieee80211_set_tx_desc = 0x40005a9c; /*sta_input = 0x40005aa8;*/ wifi_get_macaddr = 0x40005ab4; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 174341fbe1..dee1fbe2ca 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 174341fbe17d6527f25a1c4e936323b6f3e691e2 +Subproject commit dee1fbe2ca92284fbaeb7cef8d8298c06a00dc6a From 870d2cac327938e5f8b0ed80ee426126d8cafac0 Mon Sep 17 00:00:00 2001 From: liuning Date: Tue, 10 Oct 2023 09:51:23 +0800 Subject: [PATCH 2/6] (fix)esp_wifi: wifi beacon timeout after connection established --- 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 dee1fbe2ca..c8a6ac54c5 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit dee1fbe2ca92284fbaeb7cef8d8298c06a00dc6a +Subproject commit c8a6ac54c577b479ab10f69341f98a3ac1d345a3 From 9c479e6589c6d128d04e74f9256940a51833fe5d Mon Sep 17 00:00:00 2001 From: CC Date: Wed, 4 Oct 2023 17:49:52 +0800 Subject: [PATCH 3/6] esp_wifi.h typo typo in esp_wifi_scan_get_ap_num comment APIs -> APs --- components/esp_wifi/include/esp_wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index 4a233406e5..1eccd7dca5 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -447,7 +447,7 @@ esp_err_t esp_wifi_scan_stop(void); /** * @brief Get number of APs found in last scan * - * @param[out] number store number of APIs found in last scan + * @param[out] number store number of APs found in last scan * * @attention This API can only be called when the scan is completed, otherwise it may get wrong value. * From 8467bddaea05a5f2a228f0f8d8cf05a3160e1157 Mon Sep 17 00:00:00 2001 From: alanmaxwell Date: Wed, 11 Oct 2023 15:47:07 +0800 Subject: [PATCH 4/6] fix(wifi): Fix some wifi issue 1.fix multi antenna issue 2.fix dirty eb when rx HE rate action for C6 3.fix h/w modem state consecutive times when the modem sleep type is modified in runtime --- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index 5cfc163ddc..61a4f4e10d 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -144,7 +144,7 @@ TRC_PER_IS_GOOD = 0x40000dc0; trc_SetTxAmpduState = 0x40000dc4; trc_tid_isTxAmpduOperational = 0x40000dc8; trcAmpduSetState = 0x40000dcc; -wDevCheckBlockError = 0x40000dd0; +//wDevCheckBlockError = 0x40000dd0; wDev_AppendRxBlocks = 0x40000dd4; wDev_DiscardFrame = 0x40000dd8; wDev_GetNoiseFloor = 0x40000ddc; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index c8a6ac54c5..3e202a0f02 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit c8a6ac54c577b479ab10f69341f98a3ac1d345a3 +Subproject commit 3e202a0f02851aa103fa8a2d33d40f87b85b2484 From 7de4e28fddcba2a4f659812fc038252ee1247aa0 Mon Sep 17 00:00:00 2001 From: Niklas Kaaf Date: Fri, 29 Sep 2023 16:05:18 +0200 Subject: [PATCH 5/6] fix: "erro code" -> "error code" typos --- components/esp_wifi/include/esp_wifi.h | 2 +- components/protocomm/test_apps/main/test_protocomm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index 1eccd7dca5..4aef336ec2 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -829,7 +829,7 @@ esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter * - ESP_ERR_WIFI_MODE: invalid mode * - ESP_ERR_WIFI_PASSWORD: invalid password * - ESP_ERR_WIFI_NVS: WiFi internal NVS error - * - others: refer to the erro code in esp_err.h + * - others: refer to the error code in esp_err.h */ esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf); diff --git a/components/protocomm/test_apps/main/test_protocomm.c b/components/protocomm/test_apps/main/test_protocomm.c index 8bd17f5e9e..5ec3548584 100644 --- a/components/protocomm/test_apps/main/test_protocomm.c +++ b/components/protocomm/test_apps/main/test_protocomm.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -234,7 +234,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req) ret = mbedtls_aes_setkey_enc(&session->ctx_aes, session->sym_key, sizeof(session->sym_key)*8); if (ret != 0) { - ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with erro code : %d", ret); + ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with error code : %d", ret); free(outbuf); return ESP_FAIL; } @@ -243,7 +243,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req) &session->nc_off, session->rand, session->stb, session->device_pubkey, outbuf); if (ret != 0) { - ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret); + ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret); free(outbuf); return ESP_FAIL; } @@ -308,7 +308,7 @@ static esp_err_t verify_response1(session_t *session, SessionData *resp) &session->nc_off, session->rand, session->stb, in->sr1->device_verify_data.data, check_buf); if (ret != 0) { - ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret); + ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret); return ESP_FAIL; } hexdump("Dec Device verifier", check_buf, sizeof(check_buf)); From 21360b9ef3a2c5747b2effdb3213182db47dd2a7 Mon Sep 17 00:00:00 2001 From: liuning Date: Wed, 11 Oct 2023 09:13:28 +0800 Subject: [PATCH 6/6] fix(pm): fix soc wakeup after wifi disconnected, station no respond after m f null, crash when connected to non_trans bssid --- 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 3e202a0f02..983a779766 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 3e202a0f02851aa103fa8a2d33d40f87b85b2484 +Subproject commit 983a779766850d8e0d6114a9512cfefc11a8aa64