From: Larry Finger <Larry.Finger@lwfinger.net>
To: Mike McCormack <mikem@ring3k.org>
Cc: chaoming_li@realsil.com.cn, linville@tuxdriver.com,
linux-wireless@vger.kernel.org
Subject: Re: [PATCH 4/8] rtlwifi: Run IPS leave work in a tasklet
Date: Mon, 23 May 2011 14:48:39 -0500 [thread overview]
Message-ID: <4DDABA17.3090307@lwfinger.net> (raw)
In-Reply-To: <4DDA6705.5030606@ring3k.org>
On 05/23/2011 08:54 AM, Mike McCormack wrote:
> This removes the need to use IRQ safe spinlocks in many places.
>
> Signed-off-by: Mike McCormack<mikem@ring3k.org>
> ---
> drivers/net/wireless/rtlwifi/pci.c | 14 ++++++++++++--
> drivers/net/wireless/rtlwifi/ps.c | 1 +
> drivers/net/wireless/rtlwifi/wifi.h | 1 +
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
> index 5eedb91..fd74396 100644
> --- a/drivers/net/wireless/rtlwifi/pci.c
> +++ b/drivers/net/wireless/rtlwifi/pci.c
> @@ -622,7 +622,7 @@ tx_status_ok:
> 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);
> }
> }
>
> @@ -756,7 +756,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);
> }
>
> new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
> @@ -934,6 +934,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);
> @@ -1032,6 +1037,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,
> @@ -1494,6 +1502,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);
> @@ -1568,6 +1577,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) {
> diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
> index 39b0297..5552b8c 100644
> --- a/drivers/net/wireless/rtlwifi/ps.c
> +++ b/drivers/net/wireless/rtlwifi/ps.c
> @@ -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);
> diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
> index 0321328..9d003e0 100644
> --- a/drivers/net/wireless/rtlwifi/wifi.h
> +++ b/drivers/net/wireless/rtlwifi/wifi.h
> @@ -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 {
This is a good idea.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
Larry
next prev parent reply other threads:[~2011-05-23 19:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 13:54 [PATCH 4/8] rtlwifi: Run IPS leave work in a tasklet Mike McCormack
2011-05-23 19:48 ` Larry Finger [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-25 0:39 Mike McCormack
2011-05-30 23:49 Mike McCormack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DDABA17.3090307@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mikem@ring3k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.