iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: r8188eu: Use completions for signaling enqueueing

Browse Source 
rtw_enqueue_cmd() uses a semaphore to notify rtw_cmd_thread() that it
has enqueued commands. rtw_cmd_thread() "down(s)" in interruptible mode
to wait to be notified.

Use completion variables because they are better suited for the purpose.

In rtw_cmd_thread(), wait in uninterruptible mode, even if the original
code uses down_interruptible(), because the interruption of
rtw_cmd_thread() is not allowed and unwanted.

Tested with "ASUSTek Computer, Inc. Realtek 8188EUS [USB-N10 Nano]".

Acked-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20211018162006.5527-3-fmdefrancesco@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Fabio M. De Francesco 2021-10-18 18:20:05 +02:00 committed by Greg Kroah-Hartman
parent d250bf4c39
commit e8eb2f890f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/r8188eu/core/rtw_cmd.c
View File

@ -21,7 +21,7 @@ static int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
{
int res = _SUCCESS;
sema_init(&pcmdpriv->cmd_queue_sema, 0);
init_completion(&pcmdpriv->enqueue_cmd);
/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */
init_completion(&pcmdpriv->start_cmd_thread);
init_completion(&pcmdpriv->stop_cmd_thread);
@ -198,7 +198,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj);
if (res == _SUCCESS)
up(&pcmdpriv->cmd_queue_sema);
complete(&pcmdpriv->enqueue_cmd);
exit:
@ -250,8 +250,7 @@ int rtw_cmd_thread(void *context)
complete(&pcmdpriv->start_cmd_thread);
while (1) {
if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL)
break;
wait_for_completion(&pcmdpriv->enqueue_cmd);
if (padapter->bDriverStopped ||
padapter->bSurpriseRemoved) {

2
drivers/staging/r8188eu/include/rtw_cmd.h
View File

@ -33,7 +33,7 @@ struct cmd_obj {
};
struct cmd_priv {
struct semaphore cmd_queue_sema;
struct completion enqueue_cmd;
struct completion start_cmd_thread;
struct completion stop_cmd_thread;
struct __queue cmd_queue;

2
drivers/staging/r8188eu/os_dep/os_intfs.c
View File

@ -394,7 +394,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
void rtw_stop_drv_threads(struct adapter *padapter)
{
/* Below is to termindate rtw_cmd_thread & event_thread... */
up(&padapter->cmdpriv.cmd_queue_sema);
complete(&padapter->cmdpriv.enqueue_cmd);
if (padapter->cmdThread)
/* wait for rtw_cmd_thread() to stop running */
wait_for_completion(&padapter->cmdpriv.stop_cmd_thread);