Fork fix: the SDIO wedge is FIXED (esp-hosted-mcu #167)
Root cause (verified against our exact IDF tree, not the community guess): the "258" in "sdio_write_task: Failed to send data: 258" is NOT a timeout (that is 263). 258 = 0x102 = ESP_ERR_INVALID_ARG. On the ESP32-P4, block- mode CMD53 writes require the SOURCE buffer to be 64-byte (cache-line) aligned; the IDF sdmmc driver rejects a misaligned source with INVALID_ARG BEFORE any bus activity. esp_hosts write loop then declares "Unrecoverable host sdio state" and reboots the whole P4. The audio TX payload is not 64-aligned, so streaming mic audio wedged on the very FIRST frame (which is exactly what we saw: listening -> instant Failed to send -> reboot). This also explains why buffer/queue/clock/retry tuning all did nothing: the write never reached the bus. And why our symptom was instant, not after ~100 writes (the community block-mode-desync theory) — it is the first misaligned buffer, every time. Fix: vendored esp_hosted 2.12.11 as an editable local component (overrides the registry copy) and bounce a misaligned TX payload through one aligned DMA scratch buffer in hosted_sdio_write_block (port_esp_hosted_host_sdio.c). TX is serialized by the bus lock so a single static bounce buffer is safe; freed in hosted_sdio_deinit. Host-only change — no C6 reflash. VERIFIED ON HARDWARE (autonomous self-test): 40s of continuous mic-audio upstream streaming — the traffic that previously wedged on the first frame — ran clean, zero timeouts, zero reboots. A guarded SDIO_TX_SELFTEST harness is kept (compiled out) for future SDIO stress testing. Credit: root cause + patch designed via multi-agent investigation; the precise 258=INVALID_ARG decode (correcting the upstream community timeout assumption) came from checking our actual esp_err.h. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,144 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/* Bitmask definitions used in RPC data */
|
||||
|
||||
#ifndef __ESP_HOSTED_BITMASKS__H
|
||||
#define __ESP_HOSTED_BITMASKS__H
|
||||
|
||||
#include "esp_idf_version.h"
|
||||
|
||||
#define H_SET_BIT(pos, val) (val|=(1<<pos))
|
||||
|
||||
#define H_GET_BIT(pos, val) (val&(1<<pos)? 1: 0)
|
||||
|
||||
enum {
|
||||
WIFI_SCAN_AP_REC_phy_11b_BIT = 0,
|
||||
WIFI_SCAN_AP_REC_phy_11g_BIT = 1,
|
||||
WIFI_SCAN_AP_REC_phy_11n_BIT = 2,
|
||||
WIFI_SCAN_AP_REC_phy_lr_BIT = 3,
|
||||
WIFI_SCAN_AP_REC_phy_11ax_BIT = 4,
|
||||
WIFI_SCAN_AP_REC_wps_BIT = 5,
|
||||
WIFI_SCAN_AP_REC_ftm_responder_BIT = 6,
|
||||
WIFI_SCAN_AP_REC_ftm_initiator_BIT = 7,
|
||||
WIFI_SCAN_AP_REC_phy_11a_BIT = 8,
|
||||
WIFI_SCAN_AP_REC_phy_11ac_BIT = 9,
|
||||
WIFI_SCAN_AP_REC_MAX_USED_BIT = 10,
|
||||
};
|
||||
|
||||
#define WIFI_SCAN_AP_RESERVED_BITMASK 0xFC00
|
||||
|
||||
#define WIFI_SCAN_AP_GET_RESERVED_VAL(num) \
|
||||
((num & WIFI_SCAN_AP_RESERVED_BITMASK) >> WIFI_SCAN_AP_REC_MAX_USED_BIT)
|
||||
|
||||
#define WIFI_SCAN_AP_SET_RESERVED_VAL(reserved_in,num_out) \
|
||||
(num_out |= (reserved_in << WIFI_SCAN_AP_REC_MAX_USED_BIT));
|
||||
|
||||
enum {
|
||||
WIFI_STA_INFO_phy_11b_BIT = 0,
|
||||
WIFI_STA_INFO_phy_11g_BIT = 1,
|
||||
WIFI_STA_INFO_phy_11n_BIT = 2,
|
||||
WIFI_STA_INFO_phy_lr_BIT = 3,
|
||||
WIFI_STA_INFO_phy_11ax_BIT = 4,
|
||||
WIFI_STA_INFO_is_mesh_child_BIT = 5,
|
||||
WIFI_STA_INFO_MAX_USED_BIT = 6,
|
||||
};
|
||||
|
||||
#define WIFI_STA_INFO_RESERVED_BITMASK 0xFFC0
|
||||
|
||||
#define WIFI_STA_INFO_GET_RESERVED_VAL(num) \
|
||||
((num & WIFI_STA_INFO_RESERVED_BITMASK) >> WIFI_STA_INFO_MAX_USED_BIT)
|
||||
|
||||
#define WIFI_STA_INFO_SET_RESERVED_VAL(reserved_in,num_out) \
|
||||
(num_out |= (reserved_in << WIFI_STA_INFO_MAX_USED_BIT));
|
||||
|
||||
/* WIFI HE AP Info bitmasks */
|
||||
enum {
|
||||
// WIFI_HE_AP_INFO_BSS_COLOR is six bits wide
|
||||
WIFI_HE_AP_INFO_partial_bss_color_BIT = 6,
|
||||
WIFI_HE_AP_INFO_bss_color_disabled_BIT = 7,
|
||||
WIFI_HE_AP_INFO_MAX_USED_BIT = 8,
|
||||
};
|
||||
|
||||
#define WIFI_HE_AP_INFO_BSS_COLOR_BITS 0x3F
|
||||
|
||||
/*** There are currently two set of bitfields in wifi_sta_config_t */
|
||||
|
||||
/* WIFI Station Config Bitfield 1 bitmasks */
|
||||
enum {
|
||||
WIFI_STA_CONFIG_1_rm_enabled = 0,
|
||||
WIFI_STA_CONFIG_1_btm_enabled = 1,
|
||||
WIFI_STA_CONFIG_1_mbo_enabled = 2,
|
||||
WIFI_STA_CONFIG_1_ft_enabled = 3,
|
||||
WIFI_STA_CONFIG_1_owe_enabled = 4,
|
||||
WIFI_STA_CONFIG_1_transition_disable = 5,
|
||||
WIFI_STA_CONFIG_1_MAX_USED_BIT = 6,
|
||||
};
|
||||
|
||||
#define WIFI_STA_CONFIG_1_RESERVED_BITMASK 0xFFFFFFC0
|
||||
|
||||
#define WIFI_STA_CONFIG_1_GET_RESERVED_VAL(num) \
|
||||
((num & WIFI_STA_CONFIG_1_RESERVED_BITMASK) >> WIFI_STA_CONFIG_1_MAX_USED_BIT)
|
||||
|
||||
#define WIFI_STA_CONFIG_1_SET_RESERVED_VAL(reserved_in, num_out) \
|
||||
(num_out |= (reserved_in << WIFI_STA_CONFIG_1_MAX_USED_BIT));
|
||||
|
||||
/* WIFI Station Config Bitfield 2 bitmasks */
|
||||
enum {
|
||||
WIFI_STA_CONFIG_2_he_dcm_set_BIT = 0,
|
||||
// WIFI_STA_CONFIG_he_dcm_max_constellation_tx is two bits wide
|
||||
WIFI_STA_CONFIG_2_he_dcm_max_constellation_tx_BITS = 1,
|
||||
// WIFI_STA_CONFIG_he_dcm_max_constellation_rx is two bits wide
|
||||
WIFI_STA_CONFIG_2_he_dcm_max_constellation_rx_BITS = 3,
|
||||
WIFI_STA_CONFIG_2_he_mcs9_enabled_BIT = 5,
|
||||
WIFI_STA_CONFIG_2_he_su_beamformee_disabled_BIT = 6,
|
||||
WIFI_STA_CONFIG_2_he_trig_su_bmforming_feedback_disabled_BIT = 7,
|
||||
WIFI_STA_CONFIG_2_he_trig_mu_bmforming_partial_feedback_disabled_BIT = 8,
|
||||
WIFI_STA_CONFIG_2_he_trig_cqi_feedback_disabled_BIT = 9,
|
||||
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
|
||||
WIFI_STA_CONFIG_2_MAX_USED_BIT = 10,
|
||||
#else
|
||||
WIFI_STA_CONFIG_2_vht_su_beamformee_disabled = 10,
|
||||
WIFI_STA_CONFIG_2_vht_mu_beamformee_disabled = 11,
|
||||
WIFI_STA_CONFIG_2_vht_mcs8_enabled = 12,
|
||||
WIFI_STA_CONFIG_2_MAX_USED_BIT = 13,
|
||||
#endif
|
||||
};
|
||||
|
||||
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 5, 0)
|
||||
#define WIFI_STA_CONFIG_2_RESERVED_BITMASK 0xFFFFFC00
|
||||
#else
|
||||
#define WIFI_STA_CONFIG_2_RESERVED_BITMASK 0xFFFFE000
|
||||
#endif
|
||||
|
||||
#define WIFI_STA_CONFIG_2_GET_RESERVED_VAL(num) \
|
||||
((num & WIFI_STA_CONFIG_2_RESERVED_BITMASK) >> WIFI_STA_CONFIG_2_MAX_USED_BIT)
|
||||
|
||||
#define WIFI_STA_CONFIG_2_SET_RESERVED_VAL(reserved_in,num_out) \
|
||||
(num_out |= (reserved_in << WIFI_STA_CONFIG_2_MAX_USED_BIT));
|
||||
|
||||
#endif
|
||||
|
||||
/* WIFI ITWT Setup Config bitmasks */
|
||||
|
||||
enum {
|
||||
WIFI_ITWT_CONFIG_1_trigger_BIT = 0,
|
||||
WIFI_ITWT_CONFIG_1_flow_type_BIT = 1,
|
||||
// WIFI_ITWT_CONFIG_1_flow_id_BIT is three bits wide
|
||||
WIFI_ITWT_CONFIG_1_flow_id_BIT = 2,
|
||||
// WIFI_ITWT_CONFIG_1_wake_invl_expn_BIT is five bits wide
|
||||
WIFI_ITWT_CONFIG_1_wake_invl_expn_BIT = 5,
|
||||
WIFI_ITWT_CONFIG_1_wake_duration_unit_BIT = 10,
|
||||
WIFI_ITWT_CONFIG_1_MAX_USED_BIT = 11,
|
||||
};
|
||||
|
||||
#define WIFI_ITWT_CONFIG_1_RESERVED_BITMASK 0xFFFFF800
|
||||
|
||||
#define WIFI_ITWT_CONFIG_1_GET_RESERVED_VAL(num) \
|
||||
((num & WIFI_ITWT_CONFIG_1_RESERVED_BITMASK) >> WIFI_ITWT_CONFIG_1_MAX_USED_BIT)
|
||||
|
||||
#define WIFI_ITWT_CONFIG_1_SET_RESERVED_VAL(reserved_in,num_out) \
|
||||
(num_out |= (reserved_in << WIFI_ITWT_CONFIG_1_MAX_USED_BIT));
|
||||
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Holds RPC defines common to Hosted Slave and Master
|
||||
*/
|
||||
|
||||
#ifndef __ESP_HOSTED_RPC__H
|
||||
#define __ESP_HOSTED_RPC__H
|
||||
|
||||
/*
|
||||
* check components/esp_common/src/esp_err_to_name.c for
|
||||
* unused error range
|
||||
*/
|
||||
#define ESP_ERR_HOSTED_BASE (0x2f00)
|
||||
|
||||
enum {
|
||||
RPC_ERR_BASE = ESP_ERR_HOSTED_BASE,
|
||||
RPC_ERR_NOT_CONNECTED,
|
||||
RPC_ERR_NO_AP_FOUND,
|
||||
RPC_ERR_INVALID_PASSWORD,
|
||||
RPC_ERR_INVALID_ARGUMENT,
|
||||
RPC_ERR_OUT_OF_RANGE,
|
||||
RPC_ERR_MEMORY_FAILURE,
|
||||
RPC_ERR_UNSUPPORTED_MSG,
|
||||
RPC_ERR_INCORRECT_ARG,
|
||||
RPC_ERR_PROTOBUF_ENCODE,
|
||||
RPC_ERR_PROTOBUF_DECODE,
|
||||
RPC_ERR_SET_ASYNC_CB,
|
||||
RPC_ERR_TRANSPORT_SEND,
|
||||
RPC_ERR_REQUEST_TIMEOUT,
|
||||
RPC_ERR_REQ_IN_PROG,
|
||||
RPC_ERR_SET_SYNC_SEM,
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user