p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ath10k: fix sanity check on enabling btcoex via debugfs 

First check for the device state before enabling / disabling
btcoex, also return a proper error value. Enabling / disabling
btcoex ideally does a f/w + ath10k_core_restart so the checks
that are applicable for 'simulate_fw_crash' shall be applicable
for this as well

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Mohammed Shafi Shajakhan 2016-02-23 12:58:36 +05:30 committed by Kalle Valo
parent af9a6a3ad0
commit c28e6f06ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ath/ath10k/debug.c
View File

@ -2114,6 +2114,7 @@ static ssize_t ath10k_write_btcoex(struct file *file,
struct ath10k *ar = file->private_data; struct ath10k *ar = file->private_data;
char buf[32]; char buf[32];
size_t buf_size; size_t buf_size;
int ret = 0;
bool val; bool val;
buf_size = min(count, (sizeof(buf) - 1)); buf_size = min(count, (sizeof(buf) - 1));
@ -2127,6 +2128,12 @@ static ssize_t ath10k_write_btcoex(struct file *file,
mutex_lock(&ar->conf_mutex); mutex_lock(&ar->conf_mutex);
if (ar->state != ATH10K_STATE_ON &&
ar->state != ATH10K_STATE_RESTARTED) {
ret = -ENETDOWN;
goto exit;
}
if (!(test_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags) ^ val)) if (!(test_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags) ^ val))
goto exit; goto exit;
@ -2135,17 +2142,15 @@ static ssize_t ath10k_write_btcoex(struct file *file,
else else
clear_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags); clear_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags);
if (ar->state != ATH10K_STATE_ON)
goto exit;
ath10k_info(ar, "restarting firmware due to btcoex change"); ath10k_info(ar, "restarting firmware due to btcoex change");
queue_work(ar->workqueue, &ar->restart_work); queue_work(ar->workqueue, &ar->restart_work);
ret = count;
exit: exit:
mutex_unlock(&ar->conf_mutex); mutex_unlock(&ar->conf_mutex);
return count; return ret;
} }
static ssize_t ath10k_read_btcoex(struct file *file, char __user *ubuf, static ssize_t ath10k_read_btcoex(struct file *file, char __user *ubuf,