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

Commit 67fc6052 authored by Mike McCormack's avatar Mike McCormack Committed by John W. Linville
Browse files

rtlwifi: Run IPS leave work in a tasklet 



This removes the need to use IRQ safe spinlocks in many places.

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 34ddb207

drivers/net/wireless/rtlwifi/pci.c

+12 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) 
	if (((rtlpriv->link_info.num_rx_inperiod +

		rtlpriv->link_info.num_tx_inperiod) > 8) ||

		(rtlpriv->link_info.num_rx_inperiod > 2)) {

		rtl_lps_leave(hw);

		tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);

	}

}
@@ -766,7 +766,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) 
			if (((rtlpriv->link_info.num_rx_inperiod +

				rtlpriv->link_info.num_tx_inperiod) > 8) ||

				(rtlpriv->link_info.num_rx_inperiod > 2)) {

				rtl_lps_leave(hw);

				tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);

			}



			skb = new_skb;
@@ -936,6 +936,11 @@ static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw) 
	_rtl_pci_tx_chk_waitq(hw);

}



static void _rtl_pci_ips_leave_tasklet(struct ieee80211_hw *hw)

{

	rtl_lps_leave(hw);

}



static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1034,6 +1039,9 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw, 
	tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,

		     (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,

		     (unsigned long)hw);

	tasklet_init(&rtlpriv->works.ips_leave_tasklet,

		     (void (*)(unsigned long))_rtl_pci_ips_leave_tasklet,

		     (unsigned long)hw);

}



static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
@@ -1503,6 +1511,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw) 


	synchronize_irq(rtlpci->pdev->irq);

	tasklet_kill(&rtlpriv->works.irq_tasklet);

	tasklet_kill(&rtlpriv->works.ips_leave_tasklet);



	flush_workqueue(rtlpriv->works.rtl_wq);

	destroy_workqueue(rtlpriv->works.rtl_wq);
@@ -1577,6 +1586,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw) 
	set_hal_stop(rtlhal);



	rtlpriv->cfg->ops->disable_interrupt(hw);

	tasklet_kill(&rtlpriv->works.ips_leave_tasklet);



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

	while (ppsc->rfchange_inprogress) {

drivers/net/wireless/rtlwifi/ps.c

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw) 


	/*<2> Disable Interrupt */

	rtlpriv->cfg->ops->disable_interrupt(hw);

	tasklet_kill(&rtlpriv->works.irq_tasklet);



	/*<3> Disable Adapter */

	rtlpriv->cfg->ops->hw_disable(hw);

drivers/net/wireless/rtlwifi/wifi.h

+1 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,7 @@ struct rtl_works { 
	/* For SW LPS */

	struct delayed_work ps_work;

	struct delayed_work ps_rfon_wq;

	struct tasklet_struct ips_leave_tasklet;

};



struct rtl_debug {