Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133a3676 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Support new QMI framework"

parents 0c55f433 393eb1e3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static void cnss_driver_event_work(struct work_struct *work)

		switch (event->type) {
		case CNSS_DRIVER_EVENT_SERVER_ARRIVE:
			ret = cnss_wlfw_server_arrive(plat_priv);
			ret = cnss_wlfw_server_arrive(plat_priv, event->data);
			break;
		case CNSS_DRIVER_EVENT_SERVER_EXIT:
			ret = cnss_wlfw_server_exit(plat_priv);
+1 −3
Original line number Diff line number Diff line
@@ -228,9 +228,7 @@ struct cnss_plat_data {
	spinlock_t event_lock; /* spinlock for driver work event handling */
	struct work_struct event_work;
	struct workqueue_struct *event_wq;
	struct qmi_handle *qmi_wlfw_clnt;
	struct work_struct qmi_recv_msg_work;
	struct notifier_block qmi_wlfw_clnt_nb;
	struct qmi_handle qmi_wlfw;
	struct wlfw_rf_chip_info chip_info;
	struct wlfw_rf_board_info board_info;
	struct wlfw_soc_info soc_info;
+718 −524

File changed.

Preview size limit exceeded, changes collapsed.

+8 −2
Original line number Diff line number Diff line
@@ -18,10 +18,15 @@ struct cnss_plat_data;
#ifdef CONFIG_CNSS2_QMI
#include "wlan_firmware_service_v01.h"

struct cnss_qmi_event_server_arrive_data {
	unsigned int node;
	unsigned int port;
};

int cnss_qmi_init(struct cnss_plat_data *plat_priv);
void cnss_qmi_deinit(struct cnss_plat_data *plat_priv);
unsigned int cnss_get_qmi_timeout(void);
int cnss_wlfw_server_arrive(struct cnss_plat_data *plat_priv);
int cnss_wlfw_server_arrive(struct cnss_plat_data *plat_priv, void *data);
int cnss_wlfw_server_exit(struct cnss_plat_data *plat_priv);
int cnss_wlfw_respond_mem_send_sync(struct cnss_plat_data *plat_priv);
int cnss_wlfw_tgt_cap_send_sync(struct cnss_plat_data *plat_priv);
@@ -57,7 +62,8 @@ static inline unsigned int cnss_get_qmi_timeout(void)
	return QMI_WLFW_TIMEOUT_MS;
}

static inline int cnss_wlfw_server_arrive(struct cnss_plat_data *plat_priv)
static inline int cnss_wlfw_server_arrive(struct cnss_plat_data *plat_priv,
					  void *data)
{
	return 0;
}
+83 −83

File changed.

Preview size limit exceeded, changes collapsed.

Loading