From 458ce7d4cfa097fa3dc5397e2db3d8ece556a359 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 18 Mar 2024 11:44:53 +0800 Subject: [PATCH 1/3] fix(wifi): fix multicast address qos frames issue --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index b3bdcf9ffe..17117b9aed 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1845,7 +1845,7 @@ ic_ebuf_recycle_rx = 0x40001fa0; ic_ebuf_recycle_tx = 0x40001fa4; ic_reset_rx_ba = 0x40001fa8; ieee80211_align_eb = 0x40001fac; -ieee80211_ampdu_reorder = 0x40001fb0; +/*ieee80211_ampdu_reorder = 0x40001fb0;*/ ieee80211_ampdu_start_age_timer = 0x40001fb4; /*ieee80211_encap_esfbuf = 0x40001fb8;*/ ieee80211_is_tx_allowed = 0x40001fbc; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 261d9c7bbc..14a6db08fc 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1717,7 +1717,7 @@ ic_ebuf_recycle_rx = 0x40001844; ic_ebuf_recycle_tx = 0x40001848; ic_reset_rx_ba = 0x4000184c; ieee80211_align_eb = 0x40001850; -ieee80211_ampdu_reorder = 0x40001854; +/*ieee80211_ampdu_reorder = 0x40001854;*/ ieee80211_ampdu_start_age_timer = 0x40001858; /*ieee80211_encap_esfbuf = 0x4000185c;*/ ieee80211_is_tx_allowed = 0x40001860; diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld index 6156a8bc83..7a73b4d5a7 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld @@ -31,7 +31,7 @@ ic_ebuf_recycle_rx = 0x40000b70; ic_ebuf_recycle_tx = 0x40000b74; ic_reset_rx_ba = 0x40000b78; ieee80211_align_eb = 0x40000b7c; -ieee80211_ampdu_reorder = 0x40000b80; +/*ieee80211_ampdu_reorder = 0x40000b80;*/ ieee80211_ampdu_start_age_timer = 0x40000b84; /*ieee80211_encap_esfbuf = 0x40000b88;*/ ieee80211_is_tx_allowed = 0x40000b8c; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 09dd20ecbf..7b77ad6a9f 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -2024,7 +2024,7 @@ ic_ebuf_recycle_rx = 0x40005a24; ic_ebuf_recycle_tx = 0x40005a30; ic_reset_rx_ba = 0x40005a3c; ieee80211_align_eb = 0x40005a48; -ieee80211_ampdu_reorder = 0x40005a54; +/* ieee80211_ampdu_reorder = 0x40005a54; */ ieee80211_ampdu_start_age_timer = 0x40005a60; /* ieee80211_encap_esfbuf = 0x40005a6c; */ ieee80211_is_tx_allowed = 0x40005a78; From 0e34a993d04a779c34c9e9c89a1f92a97828bb8b Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 11 Apr 2024 12:03:11 +0800 Subject: [PATCH 2/3] fix(wifi): fixed some wifi issue 1. sync multi antenna gpio register from IDF 2. fixed multicast address qos frames issue 3. fixed task watchdog got triggered by esp_wifi_stop issue --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- components/esp_wifi/lib | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 17117b9aed..1dfee83d75 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1483,7 +1483,7 @@ is_lmac_idle = 0x40001b0c; /*lmacAdjustTimestamp = 0x40001b10;*/ lmacDiscardAgedMSDU = 0x40001b14; /*lmacDiscardMSDU = 0x40001b18;*/ -lmacEndFrameExchangeSequence = 0x40001b1c; +/*lmacEndFrameExchangeSequence = 0x40001b1c;*/ lmacIsIdle = 0x40001b20; lmacIsLongFrame = 0x40001b24; /*lmacMSDUAged = 0x40001b28;*/ diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 14a6db08fc..a5731b2bb2 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1516,7 +1516,7 @@ is_lmac_idle = 0x400015e8; /*lmacAdjustTimestamp = 0x400015ec;*/ lmacDiscardAgedMSDU = 0x400015f0; /*lmacDiscardMSDU = 0x400015f4;*/ -lmacEndFrameExchangeSequence = 0x400015f8; +/*lmacEndFrameExchangeSequence = 0x400015f8;*/ lmacIsIdle = 0x400015fc; lmacIsLongFrame = 0x40001600; /*lmacMSDUAged = 0x40001604;*/ diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index 751cc2977b..cb3e31d368 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -37,7 +37,7 @@ is_lmac_idle = 0x40000c14; /*lmacAdjustTimestamp = 0x40000c18;*/ lmacDiscardAgedMSDU = 0x40000c1c; /*lmacDiscardMSDU = 0x40000c20;*/ -lmacEndFrameExchangeSequence = 0x40000c24; +/*lmacEndFrameExchangeSequence = 0x40000c24;*/ lmacIsIdle = 0x40000c28; lmacIsLongFrame = 0x40000c2c; /*lmacMSDUAged = 0x40000c30;*/ diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 7b77ad6a9f..509553d569 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -1816,7 +1816,7 @@ is_lmac_idle = 0x400052f8; /*lmacAdjustTimestamp = 0x40005304;*/ lmacDiscardAgedMSDU = 0x40005310; /*lmacDiscardMSDU = 0x4000531c;*/ -lmacEndFrameExchangeSequence = 0x40005328; +/*lmacEndFrameExchangeSequence = 0x40005328;*/ lmacIsIdle = 0x40005334; lmacIsLongFrame = 0x40005340; /*lmacMSDUAged = 0x4000534c;*/ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 39926ae1f5..2c2bb53cc9 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 39926ae1f56bd2de3d0c7fb875d5d301c4bf4467 +Subproject commit 2c2bb53cc9ba01b2c4f549526eab623d70c0a4a8 From a07bce4fcc6ba72ef014f9142eb7750f51118573 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Wed, 17 Apr 2024 11:16:51 +0800 Subject: [PATCH 3/3] fix(wifi): fixed lmacEndFrameExchangeSequence assert issue --- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index cb3e31d368..78014c5e59 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -80,7 +80,7 @@ pm_on_data_rx = 0x40000ca8; pm_sleep_for = 0x40000cc4; //pm_tbtt_process = 0x40000cc8; ppAMPDU2Normal = 0x40000ccc; -ppAssembleAMPDU = 0x40000cd0; +/* ppAssembleAMPDU = 0x40000cd0; */ ppCalFrameTimes = 0x40000cd4; ppCalSubFrameLength = 0x40000cd8; //ppCalTxAMPDULength = 0x40000cdc;