Merge branch 'espressif:release/v5.5' into release/v5.5

Author: Jason2866

components/bt/common/ble_log/ble_log_spi_out.c

@@ -37,6 +37,7 @@
 #define SPI_OUT_PACKET_LOSS_FRAME_SIZE          (6)
 #define SPI_OUT_TRANS_ITVL_MIN_US               (30)
 #define SPI_OUT_UL_LOG_STR_BUF_SIZE             (100)
+#define SPI_OUT_MALLOC(size)                    heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
 
 #if SPI_OUT_TS_SYNC_ENABLED
 #define SPI_OUT_TS_SYNC_TIMEOUT                 (1000 * 1000)
@@ -233,13 +234,13 @@ static void spi_out_le_audio_log_deinit(void);
 static int spi_out_init_trans(spi_out_trans_cb_t **trans_cb, uint16_t buf_size)
 {
     // Memory allocations
-    *trans_cb = (spi_out_trans_cb_t *)malloc(sizeof(spi_out_trans_cb_t));
+    *trans_cb = (spi_out_trans_cb_t *)SPI_OUT_MALLOC(sizeof(spi_out_trans_cb_t));
     if (!(*trans_cb)) {
         return -1;
     }
     memset(*trans_cb, 0, sizeof(spi_out_trans_cb_t));
 
-    uint8_t *buf = (uint8_t *)spi_bus_dma_memory_alloc(SPI_OUT_BUS, (size_t)buf_size, 0);
+    uint8_t *buf = (uint8_t *)SPI_OUT_MALLOC((size_t)buf_size);
     if (!buf) {
         free(*trans_cb);
         *trans_cb = NULL;
@@ -311,7 +312,7 @@ IRAM_ATTR static inline void spi_out_append_trans(spi_out_trans_cb_t *trans_cb)
 static int spi_out_log_cb_init(spi_out_log_cb_t **log_cb, uint16_t buf_size, uint8_t type)
 {
     // Initialize log control block
-    *log_cb = (spi_out_log_cb_t *)malloc(sizeof(spi_out_log_cb_t));
+    *log_cb = (spi_out_log_cb_t *)SPI_OUT_MALLOC(sizeof(spi_out_log_cb_t));
     if (!(*log_cb)) {
         ESP_LOGE(BLE_LOG_TAG, "Failed to initialize log control block!");
         return -1;
@@ -427,7 +428,7 @@ IRAM_ATTR static bool spi_out_log_cb_write(spi_out_log_cb_t *log_cb, const uint8
 
     memcpy(buf, (const uint8_t *)&head, SPI_OUT_FRAME_HEAD_LEN);
     memcpy(buf + SPI_OUT_FRAME_HEAD_LEN, addr, len);
-    if (len_append) {
+    if (len_append && addr_append) {
         memcpy(buf + SPI_OUT_FRAME_HEAD_LEN + len, addr_append, len_append);
     }
     memcpy(buf + SPI_OUT_FRAME_HEAD_LEN + total_length, &checksum, SPI_OUT_FRAME_TAIL_LEN);
@@ -520,7 +521,7 @@ static int spi_out_ul_log_init(void)
     }
 
     // Initialize string buffer
-    ul_log_str_buf = (uint8_t *)malloc(SPI_OUT_UL_LOG_STR_BUF_SIZE);
+    ul_log_str_buf = (uint8_t *)SPI_OUT_MALLOC(SPI_OUT_UL_LOG_STR_BUF_SIZE);
     if (!ul_log_str_buf) {
         ESP_LOGE(BLE_LOG_TAG, "Failed to initialize string buffer for upper layer task log!");
         goto str_buf_init_failed;

components/bt/common/ble_log/include/ble_log/ble_log_spi_out.h

@@ -13,6 +13,7 @@
 #include "esp_timer.h"
 #include "esp_log.h"
 #include "freertos/semphr.h"
+#include "esp_heap_caps.h"
 
 // Public enums
 enum {

components/esp_coex/lib

@@ -154,11 +154,11 @@ pm_beacon_monitor_tbtt_timeout_process = 0x40000e00;
 pm_update_next_tbtt = 0x40000e04;
 pm_twt_disallow_tx = 0x40000e08;
 pm_clear_wakeup_signal = 0x40000e0c;
-/*pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10;
-pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14;
+//pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10;
+//pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14;
 //pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18;
 //pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c;
-//pm_mac_modem_params_rt_update = 0x40000e20;*/
+//pm_mac_modem_params_rt_update = 0x40000e20;
 pm_update_at_next_beacon = 0x40000e24;
 tbtt_adaptive_setup = 0x40000e28;
 tbtt_adaptive_servo = 0x40000e2c;

components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld

@@ -1467,7 +1467,7 @@ typedef struct {
     bool dcm;                                /**< Using dcm rate to send frame */
 } wifi_tx_rate_config_t;
 
-#define WIFI_MAX_SUPPORT_COUNTRY_NUM 175 /**< max number of supported countries */
+#define WIFI_MAX_SUPPORT_COUNTRY_NUM 176 /**< max number of supported countries */
 #ifdef CONFIG_SOC_WIFI_SUPPORT_5G
 #define WIFI_MAX_REGULATORY_RULE_NUM  7 /**< max number of regulatory rules */
 #else

components/esp_wifi/include/esp_wifi_types_generic.h

@@ -89,6 +89,7 @@ typedef enum {
 
 const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = {
     {"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT},
+    {"EU", ESP_WIFI_REGULATORY_TYPE_CE},
     {"AD", ESP_WIFI_REGULATORY_TYPE_CE},
     {"AE", ESP_WIFI_REGULATORY_TYPE_IFETEL},
     {"AF", ESP_WIFI_REGULATORY_TYPE_AF},
@@ -1067,6 +1068,7 @@ typedef enum {
 
 const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = {
     {"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT},
+    {"EU", ESP_WIFI_REGULATORY_TYPE_CE},
     {"AD", ESP_WIFI_REGULATORY_TYPE_CE},
     {"AE", ESP_WIFI_REGULATORY_TYPE_CE},
     {"AF", ESP_WIFI_REGULATORY_TYPE_CE},

components/esp_wifi/lib

@@ -44,6 +44,17 @@ country 01:
 	# Channel 52 - 64
 	(5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
 
+#  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
+#  EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
+# Harmonized CEPT countries: https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
+country EU: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
+	(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
+	(5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
+	# short range devices (ETSI EN 300 440-1)
+	(5725 - 5875 @ 80), (25 mW)
+
 # AD as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
 # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
 #  EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213

components/esp_wifi/regulatory/esp_wifi_regulatory.c

@@ -158,7 +158,7 @@ void *hostap_init(void)
             auth_conf->group_mgmt_cipher = WPA_CIPHER_BIP_GMAC_256;
             break;
         default:
-            wpa_printf(MSG_DEBUG, "Invalid pairwise cipher (0x%x)", pairwise_cipher);
+            auth_conf->group_mgmt_cipher = WPA_CIPHER_AES_128_CMAC;
         }
     }
     if (authmode == WIFI_AUTH_WPA2_WPA3_PSK) {