Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9f8f0a authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

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: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9644032e

drivers/net/wireless/realtek/rtlwifi/base.c

+22 −0
Original line number Diff line number Diff line
@@ -2262,11 +2262,33 @@ void rtl_fwevt_wq_callback(void *data) 
	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)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	unsigned long flags;



	if (rtl_c2h_fast_cmd(hw, skb)) {

		rtl_c2h_content_parsing(hw, skb);

		return;

	}



	/* enqueue */

	spin_lock_irqsave(&rtlpriv->locks.c2hcmd_lock, flags);