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

Commit 34dd398a authored by Erik Stromdahl's avatar Erik Stromdahl Committed by Kalle Valo
Browse files

ath10k: sdio get target info 



Special BMI get target info function for SDIO.

Signed-off-by: default avatarErik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 60bdfffa

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

+71 −0
Original line number Diff line number Diff line
@@ -97,6 +97,77 @@ int ath10k_bmi_get_target_info(struct ath10k *ar, 
	return 0;

}



#define TARGET_VERSION_SENTINAL 0xffffffffu



int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,

				    struct bmi_target_info *target_info)

{

	struct bmi_cmd cmd;

	union bmi_resp resp;

	u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.get_target_info);

	u32 resplen, ver_len;

	__le32 tmp;

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi get target info SDIO\n");



	if (ar->bmi.done_sent) {

		ath10k_warn(ar, "BMI Get Target Info Command disallowed\n");

		return -EBUSY;

	}



	cmd.id = __cpu_to_le32(BMI_GET_TARGET_INFO);



	/* Step 1: Read 4 bytes of the target info and check if it is

	 * the special sentinal version word or the first word in the

	 * version response.

	 */

	resplen = sizeof(u32);

	ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, &tmp, &resplen);

	if (ret) {

		ath10k_warn(ar, "unable to read from device\n");

		return ret;

	}



	/* Some SDIO boards have a special sentinal byte before the real

	 * version response.

	 */

	if (__le32_to_cpu(tmp) == TARGET_VERSION_SENTINAL) {

		/* Step 1b: Read the version length */

		resplen = sizeof(u32);

		ret = ath10k_hif_exchange_bmi_msg(ar, NULL, 0, &tmp,

						  &resplen);

		if (ret) {

			ath10k_warn(ar, "unable to read from device\n");

			return ret;

		}

	}



	ver_len = __le32_to_cpu(tmp);



	/* Step 2: Check the target info length */

	if (ver_len != sizeof(resp.get_target_info)) {

		ath10k_warn(ar, "Unexpected target info len: %u. Expected: %zu\n",

			    ver_len, sizeof(resp.get_target_info));

		return -EINVAL;

	}



	/* Step 3: Read the rest of the version response */

	resplen = sizeof(resp.get_target_info) - sizeof(u32);

	ret = ath10k_hif_exchange_bmi_msg(ar, NULL, 0,

					  &resp.get_target_info.version,

					  &resplen);

	if (ret) {

		ath10k_warn(ar, "unable to read from device\n");

		return ret;

	}



	target_info->version = __le32_to_cpu(resp.get_target_info.version);

	target_info->type    = __le32_to_cpu(resp.get_target_info.type);



	return 0;

}



int ath10k_bmi_read_memory(struct ath10k *ar,

			   u32 address, void *buffer, u32 length)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ void ath10k_bmi_start(struct ath10k *ar); 
int ath10k_bmi_done(struct ath10k *ar);

int ath10k_bmi_get_target_info(struct ath10k *ar,

			       struct bmi_target_info *target_info);

int ath10k_bmi_get_target_info_sdio(struct ath10k *ar,

				    struct bmi_target_info *target_info);

int ath10k_bmi_read_memory(struct ath10k *ar, u32 address,

			   void *buffer, u32 length);

int ath10k_bmi_write_memory(struct ath10k *ar, u32 address,

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

+4 −1
Original line number Diff line number Diff line
@@ -2218,6 +2218,9 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 
	}



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

	if (ar->hif.bus == ATH10K_BUS_SDIO)

		ret = ath10k_bmi_get_target_info_sdio(ar, &target_info);

	else

		ret = ath10k_bmi_get_target_info(ar, &target_info);

	if (ret) {

		ath10k_err(ar, "could not get target info (%d)\n", ret);