drivers: wifi: esp_hosted: Add support for the latest firmware.

Add support for esp-hosted v1.0.0.0.0 firmware.

Signed-off-by: Ibrahim Abdalkader <[email protected]>

Author: iabdalkader

drivers/wifi/esp_hosted/Kconfig.esp_hosted

@@ -22,6 +22,10 @@ if WIFI_ESP_HOSTED
 config WIFI_ESP_HOSTED_DEBUG
 	bool "Extra debugging messages"
 
+config WIFI_ESP_HOSTED_LEGACY
+	bool
+	default $(dt_compat_any_has_prop,$(DT_COMPAT_ESPRESSIF_ESP_HOSTED),legacy-protocol,True)
+
 config WIFI_ESP_HOSTED_EVENT_TASK_PRIORITY
 	int "Event task priority"
 	default 4

drivers/wifi/esp_hosted/esp_hosted_util.h

@@ -132,12 +132,25 @@ static inline int esp_hosted_ctrl_response(CtrlMsg *ctrl_msg)
 		return ctrl_msg->resp_get_wifi_curr_tx_power.resp;
 	case CtrlMsgId_Resp_ConfigHeartbeat:
 		return ctrl_msg->resp_config_heartbeat.resp;
+#if !defined(CONFIG_WIFI_ESP_HOSTED_LEGACY)
+	case CtrlMsgId_Resp_EnableDisable:
+		return ctrl_msg->resp_enable_disable_feat.resp;
+	case CtrlMsgId_Resp_GetFwVersion:
+		return ctrl_msg->resp_get_fw_version.resp;
+	case CtrlMsgId_Resp_SetCountryCode:
+		return ctrl_msg->resp_set_country_code.resp;
+	case CtrlMsgId_Resp_GetCountryCode:
+		return ctrl_msg->resp_get_country_code.resp;
+	case CtrlMsgId_Resp_Custom_RPC_Unserialised_Msg:
+		return ctrl_msg->resp_custom_rpc_unserialised_msg.resp;
+#endif  /* !CONFIG_WIFI_ESP_HOSTED_LEGACY */
+
 	default:
 		return -1;
 	}
 }
 
-#if CONFIG_WIFI_ESP_HOSTED_DEBUG
+#if defined(CONFIG_WIFI_ESP_HOSTED_DEBUG)
 static void esp_hosted_frame_dump(esp_frame_t *frame)
 {
 	static const char *const if_strs[] = {"STA", "AP", "SERIAL", "HCI", "PRIV", "TEST"};

drivers/wifi/esp_hosted/esp_hosted_wifi.c

@@ -6,7 +6,11 @@
 
 #include <pb_encode.h>
 #include <pb_decode.h>
+#if defined(CONFIG_WIFI_ESP_HOSTED_LEGACY)
 #include <esp_hosted_legacy.pb.h>
+#else
+#include <esp_hosted_latest.pb.h>
+#endif
 
 #include <esp_hosted_wifi.h>
 #include <esp_hosted_hal.h>
@@ -204,7 +208,7 @@ static void esp_hosted_event_task(const struct device *dev, void *p2, void *p3)
 			continue;
 		}
 
-#if CONFIG_WIFI_ESP_HOSTED_DEBUG
+#if defined(CONFIG_WIFI_ESP_HOSTED_DEBUG)
 		esp_hosted_frame_dump(&frame);
 #endif
 
@@ -220,6 +224,14 @@ static void esp_hosted_event_task(const struct device *dev, void *p2, void *p3)
 		case CtrlMsgId_Event_Heartbeat:
 			data->last_hb_ms = k_uptime_get();
 			continue;
+#if !defined(CONFIG_WIFI_ESP_HOSTED_LEGACY)
+		case CtrlMsgId_Event_StationConnectedToAP: {
+			data->state[ESP_HOSTED_STA_IF] = WIFI_STATE_COMPLETED;
+			net_if_dormant_off(data->iface[ESP_HOSTED_STA_IF]);
+			wifi_mgmt_raise_connect_result_event(data->iface[ESP_HOSTED_STA_IF], 0);
+			continue;
+		}
+#endif /* CONFIG_WIFI_ESP_HOSTED_LEGACY */
 		case CtrlMsgId_Event_StationDisconnectFromAP:
 			data->state[ESP_HOSTED_STA_IF] = WIFI_STATE_DISCONNECTED;
 			net_if_dormant_on(data->iface[ESP_HOSTED_STA_IF]);
