Commit 40ac77c8 authored by Andy Green's avatar Andy Green Committed by Kalle Valo
Browse files

wcn36xx: handle new hal response format 



wcn3620 has a new message structure for the reply to some hal
commands.  This patch adds the struct and helper routine that
uses it if the chip is wcn3620, or falls back to the old
helper routine.

We don't know what to do with the candidate list he sends back,
but we can at least accept and ignore it nicely instead of dying.

Signed-off-by: default avatarAndy Green <andy.green@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent df0d4364

drivers/net/wireless/ath/wcn36xx/smd.c

+16 −0
Original line number Diff line number Diff line
@@ -302,6 +302,22 @@ static int wcn36xx_smd_rsp_status_check(void *buf, size_t len) 
	return 0;

}



static int wcn36xx_smd_rsp_status_check_v2(struct wcn36xx *wcn, void *buf,

					     size_t len)

{

	struct wcn36xx_fw_msg_status_rsp_v2 *rsp;



	if (len < sizeof(struct wcn36xx_hal_msg_header) + sizeof(*rsp))

		return wcn36xx_smd_rsp_status_check(buf, len);



	rsp = buf + sizeof(struct wcn36xx_hal_msg_header);



	if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status)

		return rsp->status;



	return 0;

}



int wcn36xx_smd_load_nv(struct wcn36xx *wcn)

{

	struct nv_data *nv_d;

drivers/net/wireless/ath/wcn36xx/smd.h

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ struct wcn36xx_fw_msg_status_rsp { 
	u32	status;

} __packed;



/* wcn3620 returns this for tigger_ba */



struct wcn36xx_fw_msg_status_rsp_v2 {

	u8	bss_id[6];

	u32	status __packed;

	u16	count_following_candidates __packed;

	/* candidate list follows */

};



struct wcn36xx_hal_ind_msg {

	struct list_head list;

	u8 *msg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE