| From 1223c8e0d726649322c4d68404914bc26a8c2578 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 Sep 2018 15:07:07 +0300 |
| Subject: ath10k: wmi: disable softirq's while calling ieee80211_rx |
| |
| From: Erik Stromdahl <erik.stromdahl@gmail.com> |
| |
| [ Upstream commit 37f62c0d5822f631b786b29a1b1069ab714d1a28 ] |
| |
| This is done in order not to trig the below warning in |
| ieee80211_rx_napi: |
| |
| WARN_ON_ONCE(softirq_count() == 0); |
| |
| ieee80211_rx_napi requires that softirq's are disabled during |
| execution. |
| |
| The High latency bus drivers (SDIO and USB) sometimes call the wmi |
| ep_rx_complete callback from non softirq context, resulting in a trigger |
| of the above warning. |
| |
| Calling ieee80211_rx_ni with softirq's already disabled (e.g., from |
| softirq context) should be safe as the local_bh_disable and |
| local_bh_enable functions (called from ieee80211_rx_ni) are fully |
| reentrant. |
| |
| Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/ath/ath10k/wmi.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c |
| index 583147f00fa4e..40b36e73bb48c 100644 |
| --- a/drivers/net/wireless/ath/ath10k/wmi.c |
| +++ b/drivers/net/wireless/ath/ath10k/wmi.c |
| @@ -2487,7 +2487,8 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) |
| status->freq, status->band, status->signal, |
| status->rate_idx); |
| |
| - ieee80211_rx(ar->hw, skb); |
| + ieee80211_rx_ni(ar->hw, skb); |
| + |
| return 0; |
| } |
| |
| -- |
| 2.20.1 |
| |
