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

wcn36xx: Change indication list lock to spinlock 

In preparation for handling incoming messages from IRQ context, change
the indication list lock to a spinlock

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Bjorn Andersson 2016-06-19 23:19:44 -07:00 committed by Kalle Valo
parent 909aa60c05
commit 1c41fd5fb7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2243,10 +2243,10 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)
msg_ind->msg_len = len; msg_ind->msg_len = len;
memcpy(msg_ind->msg, buf, len); memcpy(msg_ind->msg, buf, len);
mutex_lock(&wcn->hal_ind_mutex); spin_lock(&wcn->hal_ind_lock);
list_add_tail(&msg_ind->list, &wcn->hal_ind_queue); list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work); queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
mutex_unlock(&wcn->hal_ind_mutex); spin_unlock(&wcn->hal_ind_lock);
wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n"); wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
break; break;
default: default:
@ -2260,8 +2260,9 @@ static void wcn36xx_ind_smd_work(struct work_struct *work)
container_of(work, struct wcn36xx, hal_ind_work); container_of(work, struct wcn36xx, hal_ind_work);
struct wcn36xx_hal_msg_header *msg_header; struct wcn36xx_hal_msg_header *msg_header;
struct wcn36xx_hal_ind_msg *hal_ind_msg; struct wcn36xx_hal_ind_msg *hal_ind_msg;
unsigned long flags;
mutex_lock(&wcn->hal_ind_mutex); spin_lock_irqsave(&wcn->hal_ind_lock, flags);
hal_ind_msg = list_first_entry(&wcn->hal_ind_queue, hal_ind_msg = list_first_entry(&wcn->hal_ind_queue,
struct wcn36xx_hal_ind_msg, struct wcn36xx_hal_ind_msg,
@ -2293,8 +2294,8 @@ static void wcn36xx_ind_smd_work(struct work_struct *work)
msg_header->msg_type); msg_header->msg_type);
} }
list_del(wcn->hal_ind_queue.next); list_del(wcn->hal_ind_queue.next);
spin_unlock_irqrestore(&wcn->hal_ind_lock, flags);
kfree(hal_ind_msg); kfree(hal_ind_msg);
mutex_unlock(&wcn->hal_ind_mutex);
} }
int wcn36xx_smd_open(struct wcn36xx *wcn) int wcn36xx_smd_open(struct wcn36xx *wcn)
{ {
@ -2307,7 +2308,7 @@ int wcn36xx_smd_open(struct wcn36xx *wcn)
} }
INIT_WORK(&wcn->hal_ind_work, wcn36xx_ind_smd_work); INIT_WORK(&wcn->hal_ind_work, wcn36xx_ind_smd_work);
INIT_LIST_HEAD(&wcn->hal_ind_queue); INIT_LIST_HEAD(&wcn->hal_ind_queue);
mutex_init(&wcn->hal_ind_mutex); spin_lock_init(&wcn->hal_ind_lock);
ret = wcn->ctrl_ops->open(wcn, wcn36xx_smd_rsp_process); ret = wcn->ctrl_ops->open(wcn, wcn36xx_smd_rsp_process);
if (ret) { if (ret) {
@ -2327,5 +2328,4 @@ void wcn36xx_smd_close(struct wcn36xx *wcn)
{ {
wcn->ctrl_ops->close(); wcn->ctrl_ops->close();
destroy_workqueue(wcn->hal_ind_wq); destroy_workqueue(wcn->hal_ind_wq);
mutex_destroy(&wcn->hal_ind_mutex);
} }

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

@ -215,7 +215,7 @@ struct wcn36xx {
struct completion hal_rsp_compl; struct completion hal_rsp_compl;
struct workqueue_struct *hal_ind_wq; struct workqueue_struct *hal_ind_wq;
struct work_struct hal_ind_work; struct work_struct hal_ind_work;
struct mutex hal_ind_mutex; spinlock_t hal_ind_lock;
struct list_head hal_ind_queue; struct list_head hal_ind_queue;
/* DXE channels */ /* DXE channels */