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

Commit 1c61bedc authored by Erik Stromdahl's avatar Erik Stromdahl Committed by Kalle Valo
Browse files

ath10k: fetch firmware images in a loop 



To make it easier to handle minimum and maximum firmware API numbers convert
the firmware fetch functionality to a loop. If no firmware image is found print
an error with minimum and maximum API numbers and the name of firmware
directory. This is needed when we switch to using request_firmware_direct()
which doesn't print any errors anymore.

Also add a new function for creating the fw file name dynamically which makes it
easier to add new bus support, for example SDIO and USB, later.

Signed-off-by: default avatarErik Stromdahl <erik.stromdahl@gmail.com>
[kvalo@qca.qualcomm.com: remove sdio/usb part, new error message, clarify commit log]
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 1427228d

drivers/net/wireless/ath/ath10k/core.c

+23 −28
Original line number Original line Diff line number Diff line
@@ -1358,43 +1358,38 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
	return ret;

	return ret;

}

}





static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name,

				    size_t fw_name_len, int fw_api)

{

	scnprintf(fw_name, fw_name_len, "%s-%d.bin", ATH10K_FW_FILE_BASE, fw_api);

}



static int ath10k_core_fetch_firmware_files(struct ath10k *ar)

static int ath10k_core_fetch_firmware_files(struct ath10k *ar)

{

{

	int ret;

	int ret, i;

	char fw_name[100];





	/* calibration file is optional, don't check for any errors */

	/* calibration file is optional, don't check for any errors */

	ath10k_fetch_cal_file(ar);

	ath10k_fetch_cal_file(ar);





	ar->fw_api = 5;

	for (i = ATH10K_FW_API_MAX; i >= ATH10K_FW_API_MIN; i--) {

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

		ar->fw_api = i;



		ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n",

	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API5_FILE,

			   ar->fw_api);

					       &ar->normal_mode_fw.fw_file);

	if (ret == 0)

		goto success;





	ar->fw_api = 4;

		ath10k_core_get_fw_name(ar, fw_name, sizeof(fw_name), ar->fw_api);

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

		ret = ath10k_core_fetch_firmware_api_n(ar, fw_name,



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API4_FILE,

						       &ar->normal_mode_fw.fw_file);

						       &ar->normal_mode_fw.fw_file);

	if (ret == 0)

		if (!ret)

			goto success;

			goto success;

	}





	ar->fw_api = 3;

	/* we end up here if we couldn't fetch any firmware */

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);





	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API3_FILE,

	ath10k_err(ar, "Failed to find firmware-N.bin (N between %d and %d) from %s: %d",

					       &ar->normal_mode_fw.fw_file);

		   ATH10K_FW_API_MIN, ATH10K_FW_API_MAX, ar->hw_params.fw.dir,

	if (ret == 0)

		   ret);

		goto success;



	ar->fw_api = 2;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);





	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API2_FILE,

					       &ar->normal_mode_fw.fw_file);

	if (ret)

	return ret;

	return ret;





success:

success:

drivers/net/wireless/ath/ath10k/hw.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,10 @@ enum qca9377_chip_id_rev { 
#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234

#define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234





#define ATH10K_FW_FILE_BASE		"firmware"

#define ATH10K_FW_API_MAX		5

#define ATH10K_FW_API_MIN		2



#define ATH10K_FW_API2_FILE		"firmware-2.bin"

#define ATH10K_FW_API2_FILE		"firmware-2.bin"

#define ATH10K_FW_API3_FILE		"firmware-3.bin"

#define ATH10K_FW_API3_FILE		"firmware-3.bin"