Search Linux Wireless

Re: [PATCH 2/2] rtlwifi: merge ips,lps spinlocks into one mutex

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 12/12/2011 04:43 AM, Stanislaw Gruszka wrote:
With previous patch "rtlwifi: use work for lps" we can now use mutex for
protecting ps mode changing critical sections. This fixes running system
with interrupts disabled for long time.

Merge ips_lock and lps_lock as they seems to protect the same data
structures (accessed in rtl_ps_set_rf_state() function).

Reported-by: Philipp Dreimann<philipp@xxxxxxxxxxxx>
Tested-by: Larry Finger<Larry.Finger@xxxxxxxxxxxx>
Cc: Mike McCormack<mikem@xxxxxxxxxx>
Cc: Chaoming Li<chaoming_li@xxxxxxxxxxxxxx>
Signed-off-by: Stanislaw Gruszka<sgruszka@xxxxxxxxxx>
---
  drivers/net/wireless/rtlwifi/base.c |    3 +--
  drivers/net/wireless/rtlwifi/ps.c   |   21 ++++++++++-----------
  drivers/net/wireless/rtlwifi/wifi.h |    3 +--
  3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index a13ecfc..d81a602 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -448,12 +448,11 @@ int rtl_init_core(struct ieee80211_hw *hw)

  	/*<4>  locks */
  	mutex_init(&rtlpriv->locks.conf_mutex);
-	spin_lock_init(&rtlpriv->locks.ips_lock);
+	mutex_init(&rtlpriv->locks.ps_mutex);
  	spin_lock_init(&rtlpriv->locks.irq_th_lock);
  	spin_lock_init(&rtlpriv->locks.h2c_lock);
  	spin_lock_init(&rtlpriv->locks.rf_ps_lock);
  	spin_lock_init(&rtlpriv->locks.rf_lock);
-	spin_lock_init(&rtlpriv->locks.lps_lock);
  	spin_lock_init(&rtlpriv->locks.waitq_lock);
  	spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);

diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 55c8e50..a14a68b 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -241,7 +241,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
  	if (mac->opmode != NL80211_IFTYPE_STATION)
  		return;

-	spin_lock(&rtlpriv->locks.ips_lock);
+	mutex_lock(&rtlpriv->locks.ps_mutex);

  	if (ppsc->inactiveps) {
  		rtstate = ppsc->rfpwr_state;
@@ -257,7 +257,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
  		}
  	}

-	spin_unlock(&rtlpriv->locks.ips_lock);
+	mutex_unlock(&rtlpriv->locks.ps_mutex);
  }

  /*for FW LPS*/
@@ -395,7 +395,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
  	if (mac->link_state != MAC80211_LINKED)
  		return;

-	spin_lock_irq(&rtlpriv->locks.lps_lock);
+	mutex_lock(&rtlpriv->locks.ps_mutex);

  	/* Idle for a while if we connect to AP a while ago. */
  	if (mac->cnt_after_linked>= 2) {
@@ -407,7 +407,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
  		}
  	}

-	spin_unlock_irq(&rtlpriv->locks.lps_lock);
+	mutex_unlock(&rtlpriv->locks.ps_mutex);
  }

  /*Leave the leisure power save mode.*/
@@ -416,9 +416,8 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
  	struct rtl_priv *rtlpriv = rtl_priv(hw);
  	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
  	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-	unsigned long flags;

-	spin_lock_irqsave(&rtlpriv->locks.lps_lock, flags);
+	mutex_lock(&rtlpriv->locks.ps_mutex);

  	if (ppsc->fwctrl_lps) {
  		if (ppsc->dot11_psmode != EACTIVE) {
@@ -439,7 +438,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
  			rtl_lps_set_psmode(hw, EACTIVE);
  		}
  	}
-	spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flags);
+	mutex_unlock(&rtlpriv->locks.ps_mutex);
  }

  /* For sw LPS*/
@@ -540,9 +539,9 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
  		RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
  	}

-	spin_lock_irq(&rtlpriv->locks.lps_lock);
+	mutex_lock(&rtlpriv->locks.ps_mutex);
  	rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);
-	spin_unlock_irq(&rtlpriv->locks.lps_lock);
+	mutex_unlock(&rtlpriv->locks.ps_mutex);
  }

  void rtl_swlps_rfon_wq_callback(void *data)
@@ -575,9 +574,9 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
  	if (rtlpriv->link_info.busytraffic)
  		return;

-	spin_lock_irq(&rtlpriv->locks.lps_lock);
+	mutex_lock(&rtlpriv->locks.ps_mutex);
  	rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);
-	spin_unlock_irq(&rtlpriv->locks.lps_lock);
+	mutex_unlock(&rtlpriv->locks.ps_mutex);

  	if (ppsc->reg_rfps_level&  RT_RF_OFF_LEVL_ASPM&&
  		!RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 6e6353b..085dccd 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1544,14 +1544,13 @@ struct rtl_hal_cfg {
  struct rtl_locks {
  	/* mutex */
  	struct mutex conf_mutex;
+	struct mutex ps_mutex;

  	/*spin lock */
-	spinlock_t ips_lock;
  	spinlock_t irq_th_lock;
  	spinlock_t h2c_lock;
  	spinlock_t rf_ps_lock;
  	spinlock_t rf_lock;
-	spinlock_t lps_lock;
  	spinlock_t waitq_lock;

  	/*Dual mac*/

On an SMP platform spin_lock_irqsave() is only effective if the interrupt handler uses the same spinlock. Its benign in this case, but still bogus.

Tested-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>
--
Tim Gardner tim.gardner@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux