feat(ble_mesh): add BLE 5.0 extended advertising and long packet support

- Add extended advertising configuration with customizable PHY selection (1M, 2M, Coded)
- Implement long packet mode to overcome standard BLE Mesh packet length limitations
- Add configurable advertising parameters: interval, count, channel map, TX power
- Introduce enhanced message context structure for fine-grained advertising control
- Add Kconfig options for buffer management and segment count configuration
- Support both forced and preferred long packet transmission modes
- Update advertising buffer pools to accommodate extended and long packet types
- Add validation for enhanced advertising parameters and packet length limits
- Maintain backward compatibility with existing BLE Mesh functionality

Author: forx157

components/bt/esp_ble_mesh/Kconfig.in

@@ -41,6 +41,86 @@ if BLE_MESH
         help
             This option to enable BLE Mesh using some BLE 5.0 APIs.
 
+    menuconfig BLE_MESH_EXT_ADV
+        bool "Enable extended advertising for BLE Mesh"
+        depends on BLE_MESH_USE_BLE_50
+        default n
+        help
+            Enable broadcasting of BLE Mesh messages using BLE 5.0 extended advertising.
+            This allows control of extended advertising parameters (e.g., PHY selection)
+            while maintaining standard BLE Mesh packet length.
+
+    config BLE_MESH_EXT_ADV_BUF_COUNT
+        int "Number of extended advertising buffers"
+        depends on BLE_MESH_EXT_ADV
+        range 6 256
+        default 60
+        help
+            Number of buffer slots allocated for extended advertising packets.
+
+    config BLE_MESH_EXT_RELAY_ADV_BUF_COUNT
+        int "Number of extended relay advertising buffers"
+        depends on BLE_MESH_EXT_ADV
+        depends on BLE_MESH_RELAY
+        range 0 256
+        default 60
+        help
+            Number of buffer slots allocated for extended advertising packets used in message relay.
+
+    menuconfig BLE_MESH_LONG_PACKET
+        bool "Enable non-standard long packet mode for BLE Mesh"
+        depends on BLE_MESH_EXT_ADV
+        default n
+        help
+            Enable extended-length advertising packets for BLE Mesh using BLE 5.0 extended advertising.
+            This overrides the standard BLE Mesh packet length limitations.
+
+    config BLE_MESH_LONG_PACKET_ADV_LEN
+        int "Maximum advertising payload length"
+        depends on BLE_MESH_LONG_PACKET
+        range 30 249
+        default 105
+        help
+            Maximum payload length for extended advertising packets (bytes).
+            Range: 30-249 bytes.
+            Default: 105.
+            Note: Maximum access payload = (LENGTH - 17) × SEGMENT_COUNT
+            - Transmission: Uses BLE_MESH_LONG_PACKET_TX_SEG_CNT
+            - Reception: Uses BLE_MESH_LONG_PACKET_RX_SEG_CNT
+
+    config BLE_MESH_LONG_PACKET_ADV_BUF_COUNT
+        int "Long packet advertising buffer count"
+        depends on BLE_MESH_LONG_PACKET
+        default 20
+        help
+            Number of advertising buffers allocated for long packet transmissions.
+
+    config BLE_MESH_LONG_PACKET_RELAY_ADV_BUF_COUNT
+        int "Long packet relay buffer count"
+        depends on BLE_MESH_LONG_PACKET
+        depends on BLE_MESH_RELAY
+        default 20
+        help
+            Number of advertising buffers allocated for relay long packets.
+
+    config BLE_MESH_LONG_PACKET_TX_SEG_CNT
+        int "Maximum transmission segments per message"
+        depends on BLE_MESH_LONG_PACKET
+        range 1 BLE_MESH_TX_SEG_MAX if BLE_MESH_TX_SEG_MAX < BLE_MESH_LONG_PACKET_ADV_BUF_COUNT
+        range 1 BLE_MESH_LONG_PACKET_ADV_BUF_COUNT if BLE_MESH_TX_SEG_MAX >= BLE_MESH_LONG_PACKET_ADV_BUF_COUNT
+        default 20
+        help
+            Maximum number of segments for outgoing long packet messages.
+            Upper bound: min(BLE_MESH_TX_SEG_MAX, BLE_MESH_LONG_PACKET_ADV_BUF_COUNT)
+
+    config BLE_MESH_LONG_PACKET_RX_SEG_CNT
+        int "Maximum reception segments per message"
+        depends on BLE_MESH_LONG_PACKET
+        range 1 BLE_MESH_LONG_PACKET_ADV_BUF_COUNT
+        default 20
+        help
+            Maximum number of segments supported for receiving long packet messages.
+
     config BLE_MESH_ADV_INST_ID
         depends on BLE_MESH_USE_BLE_50
         int "Extended adv instance for Mesh normal packets"

components/bt/esp_ble_mesh/api/core/esp_ble_mesh_networking_api.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -30,8 +30,55 @@ static esp_err_t ble_mesh_model_send_msg(esp_ble_mesh_model_t *model,
 
     ESP_BLE_HOST_STATUS_CHECK(ESP_BLE_HOST_STATUS_ENABLED);
 
-    if (ctx && ctx->addr == ESP_BLE_MESH_ADDR_UNASSIGNED) {
-        BT_ERR("Invalid destination address 0x0000");
+    if (ctx) {
+        if (ctx->addr == ESP_BLE_MESH_ADDR_UNASSIGNED) {
+            BT_ERR("Invalid destination address 0x0000");
+            return ESP_ERR_INVALID_ARG;
+        }
+
+        if (ctx->enh.adv_cfg_used &&
+            ctx->enh.adv_cfg.channel_map & BIT(3)) {
+            BT_ERR("Invalid channel map 0x%04x: bit 3 is reserved", ctx->enh.adv_cfg.channel_map);
+            return ESP_ERR_INVALID_ARG;
+        }
+
+#if CONFIG_BLE_MESH_EXT_ADV
+        if (ctx->enh.ext_adv_cfg_used) {
+            if (ctx->enh.ext_adv_cfg.primary_phy == ESP_BLE_MESH_ADV_PHY_CODED) {
+                BT_ERR("Primary phy can't be set to coded phy");
+                return ESP_ERR_INVALID_ARG;
+            }
+
+            if (ctx->enh.ext_adv_cfg.primary_phy == ESP_BLE_MESH_ADV_PHY_UNASSIGNED) {
+                ctx->enh.ext_adv_cfg.primary_phy = ESP_BLE_MESH_ADV_PHY_DEFAULT;
+            }
+
+            if (ctx->enh.ext_adv_cfg.secondary_phy == ESP_BLE_MESH_ADV_PHY_UNASSIGNED) {
+                ctx->enh.ext_adv_cfg.secondary_phy = ESP_BLE_MESH_ADV_PHY_DEFAULT;
+            }
+        }
+#if CONFIG_BLE_MESH_LONG_PACKET
+        if (ctx->enh.long_pkt_cfg_used &&
+            (ctx->enh.long_pkt_cfg != ESP_BLE_MESH_LONG_PACKET_FORCE &&
+             ctx->enh.long_pkt_cfg != ESP_BLE_MESH_LONG_PACKET_PREFER)) {
+            BT_ERR("Invalid long packet configuration %d (expected FORCE=1 or PREFER=2)",
+                ctx->enh.long_pkt_cfg);
+        }
+
+        if (ctx->enh.long_pkt_cfg_used && (op_len + length + mic_len > ESP_BLE_MESH_EXT_SDU_MAX_LEN)) {
+            BT_ERR("The length(%d) exceeds the maximum length supported by the long packet", length);
+            return ESP_ERR_INVALID_ARG;
+        }
+        if (((!ctx->enh.long_pkt_cfg_used) && op_len + length + mic_len > MIN(ESP_BLE_MESH_SDU_MAX_LEN, ESP_BLE_MESH_TX_SDU_MAX))) {
+            BT_ERR("Too large data length %d", length);
+            return ESP_ERR_INVALID_ARG;
+        }
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
+#endif /* CONFIG_BLE_MESH_EXT_ADV */
+    } // if (ctx)
+
+    if (op_len + length + mic_len > MIN(ESP_BLE_MESH_SDU_MAX_LEN, ESP_BLE_MESH_TX_SDU_MAX)) {
+        BT_ERR("Too large data length %d", length);
         return ESP_ERR_INVALID_ARG;
     }
 
@@ -70,11 +117,6 @@ static esp_err_t ble_mesh_model_send_msg(esp_ble_mesh_model_t *model,
                    ESP_BLE_MESH_MIC_LONG : ESP_BLE_MESH_MIC_SHORT;
     }
 
-    if (op_len + length + mic_len > MIN(ESP_BLE_MESH_SDU_MAX_LEN, ESP_BLE_MESH_TX_SDU_MAX)) {
-        BT_ERR("Too large data length %d", length);
-        return ESP_ERR_INVALID_ARG;
-    }
-
     if (act == BTC_BLE_MESH_ACT_MODEL_PUBLISH) {
         bt_mesh_model_msg_init(model->pub->msg, opcode);
         net_buf_simple_add_mem(model->pub->msg, data, length);

components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,6 +20,12 @@ extern "C" {
 
 /*!< The maximum length of a BLE Mesh message, including Opcode, Payload and TransMIC */
 #define ESP_BLE_MESH_SDU_MAX_LEN                    384
+#if CONFIG_BLE_MESH_LONG_PACKET
+/* Extended SDU maximum length (included Opcode, Payload and TransMIC) calculation:
+ * SEGMENT_COUNT × (ADV_PAYLOAD_LEN - 17 bytes overhead)
+ * 17 bytes = 9 bytes mesh network header + 4 bytes transport overhead + 4 bytes NetMIC */
+#define ESP_BLE_MESH_EXT_SDU_MAX_LEN                (CONFIG_BLE_MESH_LONG_PACKET_TX_SEG_CNT * (CONFIG_BLE_MESH_LONG_PACKET_ADV_LEN - 17))
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
 
 /*!< Length of a short Mesh MIC. */
 #define ESP_BLE_MESH_MIC_SHORT                      4
@@ -613,6 +619,166 @@ struct esp_ble_mesh_model {
  */
 #define ESP_BLE_MESH_MODEL_NONE ((esp_ble_mesh_model_t []){})
 
+#if CONFIG_BLE_MESH_USE_BLE_50
+#define ESP_BLE_MESH_ADV_CHAN_UNASSIGNED        (0)
+#define ESP_BLE_MESH_ADV_CHAN_37                BIT(0)
+#define ESP_BLE_MESH_ADV_CHAN_38                BIT(1)
+#define ESP_BLE_MESH_ADV_CHAN_39                BIT(2)
+
+#define ESP_BLE_MESH_DEFAULT_CHANNEL_MAP        (ESP_BLE_MESH_ADV_CHAN_37| \
+                                                 ESP_BLE_MESH_ADV_CHAN_38| \
+                                                 ESP_BLE_MESH_ADV_CHAN_39)
+
+#define ESP_BLE_MESH_ADV_PHY_UNASSIGNED         (0)
+#define ESP_BLE_MESH_ADV_PHY_1M                 (1)
+#define ESP_BLE_MESH_ADV_PHY_2M                 (2)
+#define ESP_BLE_MESH_ADV_PHY_CODED              (3)
+#define ESP_BLE_MESH_ADV_PHY_DEFAULT            ESP_BLE_MESH_ADV_PHY_1M
+#endif /* CONFIG_BLE_MESH_USE_BLE_50 */
+
+/**
+ * Enhanced configuration for Mesh messages with legacy advertising
+ */
+typedef struct {
+    /**
+     * Advertising interval in milliseconds.
+     * If set to 0, the Mesh protocol stack's xmit parameters are used.
+     * If set to another value (e.g., 10), the advertising interval will be 10 ms.
+     */
+    uint32_t adv_itvl;
+
+    /**
+     * Number of advertising per packet.
+     * If set to 0, the Mesh protocol stack's xmit parameters are used.
+     * If set to another value (e.g., 3), the number of advertising per packet will be 3.
+     */
+    uint8_t adv_cnt;
+
+    /**
+     * Advertising channel map.
+     * If set to 0, the protocol stack uses default channels.
+     * If set to another value (e.g., ESP_BLE_MESH_ADV_CHAN_37),
+     * the advertising channel map will be 0x01, the advertising
+     * packet will only advertise on channel 37.
+     */
+    uint8_t channel_map;
+} esp_ble_mesh_adv_cfg_t;
+
+#if CONFIG_BLE_MESH_EXT_ADV
+/** Enhanced configuration for Mesh messages with extended advertising */
+typedef struct {
+    /**
+     * Primary PHY for advertising (ESP_BLE_MESH_ADV_PHY_1M or
+     * ESP_BLE_MESH_ADV_PHY_CODED).
+     * When using coded PHY, receivers must use coded scanning.
+     */
+    uint8_t primary_phy;
+
+    /**
+     * Secondary PHY for advertising (ESP_BLE_MESH_ADV_PHY_1M,
+     * ESP_BLE_MESH_ADV_PHY_2M, or ESP_BLE_MESH_ADV_PHY_CODED).
+     * When using coded PHY, receivers must use coded scanning.
+     */
+    uint8_t secondary_phy;
+
+    /**
+     * Include TX power in advertising packets (0: disabled, 1: enabled).
+     * Allows receivers/relays to maintain original transmission power.
+     */
+    uint8_t include_tx_power:1;
+
+    /** Transmission power level (in dBm) */
+    int8_t tx_power;
+} esp_ble_mesh_ext_adv_cfg_t;
+#endif /* CONFIG_BLE_MESH_EXT_ADV */
+
+#if CONFIG_BLE_MESH_LONG_PACKET
+/** Force this message to use long packet format */
+#define ESP_BLE_MESH_LONG_PACKET_FORCE     (1)
+
+/**
+ * Whether to use the long packet mode will be chosen by the protocol stack,
+ * which currently makes the decision based on message length.
+ * Advertising using the standard BLE Mesh protocol when possible.
+ * Switch to long packet mode for advertising when the standard BLE
+ * Mesh protocol cannot be used.
+ */
+#define ESP_BLE_MESH_LONG_PACKET_PREFER    (2)
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
+
+/** Enhanced message advertising parameters */
+typedef struct {
+    /**
+     * Use custom advertising parameters (0: disabled, 1: enabled).
+     * When enabled, `adv_cfg` parameters override stack defaults.
+     */
+    uint8_t adv_cfg_used:1;
+
+#if CONFIG_BLE_MESH_EXT_ADV
+    /**
+     * Use extended advertising parameters (0: disabled, 1: enabled).
+     * When enabled, `ext_adv_cfg` parameters override stack defaults.
+     */
+    uint8_t ext_adv_cfg_used:1;
+#endif /* CONFIG_BLE_MESH_EXT_ADV */
+
+#if CONFIG_BLE_MESH_LONG_PACKET
+    /**
+     * Control long packet usage (0: disabled, 1: enabled).
+     * When disabled, the protocol stack cannot use long packets to
+     * send this message.
+     */
+    uint8_t long_pkt_cfg_used:1;
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
+
+    /** Standard advertising parameters */
+    esp_ble_mesh_adv_cfg_t adv_cfg;
+
+#if CONFIG_BLE_MESH_EXT_ADV
+    /** Extended advertising parameters */
+    esp_ble_mesh_ext_adv_cfg_t ext_adv_cfg;
+#endif /* CONFIG_BLE_MESH_EXT_ADV */
+
+#if CONFIG_BLE_MESH_LONG_PACKET
+    /**
+     * Long packet configuration:
+     * - ESP_BLE_MESH_LONG_PACKET_FORCE
+     * - ESP_BLE_MESH_LONG_PACKET_PREFER
+     */
+    uint8_t long_pkt_cfg:2;
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
+} esp_ble_mesh_msg_enh_params_t;
+
+#define ESP_BLE_MESH_ADV_CFG_NULL ((esp_ble_mesh_adv_cfg_t){0})
+#define ESP_BLE_MESH_EXT_ADV_CFG_NULL ((esp_ble_mesh_ext_adv_cfg_t){0})
+
+#define ESP_BLE_MESH_ADV_CFG_DEFAULT \
+        ((esp_ble_mesh_adv_cfg_t){\
+            .adv_itvl= 0, \
+            .adv_cnt = 0, \
+            .channel_map = ESP_BLE_MESH_DEFAULT_CHANNEL_MAP, \
+        })
+
+#define ESP_BLE_MESH_EXT_ADV_CFG_DEFAULT \
+        ((esp_ble_mesh_ext_adv_cfg_t){ \
+            .primary_phy = ESP_BLE_MESH_ADV_PHY_1M, \
+            .secondary_phy = ESP_BLE_MESH_ADV_PHY_1M, \
+            .tx_power = 0x7f, \
+            .include_tx_power = false,\
+        })
+
+#if CONFIG_BLE_MESH_LONG_PACKET
+#define ESP_BLE_MESH_LONG_PACKET_DEF_ENH_SET(ADV_CFG, EXT_ADV_CFG, LONG_PACKET_CFG) \
+    ((esp_ble_mesh_msg_enh_params_t){    \
+        .adv_cfg_used = true,\
+        .adv_cfg = ADV_CFG, \
+        .ext_adv_cfg_used = true,  \
+        .ext_adv_cfg = EXT_ADV_CFG, \
+        .long_pkt_cfg_used = true,  \
+        .long_pkt_cfg = LONG_PACKET_CFG, \
+    })
+#endif /* CONFIG_BLE_MESH_LONG_PACKET */
+
 /** Message sending context.
  *  This structure is associated with struct bt_mesh_msg_ctx in mesh_access.h
  */
@@ -664,6 +830,9 @@ typedef struct {
 
     /** Indicate if the message is sent by a node server model, no need to be initialized before sending message */
     bool srv_send __attribute__((deprecated));
+
+    /** Enhanced message advertising parameters */
+    esp_ble_mesh_msg_enh_params_t enh;
 } esp_ble_mesh_msg_ctx_t;
 
 /** Provisioning properties & capabilities.

components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c

@@ -2950,6 +2950,8 @@ void btc_ble_mesh_model_call_handler(btc_msg_t *msg)
             .msg_timeout    = arg->model_send.msg_timeout,
         };
 
+        memcpy(&param.ctx.enh, &arg->model_send.ctx->enh, sizeof(bt_mesh_msg_enh_params_t));
+
         err = bt_mesh_client_send_msg(&param, buf, arg->model_send.need_rsp,
                                       btc_ble_mesh_client_model_timeout_cb);
         bt_mesh_free_buf(buf);