Commit c72aa32d authored by Anilkumar Kolli's avatar Anilkumar Kolli Committed by Kalle Valo
Browse files

ath11k: use hw_params to access board_size and cal_offset 



Reuse board_size from hw_params, add cal_offset to hw params.
This patch is clean up only, there is no change in functionality.

cal_size was unused, so remove that.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01838-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarAnilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210721201927.100369-2-jouni@codeaurora.org
parent eb19efed

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

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "IPQ8074/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,
@@ -88,7 +88,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "IPQ6018/hw1.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 2,

		.bdf_addr = 0x4ABC0000,
@@ -136,7 +136,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "QCA6390/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,
@@ -183,7 +183,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "QCN9074/hw1.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 1,

		.single_pdev_only = false,
@@ -230,7 +230,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "WCN6855/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,

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

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct ath11k_hw_params { 
	struct {

		const char *dir;

		size_t board_size;

		size_t cal_size;

		size_t cal_offset;

	} fw;



	const struct ath11k_hw_ops *hw_ops;

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

+2 −2
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ ath11k_qmi_prepare_bdf_download(struct ath11k_base *ab, int type, 
		fw_size = min_t(u32, ab->hw_params.fw.board_size,

				fw_entry->size);



		memcpy_toio(bdf_addr + ATH11K_QMI_CALDATA_OFFSET,

		memcpy_toio(bdf_addr + ab->hw_params.fw.cal_offset,

			    fw_entry->data, fw_size);



		release_firmware(fw_entry);
@@ -1979,7 +1979,7 @@ static int ath11k_qmi_load_bdf_fixed_addr(struct ath11k_base *ab) 
		return -ENOMEM;

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



	bdf_addr = ioremap(ab->hw_params.bdf_addr, ATH11K_QMI_BDF_MAX_SIZE);

	bdf_addr = ioremap(ab->hw_params.bdf_addr, ab->hw_params.fw.board_size);

	if (!bdf_addr) {

		ath11k_warn(ab, "failed ioremap for board file\n");

		ret = -EIO;

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

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#define ATH11K_QMI_WLANFW_TIMEOUT_MS		5000

#define ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE	64

#define ATH11K_QMI_CALDB_ADDRESS		0x4BA00000

#define ATH11K_QMI_BDF_MAX_SIZE			(256 * 1024)

#define ATH11K_QMI_CALDATA_OFFSET		(128 * 1024)

#define ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01	128

#define ATH11K_QMI_WLFW_SERVICE_ID_V01		0x45

#define ATH11K_QMI_WLFW_SERVICE_VERS_V01	0x01