openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtlwifi: fix btmpinfo timeout while processing C2H_BT_INFO 

In former patch, I enqueu all C2H commands and processed by a workqueue.
In case C2H_BT_INFO will issue a H2C command to set BT reg, and wait for
a C2H ack. But it is totally impossible that C2H workqueue waits for a
C2H command, so kernel log warn
	rtlwifi: :<0> btmpinfo wait (req_num=0) timeout

Since the C2H ack command C2H_BT_MP can be safely processed in interrupt
context, add a fast command path to deal with the command.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ping-Ke Shih 2018-05-18 17:30:07 +08:00 committed by Kalle Valo
parent 9644032e30
commit 0a9f8f0a1b
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/realtek/rtlwifi/base.c
View File

@ -2262,11 +2262,33 @@ void rtl_fwevt_wq_callback(void *data)
rtlpriv->cfg->ops->c2h_command_handle(hw); rtlpriv->cfg->ops->c2h_command_handle(hw);
} }
static void rtl_c2h_content_parsing(struct ieee80211_hw *hw,
struct sk_buff *skb);
static bool rtl_c2h_fast_cmd(struct ieee80211_hw *hw, struct sk_buff *skb)
{
u8 cmd_id = GET_C2H_CMD_ID(skb->data);
switch (cmd_id) {
case C2H_BT_MP:
return true;
default:
break;
}
return false;
}
void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb) void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
unsigned long flags; unsigned long flags;
if (rtl_c2h_fast_cmd(hw, skb)) {
rtl_c2h_content_parsing(hw, skb);
return;
}
/* enqueue */ /* enqueue */
spin_lock_irqsave(&rtlpriv->locks.c2hcmd_lock, flags); spin_lock_irqsave(&rtlpriv->locks.c2hcmd_lock, flags);