@@ -238,16 +250,6 @@ static void esp_hosted_event_task(const struct device *dev, void *p2, void *p3)
 								  &sta_info);
 			continue;
 		}
-		case CtrlMsgId_Resp_ConnectAP: {
-			int ret = esp_hosted_ctrl_response(&ctrl_msg);
-
-			if (!ret) {
-				data->state[ESP_HOSTED_STA_IF] = WIFI_STATE_COMPLETED;
-				net_if_dormant_off(data->iface[ESP_HOSTED_STA_IF]);
-			}
-			wifi_mgmt_raise_connect_result_event(data->iface[ESP_HOSTED_STA_IF], ret);
-			continue;
-		}
 		default: /* Unhandled events/responses will be queued. */
 			break;
 		}
@@ -298,9 +300,18 @@ static int esp_hosted_connect(const struct device *dev, struct wifi_connect_req_
 	strncpy(ctrl_msg.req_connect_ap.ssid, params->ssid, ESP_HOSTED_MAX_SSID_LEN);
 	esp_hosted_mac_to_str(params->bssid, ctrl_msg.req_connect_ap.bssid.bytes);
 
-	if (esp_hosted_ctrl(dev, CtrlMsgId_Req_ConnectAP, &ctrl_msg, 0)) {
+	if (esp_hosted_ctrl(dev, CtrlMsgId_Req_ConnectAP, &ctrl_msg, ESP_HOSTED_SYNC_TIMEOUT)) {
 		return -EAGAIN;
 	}
+
+#if defined(CONFIG_WIFI_ESP_HOSTED_LEGACY)
+	esp_hosted_data_t *data = dev->data;
+
+	/* Legacy connect response is synchronous */
+	data->state[ESP_HOSTED_STA_IF] = WIFI_STATE_COMPLETED;
+	net_if_dormant_off(data->iface[ESP_HOSTED_STA_IF]);
+	wifi_mgmt_raise_connect_result_event(data->iface[ESP_HOSTED_STA_IF], 0);
+#endif /* CONFIG_WIFI_ESP_HOSTED_LEGACY */
 	return 0;
 }
 
@@ -602,6 +613,21 @@ static int esp_hosted_dev_init(const struct device *dev)
 		return -EIO;
 	}
 
+	/* Read firmware version */
+#if defined(CONFIG_WIFI_ESP_HOSTED_LEGACY)
+	LOG_INF("firmware version: v0.0.5 (legacy)");
+#else
+	ctrl_msg = (CtrlMsg)CtrlMsg_init_zero;
+	if (esp_hosted_ctrl(dev, CtrlMsgId_Req_GetFwVersion, &ctrl_msg, ESP_HOSTED_SYNC_TIMEOUT)) {
+		return -EIO;
+	}
+
+	CtrlMsg_Resp_GetFwVersion * fw = &ctrl_msg.resp_get_fw_version;
+
+	LOG_INF("firmware version: v%u.%u.%u.%u.%u", fw->major1, fw->major2, fw->minor,
+		fw->rev_patch1, fw->rev_patch2);
+#endif /* CONFIG_WIFI_ESP_HOSTED_LEGACY */
+
 	/* Set MAC addresses. */
 	for (size_t i = 0; i < 2; i++) {
 		ctrl_msg.req_get_mac_address.mode = i + 1;

dts/bindings/wifi/espressif,esp-hosted.yaml

@@ -21,6 +21,14 @@ properties:
     required: true
 
   spi-cs-setup-delay-ns:
+    type: int
     default: 10000
+
   spi-cs-hold-delay-ns:
+    type: int
     default: 10000
+
+  legacy-protocol:
+    type: boolean
+    description:
+      Set this property if the device is running legacy (<= v0.0.5) firmware.