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

Commit 50d41234 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath6kl: add support for firmware API 2 format 



In the new format all the format images are embedded into one file.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent cfc301ed

drivers/net/wireless/ath/ath6kl/core.h

+20 −0
Original line number Diff line number Diff line
@@ -58,6 +58,23 @@ 
#define A_DEFAULT_LISTEN_INTERVAL         100

#define A_MAX_WOW_LISTEN_INTERVAL         1000



/* includes also the null byte */

#define ATH6KL_FIRMWARE_MAGIC               "QCA-ATH6KL"



enum ath6kl_fw_ie_type {

	ATH6KL_FW_IE_FW_VERSION = 0,

	ATH6KL_FW_IE_TIMESTAMP = 1,

	ATH6KL_FW_IE_OTP_IMAGE = 2,

	ATH6KL_FW_IE_FW_IMAGE = 3,

	ATH6KL_FW_IE_PATCH_IMAGE = 4,

};



struct ath6kl_fw_ie {

	__le32 id;

	__le32 len;

	u8 data[0];

};



/* AR6003 1.0 definitions */

#define AR6003_REV1_VERSION                 0x300002ba
@@ -68,6 +85,7 @@ 
#define AR6003_REV2_FIRMWARE_FILE           "ath6k/AR6003/hw2.0/athwlan.bin.z77"

#define AR6003_REV2_TCMD_FIRMWARE_FILE      "ath6k/AR6003/hw2.0/athtcmd_ram.bin"

#define AR6003_REV2_PATCH_FILE              "ath6k/AR6003/hw2.0/data.patch.bin"

#define AR6003_REV2_FIRMWARE_2_FILE         "ath6k/AR6003/hw2.0/fw-2.bin"

#define AR6003_REV2_BOARD_DATA_FILE         "ath6k/AR6003/hw2.0/bdata.bin"

#define AR6003_REV2_DEFAULT_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin"
@@ -77,6 +95,7 @@ 
#define AR6003_REV3_FIRMWARE_FILE           "ath6k/AR6003/hw2.1.1/athwlan.bin"

#define AR6003_REV3_TCMD_FIRMWARE_FILE    "ath6k/AR6003/hw2.1.1/athtcmd_ram.bin"

#define AR6003_REV3_PATCH_FILE            "ath6k/AR6003/hw2.1.1/data.patch.bin"

#define AR6003_REV3_FIRMWARE_2_FILE           "ath6k/AR6003/hw2.1.1/fw-2.bin"

#define AR6003_REV3_BOARD_DATA_FILE       "ath6k/AR6003/hw2.1.1/bdata.bin"

#define AR6003_REV3_DEFAULT_BOARD_DATA_FILE	\

	"ath6k/AR6003/hw2.1.1/bdata.SD31.bin"
@@ -84,6 +103,7 @@ 
/* AR6004 1.0 definitions */

#define AR6004_REV1_VERSION                 0x30000623

#define AR6004_REV1_FIRMWARE_FILE           "ath6k/AR6004/hw6.1/fw.ram.bin"

#define AR6004_REV1_FIRMWARE_2_FILE         "ath6k/AR6004/hw6.1/fw-2.bin"

#define AR6004_REV1_BOARD_DATA_FILE         "ath6k/AR6004/hw6.1/bdata.bin"

#define AR6004_REV1_DEFAULT_BOARD_DATA_FILE "ath6k/AR6004/hw6.1/bdata.DB132.bin"

#define AR6004_REV1_EPPING_FIRMWARE_FILE "ath6k/AR6004/hw6.1/endpointping.bin"

drivers/net/wireless/ath/ath6kl/init.c

+131 −5
Original line number Diff line number Diff line
@@ -917,14 +917,10 @@ static int ath6kl_fetch_patch_file(struct ath6kl *ar) 
	return 0;

}



static int ath6kl_fetch_firmwares(struct ath6kl *ar)

