From f95854dc8f18145f59c9b1a5f2fe90a63283ec5f Mon Sep 17 00:00:00 2001 From: Li Shuai Date: Wed, 15 Feb 2023 16:37:39 +0800 Subject: [PATCH] soc_caps: add SOC_PM_MODEM_RETENTION_BY_REGDMA caps soc_caps: add SOC_PM_SUPPORT_BEACON_WAKEUP caps soc_caps: add SOC_PM_SUPPORT_PMU_MODEM_STATE caps soc_caps: add SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW caps soc_caps: add SOC_PM_SUPPORT_MAC_BB_PD caps --- .../soc/esp32/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32/include/soc/soc_caps.h | 11 +++++----- .../esp32c2/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32c2/include/soc/soc_caps.h | 13 ++++++------ .../esp32c3/include/soc/Kconfig.soc_caps.in | 12 +++++++++++ components/soc/esp32c3/include/soc/soc_caps.h | 17 ++++++++------- .../esp32c6/include/soc/Kconfig.soc_caps.in | 16 ++++++++++++++ components/soc/esp32c6/include/soc/soc_caps.h | 21 ++++++++++++------- components/soc/esp32h2/include/soc/soc_caps.h | 2 ++ .../esp32s2/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32s2/include/soc/soc_caps.h | 13 ++++++------ .../esp32s3/include/soc/Kconfig.soc_caps.in | 12 +++++++++++ components/soc/esp32s3/include/soc/soc_caps.h | 17 ++++++++------- 13 files changed, 107 insertions(+), 39 deletions(-) diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index ea0f1cf35a..3244db3e8f 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -823,6 +823,10 @@ config SOC_WIFI_MESH_SUPPORT bool default y +config SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW + bool + default y + config SOC_BLE_SUPPORTED bool default y diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index 353d3b8509..f90cdddddf 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -401,11 +401,12 @@ #define SOC_SDMMC_NUM_SLOTS 2 /*-------------------------- WI-FI HARDWARE CAPS -------------------------------*/ -#define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ -#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */ -#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ -#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */ -#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ +#define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ +#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */ +#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ +#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 */ /*---------------------------------- Bluetooth CAPS ----------------------------------*/ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in index 73ed37fbcd..fe13c13a63 100644 --- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in @@ -667,6 +667,10 @@ config SOC_WIFI_MESH_SUPPORT bool default n +config SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW + bool + default y + config SOC_BLE_SUPPORTED bool default y diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h index b29367d2f7..576785098c 100644 --- a/components/soc/esp32c2/include/soc/soc_caps.h +++ b/components/soc/esp32c2/include/soc/soc_caps.h @@ -301,12 +301,13 @@ #define SOC_CLK_OSC_SLOW_SUPPORTED (1) /*!< ESP32C2 only supports to connect an external oscillator, not a crystal */ /*------------------------------------ WI-FI CAPS ------------------------------------*/ -#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ -#define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ -#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */ -#define SOC_WIFI_WAPI_SUPPORT (0) /*!< WAPI is not supported */ -#define SOC_WIFI_CSI_SUPPORT (0) /*!< CSI is not supported */ -#define SOC_WIFI_MESH_SUPPORT (0) /*!< WIFI MESH is not supported */ +#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ +#define SOC_WIFI_FTM_SUPPORT (0) /*!< FTM is not supported */ +#define SOC_WIFI_GCMP_SUPPORT (0) /*!< GCMP is not supported(GCMP128 and GCMP256) */ +#define SOC_WIFI_WAPI_SUPPORT (0) /*!< WAPI is not supported */ +#define SOC_WIFI_CSI_SUPPORT (0) /*!< CSI is not supported */ +#define SOC_WIFI_MESH_SUPPORT (0) /*!< WIFI MESH is not supported */ +#define SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW (1) /*!< Support delta early time for rf phy on/off */ /*---------------------------------- Bluetooth CAPS ----------------------------------*/ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index 405056d2f8..a7665e4edd 100644 --- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in @@ -887,10 +887,18 @@ config SOC_PM_SUPPORT_VDDSDIO_PD bool default y +config SOC_PM_SUPPORT_MAC_BB_PD + bool + default y + config SOC_PM_CPU_RETENTION_BY_RTCCNTL bool default y +config SOC_PM_MODEM_RETENTION_BY_BACKUPDMA + bool + default y + config SOC_CLK_RC_FAST_D256_SUPPORTED bool default y @@ -939,6 +947,10 @@ config SOC_WIFI_MESH_SUPPORT bool default y +config SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW + bool + default y + config SOC_BLE_SUPPORTED bool default y diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index 20783cf3f3..fef9c410ca 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -389,8 +389,10 @@ #define SOC_PM_SUPPORT_BT_PD (1) #define SOC_PM_SUPPORT_RC_FAST_PD (1) #define SOC_PM_SUPPORT_VDDSDIO_PD (1) +#define SOC_PM_SUPPORT_MAC_BB_PD (1) -#define SOC_PM_CPU_RETENTION_BY_RTCCNTL (1) +#define SOC_PM_CPU_RETENTION_BY_RTCCNTL (1) +#define SOC_PM_MODEM_RETENTION_BY_BACKUPDMA (1) /*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ #define SOC_CLK_RC_FAST_D256_SUPPORTED (1) @@ -404,12 +406,13 @@ #define SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL (1) /*------------------------------------ WI-FI CAPS ------------------------------------*/ -#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ -#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_CSI_SUPPORT (1) /*!< Support CSI */ -#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ +#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */ +#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_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 */ /*---------------------------------- Bluetooth CAPS ----------------------------------*/ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in index 8ac11d0497..96615ff958 100644 --- a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in @@ -1047,6 +1047,10 @@ config SOC_PM_SUPPORT_WIFI_WAKEUP bool default y +config SOC_PM_SUPPORT_BEACON_WAKEUP + bool + default y + config SOC_PM_SUPPORT_BT_WAKEUP bool default y @@ -1083,6 +1087,14 @@ config SOC_PM_SUPPORT_TOP_PD bool default y +config SOC_PM_SUPPORT_MAC_BB_PD + bool + default y + +config SOC_PM_SUPPORT_PMU_MODEM_STATE + bool + default y + config SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY bool default y @@ -1091,6 +1103,10 @@ config SOC_PM_CPU_RETENTION_BY_SW bool default y +config SOC_PM_MODEM_RETENTION_BY_REGDMA + bool + default y + config SOC_PM_PAU_LINK_NUM int default 4 diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h index a0270af63c..c98258058c 100644 --- a/components/soc/esp32c6/include/soc/soc_caps.h +++ b/components/soc/esp32c6/include/soc/soc_caps.h @@ -444,6 +444,7 @@ // TODO: IDF-5351 (Copy from esp32c3, need check) /*-------------------------- Power Management CAPS ----------------------------*/ #define SOC_PM_SUPPORT_WIFI_WAKEUP (1) +#define SOC_PM_SUPPORT_BEACON_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_EXT1_WAKEUP (1) #define SOC_PM_SUPPORT_CPU_PD (1) @@ -453,10 +454,14 @@ #define SOC_PM_SUPPORT_RC_FAST_PD (1) #define SOC_PM_SUPPORT_VDDSDIO_PD (1) #define SOC_PM_SUPPORT_TOP_PD (1) +#define SOC_PM_SUPPORT_MAC_BB_PD (1) + +#define SOC_PM_SUPPORT_PMU_MODEM_STATE (1) #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) /*!