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

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

Merge "cnss2: Add support to download regdb file to firmware"

parents 0e94b3ea 5b57b494

drivers/net/wireless/cnss2/main.c

+4 −1
Original line number Diff line number Diff line
@@ -365,7 +365,10 @@ static int cnss_fw_mem_ready_hdlr(struct cnss_plat_data *plat_priv) 
	if (ret)

		goto out;



	ret = cnss_wlfw_bdf_dnld_send_sync(plat_priv);

	cnss_wlfw_bdf_dnld_send_sync(plat_priv, CNSS_BDF_REGDB);



	ret = cnss_wlfw_bdf_dnld_send_sync(plat_priv,

					   plat_priv->ctrl_params.bdf_type);

	if (ret)

		goto out;

drivers/net/wireless/cnss2/main.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ enum cnss_debug_quirks { 
enum cnss_bdf_type {

	CNSS_BDF_BIN,

	CNSS_BDF_ELF,

	CNSS_BDF_REGDB = 4,

	CNSS_BDF_DUMMY = 255,

};

drivers/net/wireless/cnss2/qmi.c

+11 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define ELF_BDF_FILE_NAME_PREFIX	"bdwlan.e"

#define BIN_BDF_FILE_NAME		"bdwlan.bin"

#define BIN_BDF_FILE_NAME_PREFIX	"bdwlan.b"

#define REGDB_FILE_NAME			"regdb.bin"

#define DUMMY_BDF_FILE_NAME		"bdwlan.dmy"



#define QMI_WLFW_TIMEOUT_MS		(plat_priv->ctrl_params.qmi_timeout)
@@ -413,7 +414,8 @@ int cnss_wlfw_tgt_cap_send_sync(struct cnss_plat_data *plat_priv) 
	return ret;

}



int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv)

int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv,

				 u32 bdf_type)

{

	struct wlfw_bdf_download_req_msg_v01 *req;

	struct wlfw_bdf_download_resp_msg_v01 *resp;
@@ -425,8 +427,8 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
	int ret = 0;

	const char *fw_path;



	cnss_pr_dbg("Sending BDF download message, state: 0x%lx\n",

		    plat_priv->driver_state);

	cnss_pr_dbg("Sending BDF download message, state: 0x%lx, type: %d\n",

		    plat_priv->driver_state, bdf_type);



	req = kzalloc(sizeof(*req), GFP_KERNEL);

	if (!req)
@@ -439,7 +441,7 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
	}



	fw_path = cnss_get_fw_path(plat_priv);

	switch (plat_priv->ctrl_params.bdf_type) {

	switch (bdf_type) {

	case CNSS_BDF_ELF:

		if (plat_priv->board_info.board_id == 0xFF)

			snprintf(filename, sizeof(filename),
@@ -466,6 +468,9 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
				 "%s" BIN_BDF_FILE_NAME_PREFIX "%04x",

				 fw_path, plat_priv->board_info.board_id);

		break;

	case CNSS_BDF_REGDB:

		snprintf(filename, sizeof(filename), REGDB_FILE_NAME);

		break;

	case CNSS_BDF_DUMMY:

		cnss_pr_dbg("CNSS_BDF_DUMMY is set, sending dummy BDF\n");

		snprintf(filename, sizeof(filename),
@@ -560,6 +565,7 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
	if (plat_priv->ctrl_params.bdf_type != CNSS_BDF_DUMMY)

		release_firmware(fw_entry);

err_req_fw:

	if (bdf_type != CNSS_BDF_REGDB)

		CNSS_ASSERT(0);

	kfree(req);

	kfree(resp);

drivers/net/wireless/cnss2/qmi.h

+4 −2
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 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);

int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv);

int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv,

				 u32 bdf_type);

int cnss_wlfw_m3_dnld_send_sync(struct cnss_plat_data *plat_priv);

int cnss_wlfw_wlan_mode_send_sync(struct cnss_plat_data *plat_priv,

				  enum cnss_driver_mode mode);
@@ -103,7 +104,8 @@ static inline int cnss_wlfw_tgt_cap_send_sync(struct cnss_plat_data *plat_priv) 
	return 0;

}



static inline int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv)

static inline int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv,

					       u32 bdf_type)

{

	return 0;

}