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

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

Merge "cnss2: Print firmware build ID during boot up"

parents 062ed3f5 e6c1e8f5

drivers/net/wireless/cnss2/main.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define MAX_NO_OF_MAC_ADDR		4

#define QMI_WLFW_MAX_TIMESTAMP_LEN	32

#define QMI_WLFW_MAX_NUM_MEM_SEG	32

#define QMI_WLFW_MAX_BUILD_ID_LEN	128

#define CNSS_RDDM_TIMEOUT_MS		20000

#define RECOVERY_TIMEOUT		60000

#define TIME_CLOCK_FREQ_HZ		19200000
@@ -325,6 +326,7 @@ struct cnss_plat_data { 
	struct wlfw_rf_board_info board_info;

	struct wlfw_soc_info soc_info;

	struct wlfw_fw_version_info fw_version_info;

	char fw_build_id[QMI_WLFW_MAX_BUILD_ID_LEN + 1];

	u32 otp_version;

	u32 fw_mem_seg_len;

	struct cnss_fw_mem fw_mem[QMI_WLFW_MAX_NUM_MEM_SEG];

drivers/net/wireless/cnss2/qmi.c

+5 −1
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ int cnss_wlfw_tgt_cap_send_sync(struct cnss_plat_data *plat_priv) 
			resp->fw_version_info.fw_build_timestamp,

			QMI_WLFW_MAX_TIMESTAMP_LEN + 1);

	}

	if (resp->fw_build_id_valid)

		strlcpy(plat_priv->fw_build_id, resp->fw_build_id,

			QMI_WLFW_MAX_BUILD_ID_LEN + 1);

	if (resp->voltage_mv_valid) {

		plat_priv->cpr_info.voltage = resp->voltage_mv;

		cnss_pr_dbg("Voltage for CPR: %dmV\n",
@@ -415,12 +418,13 @@ int cnss_wlfw_tgt_cap_send_sync(struct cnss_plat_data *plat_priv) 
	if (resp->otp_version_valid)

		plat_priv->otp_version = resp->otp_version;



	cnss_pr_dbg("Target capability: chip_id: 0x%x, chip_family: 0x%x, board_id: 0x%x, soc_id: 0x%x, fw_version: 0x%x, fw_build_timestamp: %s, otp_version: 0x%x\n",

	cnss_pr_dbg("Target capability: chip_id: 0x%x, chip_family: 0x%x, board_id: 0x%x, soc_id: 0x%x, fw_version: 0x%x, fw_build_timestamp: %s, fw_build_id: %s, otp_version: 0x%x\n",

		    plat_priv->chip_info.chip_id,

		    plat_priv->chip_info.chip_family,

		    plat_priv->board_info.board_id, plat_priv->soc_info.soc_id,

		    plat_priv->fw_version_info.fw_version,

		    plat_priv->fw_version_info.fw_build_timestamp,

		    plat_priv->fw_build_id,

		    plat_priv->otp_version);



	kfree(req);