Commit de0ff461 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Kalle Valo
Browse files

wifi: ath10k: drop chip-specific board data file name 



The .fw.board parameter predates board-2.bin support. For all the
platforms, which define this parameter, it is equal to "board.bin".
Other platforms (like WCN3990) ommit it, limiting the ability to
provide board-specific data file.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240130-wcn3990-board-fw-v1-2-738f7c19a8c8@linaro.org
parent f1f1b5b0

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

+1 −22
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 2116,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.board = QCA988X_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA988X_BOARD_DATA_SZ,

			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},
@@ -116,7 +115,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 2116,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.board = QCA988X_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA988X_BOARD_DATA_SZ,

			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},
@@ -158,7 +156,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 2116,

		.fw = {

			.dir = QCA9887_HW_1_0_FW_DIR,

			.board = QCA9887_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9887_BOARD_DATA_SZ,

			.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,

		},
@@ -199,7 +196,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 0,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,

			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},
@@ -236,7 +232,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.board = QCA6174_HW_2_1_BOARD_DATA_FILE,

			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},
@@ -277,7 +272,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.board = QCA6174_HW_2_1_BOARD_DATA_FILE,

			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},
@@ -318,7 +312,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,

			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},
@@ -360,7 +353,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.fw = {

			/* uses same binaries as hw3.0 */

			.dir = QCA6174_HW_3_0_FW_DIR,

			.board = QCA6174_HW_3_0_BOARD_DATA_FILE,

			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},
@@ -409,7 +401,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 12064,

		.fw = {

			.dir = QCA99X0_HW_2_0_FW_DIR,

			.board = QCA99X0_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA99X0_BOARD_DATA_SZ,

			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},
@@ -457,7 +448,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 12064,

		.fw = {

			.dir = QCA9984_HW_1_0_FW_DIR,

			.board = QCA9984_HW_1_0_BOARD_DATA_FILE,

			.eboard = QCA9984_HW_1_0_EBOARD_DATA_FILE,

			.board_size = QCA99X0_BOARD_DATA_SZ,

			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
@@ -510,7 +500,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 12064,

		.fw = {

			.dir = QCA9888_HW_2_0_FW_DIR,

			.board = QCA9888_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA99X0_BOARD_DATA_SZ,

			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},
@@ -556,7 +545,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},
@@ -597,7 +585,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},
@@ -640,7 +627,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 8124,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},
@@ -680,7 +666,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.cal_data_len = 12064,

		.fw = {

			.dir = QCA4019_HW_1_0_FW_DIR,

			.board = QCA4019_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA4019_BOARD_DATA_SZ,

			.board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,

		},
@@ -720,7 +705,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.max_spatial_stream = 4,

		.fw = {

			.dir = WCN3990_HW_1_0_FW_DIR,

			.board = WCN3990_HW_1_0_BOARD_DATA_FILE,

			.board_size = WCN3990_BOARD_DATA_SZ,

			.board_ext_size = WCN3990_BOARD_EXT_DATA_SZ,

		},
@@ -1300,11 +1284,6 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type) 
	char boardname[100];



	if (bd_ie_type == ATH10K_BD_IE_BOARD) {

		if (!ar->hw_params.fw.board) {

			ath10k_err(ar, "failed to find board file fw entry\n");

			return -EINVAL;

		}



		scnprintf(boardname, sizeof(boardname), "board-%s-%s.bin",

			  ath10k_bus_str(ar->hif.bus), dev_name(ar->dev));
@@ -1314,7 +1293,7 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type) 
		if (IS_ERR(ar->normal_mode_fw.board)) {

			fw = ath10k_fetch_fw_file(ar,

						  ar->hw_params.fw.dir,

						  ar->hw_params.fw.board);

						  ATH10K_BOARD_DATA_FILE);

			ar->normal_mode_fw.board = fw;

		}

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