static int ath6kl_fetch_fw_api1(struct ath6kl *ar)

{

	int ret;



	ret = ath6kl_fetch_board_file(ar);

	if (ret)

		return ret;



	ret = ath6kl_fetch_otp_file(ar);

	if (ret)

		return ret;
@@ -940,6 +936,136 @@ static int ath6kl_fetch_firmwares(struct ath6kl *ar) 
	return 0;

}



static int ath6kl_fetch_fw_api2(struct ath6kl *ar)

{

	size_t magic_len, len, ie_len;

	const struct firmware *fw;

	struct ath6kl_fw_ie *hdr;

	const char *filename;

	const u8 *data;

	int ret, ie_id;



	switch (ar->version.target_ver) {

	case AR6003_REV2_VERSION:

		filename = AR6003_REV2_FIRMWARE_2_FILE;

		break;

	case AR6003_REV3_VERSION:

		filename = AR6003_REV3_FIRMWARE_2_FILE;

		break;

	case AR6004_REV1_VERSION:

		filename = AR6004_REV1_FIRMWARE_2_FILE;

		break;

	default:

		return -EOPNOTSUPP;

	}



	ret = request_firmware(&fw, filename, ar->dev);

	if (ret)

		return ret;



	data = fw->data;

	len = fw->size;



	/* magic also includes the null byte, check that as well */

	magic_len = strlen(ATH6KL_FIRMWARE_MAGIC) + 1;



	if (len < magic_len) {

		ret = -EINVAL;

		goto out;

	}



	if (memcmp(data, ATH6KL_FIRMWARE_MAGIC, magic_len) != 0) {

		ret = -EINVAL;

		goto out;

	}



	len -= magic_len;

	data += magic_len;



	/* loop elements */

	while (len > sizeof(struct ath6kl_fw_ie)) {

		/* hdr is unaligned! */

		hdr = (struct ath6kl_fw_ie *) data;



		ie_id = le32_to_cpup(&hdr->id);

		ie_len = le32_to_cpup(&hdr->len);



		len -= sizeof(*hdr);

		data += sizeof(*hdr);



		if (len < ie_len) {

			ret = -EINVAL;

			goto out;

		}



		switch (ie_id) {

		case ATH6KL_FW_IE_OTP_IMAGE:

			ar->fw_otp = kmemdup(data, ie_len, GFP_KERNEL);



			if (ar->fw_otp == NULL) {

				ret = -ENOMEM;

				goto out;

			}



			ar->fw_otp_len = ie_len;

			break;

		case ATH6KL_FW_IE_FW_IMAGE:

			ar->fw = kmemdup(data, ie_len, GFP_KERNEL);



			if (ar->fw == NULL) {

				ret = -ENOMEM;

				goto out;

			}



			ar->fw_len = ie_len;

			break;

		case ATH6KL_FW_IE_PATCH_IMAGE:

			ar->fw_patch = kmemdup(data, ie_len, GFP_KERNEL);



			if (ar->fw_patch == NULL) {

				ret = -ENOMEM;

				goto out;

			}



			ar->fw_patch_len = ie_len;

			break;

		default:

			ath6kl_dbg(ATH6KL_DBG_TRC, "Unknown fw ie: %u\n",

				   le32_to_cpup(&hdr->id));

			break;

		}



		len -= ie_len;

		data += ie_len;

	};



	ret = 0;

out:

	release_firmware(fw);



	return ret;

}



static int ath6kl_fetch_firmwares(struct ath6kl *ar)

{

	int ret;



	ret = ath6kl_fetch_board_file(ar);

	if (ret)

		return ret;



	ret = ath6kl_fetch_fw_api2(ar);

	if (ret == 0)

		/* fw api 2 found, use it */

		return 0;



	ret = ath6kl_fetch_fw_api1(ar);

	if (ret)

		return ret;



	return 0;

}



static int ath6kl_upload_board_file(struct ath6kl *ar)

{

	u32 board_address, board_ext_address, param;