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

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

ath6kl: firmware boot fixes for ar6004 



These have changed a bit since last time ar6004 code was commited.

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

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

+24 −10
Original line number Diff line number Diff line
@@ -821,6 +821,9 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar) 
	case AR6004_REV1_VERSION:

		filename = AR6004_REV1_FIRMWARE_2_FILE;

		break;

	case AR6004_REV2_VERSION:

		filename = AR6004_REV2_FIRMWARE_2_FILE;

		break;

	default:

		return -EOPNOTSUPP;

	}
@@ -995,7 +998,11 @@ static int ath6kl_upload_board_file(struct ath6kl *ar) 
	 * writing board data.

	 */

	if (ar->target_type == TARGET_TYPE_AR6004) {

		if (ar->version.target_ver == AR6004_REV1_VERSION)

			board_address = AR6004_REV1_BOARD_DATA_ADDRESS;

		else

			board_address = AR6004_REV2_BOARD_DATA_ADDRESS;



		ath6kl_bmi_write(ar,

				ath6kl_get_hi_item_addr(ar,

				HI_ITEM(hi_board_data)),
@@ -1013,7 +1020,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar) 
			HI_ITEM(hi_board_ext_data)),

			(u8 *) &board_ext_address, 4);



	if (board_ext_address == 0) {

	if (ar->target_type == TARGET_TYPE_AR6003 &&

	    board_ext_address == 0) {

		ath6kl_err("Failed to get board file target address.\n");

		return -EINVAL;

	}
@@ -1033,8 +1041,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar) 
		break;

	}



	if (ar->fw_board_len == (board_data_size +

				 board_ext_data_size)) {

	if (board_ext_address &&

	    ar->fw_board_len == (board_data_size + board_ext_data_size)) {



		/* write extended board data */

		ath6kl_dbg(ATH6KL_DBG_BOOT,
@@ -1092,8 +1100,8 @@ static int ath6kl_upload_otp(struct ath6kl *ar) 
	bool from_hw = false;

	int ret;



	if (WARN_ON(ar->fw_otp == NULL))

		return -ENOENT;

	if (ar->fw_otp == NULL)

		return 0;



	address = ar->hw.app_load_addr;
@@ -1142,7 +1150,7 @@ static int ath6kl_upload_firmware(struct ath6kl *ar) 
	int ret;



	if (WARN_ON(ar->fw == NULL))

		return -ENOENT;

		return 0;



	address = ar->hw.app_load_addr;
@@ -1172,8 +1180,8 @@ static int ath6kl_upload_patch(struct ath6kl *ar) 
	u32 address, param;

	int ret;



	if (WARN_ON(ar->fw_patch == NULL))

		return -ENOENT;

	if (ar->fw_patch == NULL)

		return 0;



	address = ar->hw.dataset_patch_addr;
@@ -1346,10 +1354,16 @@ static int ath6kl_init_hw_params(struct ath6kl *ar) 
		break;

	case AR6004_REV1_VERSION:

		ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS;

		ar->hw.app_load_addr = AR6003_REV3_APP_LOAD_ADDRESS;

		ar->hw.app_load_addr = 0x1234;

		ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS;

		ar->hw.reserved_ram_size = AR6004_REV1_RAM_RESERVE_SIZE;

		break;

	case AR6004_REV2_VERSION:

		ar->hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS;

		ar->hw.app_load_addr = 0x1234;

		ar->hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS;

		ar->hw.reserved_ram_size = AR6004_REV2_RAM_RESERVE_SIZE;

		break;

	default:

		ath6kl_err("Unsupported hardware version: 0x%x\n",

			   ar->version.target_ver);