Commit 72a9bff3 authored by Hari Chandrakanthan's avatar Hari Chandrakanthan Committed by Kalle Valo
Browse files

ath11k: change fw build id format in driver init log 



Currently fw build id is printed during init as follows.

fw_version 0x250684a5 fw_build_timestamp 2021-07-13 10:57
fw_build_id QC_IMAGE_VERSION_STRING=WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1

The string "QC_IMAGE_VERSION_STRING=" is removed from the log
to improve readability.

With this patch the fw build id is printed during init as follows.
fw_version 0x250684a5 fw_build_timestamp 2021-07-13 10:57
fw_build_id WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarHari Chandrakanthan <quic_haric@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/1646825065-7736-1-git-send-email-quic_haric@quicinc.com
parent 997dc60f

drivers/net/wireless/ath/ath11k/qmi.c

+10 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#define SLEEP_CLOCK_SELECT_INTERNAL_BIT	0x02

#define HOST_CSTATE_BIT			0x04



#define FW_BUILD_ID_MASK "QC_IMAGE_VERSION_STRING="



bool ath11k_cold_boot_cal = 1;

EXPORT_SYMBOL(ath11k_cold_boot_cal);

module_param_named(cold_boot_cal, ath11k_cold_boot_cal, bool, 0644);
@@ -2008,6 +2010,8 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab) 
	struct qmi_txn txn;

	int ret = 0;

	int r;

	char *fw_build_id;

	int fw_build_id_mask_len;



	memset(&req, 0, sizeof(req));

	memset(&resp, 0, sizeof(resp));
@@ -2073,6 +2077,11 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab) 
		ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi cal data supported from eeprom\n");

	}



	fw_build_id = ab->qmi.target.fw_build_id;

	fw_build_id_mask_len = strlen(FW_BUILD_ID_MASK);

	if (!strncmp(fw_build_id, FW_BUILD_ID_MASK, fw_build_id_mask_len))

		fw_build_id = fw_build_id + fw_build_id_mask_len;



	ath11k_info(ab, "chip_id 0x%x chip_family 0x%x board_id 0x%x soc_id 0x%x\n",

		    ab->qmi.target.chip_id, ab->qmi.target.chip_family,

		    ab->qmi.target.board_id, ab->qmi.target.soc_id);
@@ -2080,7 +2089,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab) 
	ath11k_info(ab, "fw_version 0x%x fw_build_timestamp %s fw_build_id %s",

		    ab->qmi.target.fw_version,

		    ab->qmi.target.fw_build_timestamp,

		    ab->qmi.target.fw_build_id);

		    fw_build_id);



	r = ath11k_core_check_dt(ab);

	if (r)