wil6210: fix locking in wmi_call

BugLink: https://bugs.launchpad.net/bugs/1854975
[ Upstream commit dc57731dbd535880fe6ced31c229262c34df7d64 ]

Switch from spin_lock to spin_lock_irqsave, because
wmi_ev_lock is used inside interrupt handler.

Signed-off-by: Lior David <liord@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index d63d7c32680180077c7272a629906fd527dd56ee..798516f42f2f97001579183dcb788ee677e98747 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -1002,15 +1002,16 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len,
 {
        int rc;
        unsigned long remain;
+       ulong flags;
 
        mutex_lock(&wil->wmi_mutex);
 
-       spin_lock(&wil->wmi_ev_lock);
+       spin_lock_irqsave(&wil->wmi_ev_lock, flags);
        wil->reply_id = reply_id;
        wil->reply_buf = reply;
        wil->reply_size = reply_size;
        reinit_completion(&wil->wmi_call);
-       spin_unlock(&wil->wmi_ev_lock);
+       spin_unlock_irqrestore(&wil->wmi_ev_lock, flags);
 
        rc = __wmi_send(wil, cmdid, buf, len);
        if (rc)
@@ -1030,11 +1031,11 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len,
        }
 
 out:
-       spin_lock(&wil->wmi_ev_lock);
+       spin_lock_irqsave(&wil->wmi_ev_lock, flags);
        wil->reply_id = 0;
        wil->reply_buf = NULL;
        wil->reply_size = 0;
-       spin_unlock(&wil->wmi_ev_lock);
+       spin_unlock_irqrestore(&wil->wmi_ev_lock, flags);
 
        mutex_unlock(&wil->wmi_mutex);