+1 −11
Original line number Diff line number Diff line
@@ -39,14 +39,12 @@ enum ath10k_bus { 
#define QCA988X_HW_2_0_VERSION		0x4100016c

#define QCA988X_HW_2_0_CHIP_ID_REV	0x2

#define QCA988X_HW_2_0_FW_DIR		ATH10K_FW_DIR "/QCA988X/hw2.0"

#define QCA988X_HW_2_0_BOARD_DATA_FILE	"board.bin"

#define QCA988X_HW_2_0_PATCH_LOAD_ADDR	0x1234



/* QCA9887 1.0 definitions */

#define QCA9887_HW_1_0_VERSION		0x4100016d

#define QCA9887_HW_1_0_CHIP_ID_REV	0

#define QCA9887_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9887/hw1.0"

#define QCA9887_HW_1_0_BOARD_DATA_FILE	"board.bin"

#define QCA9887_HW_1_0_PATCH_LOAD_ADDR	0x1234



/* QCA6174 target BMI version signatures */
@@ -85,11 +83,9 @@ enum qca9377_chip_id_rev { 
};



#define QCA6174_HW_2_1_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw2.1"

#define QCA6174_HW_2_1_BOARD_DATA_FILE	"board.bin"

#define QCA6174_HW_2_1_PATCH_LOAD_ADDR	0x1234



#define QCA6174_HW_3_0_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw3.0"

#define QCA6174_HW_3_0_BOARD_DATA_FILE	"board.bin"

#define QCA6174_HW_3_0_PATCH_LOAD_ADDR	0x1234



/* QCA99X0 1.0 definitions (unsupported) */
@@ -99,7 +95,6 @@ enum qca9377_chip_id_rev { 
#define QCA99X0_HW_2_0_DEV_VERSION     0x01000000

#define QCA99X0_HW_2_0_CHIP_ID_REV     0x1

#define QCA99X0_HW_2_0_FW_DIR          ATH10K_FW_DIR "/QCA99X0/hw2.0"

#define QCA99X0_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA99X0_HW_2_0_PATCH_LOAD_ADDR	0x1234



/* QCA9984 1.0 defines */
@@ -107,7 +102,6 @@ enum qca9377_chip_id_rev { 
#define QCA9984_HW_DEV_TYPE		0xa

#define QCA9984_HW_1_0_CHIP_ID_REV	0x0

#define QCA9984_HW_1_0_FW_DIR		ATH10K_FW_DIR "/QCA9984/hw1.0"

#define QCA9984_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA9984_HW_1_0_EBOARD_DATA_FILE "eboard.bin"

#define QCA9984_HW_1_0_PATCH_LOAD_ADDR	0x1234
@@ -116,24 +110,20 @@ enum qca9377_chip_id_rev { 
#define QCA9888_HW_DEV_TYPE		0xc

#define QCA9888_HW_2_0_CHIP_ID_REV	0x0

#define QCA9888_HW_2_0_FW_DIR		ATH10K_FW_DIR "/QCA9888/hw2.0"

#define QCA9888_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA9888_HW_2_0_PATCH_LOAD_ADDR	0x1234



/* QCA9377 1.0 definitions */

#define QCA9377_HW_1_0_FW_DIR          ATH10K_FW_DIR "/QCA9377/hw1.0"

#define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA9377_HW_1_0_PATCH_LOAD_ADDR	0x1234



/* QCA4019 1.0 definitions */

#define QCA4019_HW_1_0_DEV_VERSION     0x01000000

#define QCA4019_HW_1_0_FW_DIR          ATH10K_FW_DIR "/QCA4019/hw1.0"

#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234



/* WCN3990 1.0 definitions */

#define WCN3990_HW_1_0_DEV_VERSION	ATH10K_HW_WCN3990

#define WCN3990_HW_1_0_FW_DIR		ATH10K_FW_DIR "/WCN3990/hw1.0"

#define WCN3990_HW_1_0_BOARD_DATA_FILE "board.bin"



#define ATH10K_FW_FILE_BASE		"firmware"

#define ATH10K_FW_API_MAX		6
@@ -160,6 +150,7 @@ enum qca9377_chip_id_rev { 
#define ATH10K_FIRMWARE_MAGIC               "QCA-ATH10K"

#define ATH10K_BOARD_MAGIC                  "QCA-ATH10K-BOARD"



#define ATH10K_BOARD_DATA_FILE         "board.bin"

#define ATH10K_BOARD_API2_FILE         "board-2.bin"



#define REG_DUMP_COUNT_QCA988X 60
@@ -554,7 +545,6 @@ struct ath10k_hw_params { 


	struct ath10k_hw_params_fw {

		const char *dir;

		const char *board;

		size_t board_size;

		const char *eboard;

		size_t ext_board_size;

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

+5 −5
Original line number Diff line number Diff line
@@ -3826,28 +3826,28 @@ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE); 
MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API3_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA9887 1.0 firmware files */

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" QCA9887_HW_1_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA6174 2.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" QCA6174_HW_2_1_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA6174 3.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API6_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" QCA6174_HW_3_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);



/* QCA9377 1.0 firmware files */

MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API6_FILE);

MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" QCA9377_HW_1_0_BOARD_DATA_FILE);
 
MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);