UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wcn36xx: Wait longer for SMD commands to complete 

On some wcnss firmwares the start command can take up to 300ms to
complete. Currently there is a 200ms timeout for SMD command to
complete which causes the start to fail.

Increase the timeout to 500ms. Also improve debug information
regarding SMD command completion time.

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pontus Fuchs 2014-02-12 19:04:42 +00:00 committed by John W. Linville
parent c951da4615
commit 546c505bdc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/ath/wcn36xx/smd.c
View File

@ -195,9 +195,11 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn,
static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len) static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
{ {
int ret = 0; int ret = 0;
unsigned long start;
wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "HAL >>> ", wcn->hal_buf, len); wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "HAL >>> ", wcn->hal_buf, len);
init_completion(&wcn->hal_rsp_compl); init_completion(&wcn->hal_rsp_compl);
start = jiffies;
ret = wcn->ctrl_ops->tx(wcn->hal_buf, len); ret = wcn->ctrl_ops->tx(wcn->hal_buf, len);
if (ret) { if (ret) {
wcn36xx_err("HAL TX failed\n"); wcn36xx_err("HAL TX failed\n");
@ -205,10 +207,13 @@ static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
} }
if (wait_for_completion_timeout(&wcn->hal_rsp_compl, if (wait_for_completion_timeout(&wcn->hal_rsp_compl,
msecs_to_jiffies(HAL_MSG_TIMEOUT)) <= 0) { msecs_to_jiffies(HAL_MSG_TIMEOUT)) <= 0) {
wcn36xx_err("Timeout while waiting SMD response\n"); wcn36xx_err("Timeout! No SMD response in %dms\n",
HAL_MSG_TIMEOUT);
ret = -ETIME; ret = -ETIME;
goto out; goto out;
} }
wcn36xx_dbg(WCN36XX_DBG_SMD, "SMD command completed in %dms",
jiffies_to_msecs(jiffies - start));
out: out:
return ret; return ret;
} }

2
drivers/net/wireless/ath/wcn36xx/smd.h
View File

@ -24,7 +24,7 @@
#define WCN36XX_HAL_BUF_SIZE 4096 #define WCN36XX_HAL_BUF_SIZE 4096
#define HAL_MSG_TIMEOUT 200 #define HAL_MSG_TIMEOUT 500
#define WCN36XX_SMSM_WLAN_TX_ENABLE 0x00000400 #define WCN36XX_SMSM_WLAN_TX_ENABLE 0x00000400
#define WCN36XX_SMSM_WLAN_TX_RINGS_EMPTY 0x00000200 #define WCN36XX_SMSM_WLAN_TX_RINGS_EMPTY 0x00000200
/* The PNO version info be contained in the rsp msg */ /* The PNO version info be contained in the rsp msg */