Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mac_deinit_esp32_v5.4' into 'release/v5.4'

Browse Source 
fix(wifi): fix some wifi bugs 260304(Backport v5.4)

See merge request espressif/esp-idf!42489
This commit is contained in:
Jiang Jiang Jian
2026-03-12 09:56:50 +08:00
parent 570b5c5a7a 8c5f5aec7a
commit a9c6958c6e
43 changed files with 344 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -775,6 +775,10 @@ config SOC_WIFI_FTM_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW
bool
default y
components/soc/esp32c2/include/soc/periph_defs.h
+1
View File
@@ -38,6 +38,7 @@ typedef enum {
PERIPH_MODEM_RPA_MODULE,
PERIPH_ASSIST_DEBUG_MODULE,
PERIPH_PHY_CALIBRATION_MODULE,
PERIPH_COEX_MODULE,
PERIPH_MODULE_MAX
} periph_module_t;
components/soc/esp32c2/include/soc/soc_caps.h
+1
View File
@@ -345,6 +345,7 @@
/*------------------------------------ WI-FI CAPS ------------------------------------*/
#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
#define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW (1) /*!< Support delta early time for rf phy on/off */
#define SOC_WIFI_PHY_NEEDS_USB_WORKAROUND (1) /*!< SoC has WiFi and USB PHYs interference, needs a workaround */
components/soc/esp32c2/register/soc/syscon_reg.h
+4 -2
View File
@@ -178,8 +178,10 @@ extern "C" {
#define SYSTEM_WIFI_CLK_BT_EN_S 0
/* Mask for clock bits used by both WIFI and Bluetooth, 0, 1, 2, 3, 7, 8, 9, 10, 19, 20, 21, 22, 23 */
#define SYSTEM_WIFI_CLK_WIFI_BT_COMMON_M 0x78078F
/* Mask for clock bits used by phy calibration, bit 22, 29, 30, 31 */
#define SYSTEM_WIFI_CLK_PHY_EN_M 0xE0400000
/* Mask for clock bits used by phy calibration, bit 22, 30, 31 */
#define SYSTEM_WIFI_CLK_PHY_EN_M 0xC0400000
/* Mask for clock bits used by coex, bit 29 */
#define SYSTEM_WIFI_CLK_COEX_EN_M 0x20000000
/* Digital team to check */
//bluetooth baseband bit11
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -1119,6 +1119,10 @@ config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_CSI_SUPPORT
bool
default y
components/soc/esp32c3/include/soc/soc_caps.h
+1
View File
@@ -469,6 +469,7 @@
#define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW (1) /*!< Support delta early time for rf phy on/off */
components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -1483,6 +1483,10 @@ config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_CSI_SUPPORT
bool
default y
components/soc/esp32c5/include/soc/soc_caps.h
+1
View File
@@ -615,6 +615,7 @@
#define SOC_WIFI_FTM_SUPPORT (0) /*!< Support FTM */ // TODO: [ESP32C5] WIFI-6426
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
components/soc/esp32c6/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -1539,6 +1539,10 @@ config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_CSI_SUPPORT
bool
default y
components/soc/esp32c6/include/soc/soc_caps.h
+1
View File
@@ -600,6 +600,7 @@
#define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -1063,6 +1063,10 @@ config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_CSI_SUPPORT
bool
default y
components/soc/esp32c61/include/soc/soc_caps.h
+1
View File
@@ -480,6 +480,7 @@
#define SOC_WIFI_FTM_SUPPORT (0) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
+4
View File
@@ -1455,6 +1455,10 @@ config SOC_WIFI_WAPI_SUPPORT
bool
default y
config SOC_WIFI_TXOP_SUPPORT
bool
default y
config SOC_WIFI_CSI_SUPPORT
bool
default y
components/soc/esp32s3/include/soc/soc_caps.h
+1
View File
@@ -573,6 +573,7 @@
#define SOC_WIFI_FTM_SUPPORT (1) /*!< Support FTM */
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
#define SOC_WIFI_TXOP_SUPPORT (1) /*!< Support TXOP */
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW (1) /*!< Support delta early time for rf phy on/off */