projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f89f1ae)
rtlwifi: rf_lock use non-irqsave spin_lock
authorPing-Ke Shih <pkshih@realtek.com>
Mon, 18 Nov 2019 03:14:54 +0000 (11:14 +0800)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 20 Nov 2019 07:41:29 +0000 (09:41 +0200)
rf_lock is used to protect RF register access, but they will not called
from interrupt context, so *_irqsave version isn't necessary. Then, these
delays don't affect IRQ services.

The old code holds spin_lock_irqsave() that will be detected a long delay
as below:

  kworker/-276     4d...    0us : _raw_spin_lock_irqsave
  kworker/-276     4d...    0us : rtl8723_phy_rf_serial_read <-rtl8723de_phy_set_rf_reg
  kworker/-276     4d...    1us : rtl8723_phy_query_bb_reg <-rtl8723_phy_rf_serial_read
  kworker/-276     4d...    3us : rtl8723_phy_set_bb_reg <-rtl8723_phy_rf_serial_read
  kworker/-276     4d...    4us : __const_udelay <-rtl8723_phy_rf_serial_read
  kworker/-276     4d...    4us!: delay_mwaitx <-rtl8723_phy_rf_serial_read
  kworker/-276     4d... 1004us : rtl8723_phy_set_bb_reg <-rtl8723_phy_rf_serial_read
  [...]

Reported-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c patch | blob | history
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c patch | blob | history
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c patch | blob | history
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c patch | blob | history
drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c patch | blob | history
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c patch | blob | history

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
index 978e6a16965466507352cad29873e82c715c5284..01206651c7df9075710e172735b1c7da11b3d6ce 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
@@ -85,20 +85,19 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                 regaddr, rfpath, bitmask);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
 
        original_value = _rtl88e_phy_rf_serial_read(hw, rfpath, regaddr);
        bitshift = _rtl88e_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -112,13 +111,12 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  regaddr, bitmask, data, rfpath);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (bitmask != RFREG_OFFSET_MASK) {
                        original_value = _rtl88e_phy_rf_serial_read(hw,
@@ -133,7 +131,7 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw,
        _rtl88e_phy_rf_serial_write(hw, rfpath, regaddr, data);
 
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
index 0ae6371b63182b183f578a85df667d347d39bd74..4b672199c81d2f956ee0bbcf1dfc86e4f5da366c 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
@@ -307,16 +307,15 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                 regaddr, rfpath, bitmask);
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
        original_value = _rtl92d_phy_rf_serial_read(hw, rfpath, regaddr);
        bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
                 regaddr, rfpath, bitmask, original_value);
@@ -329,14 +328,13 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_phy *rtlphy = &(rtlpriv->phy);
        u32 original_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                 regaddr, bitmask, data, rfpath);
        if (bitmask == 0)
                return;
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
        if (rtlphy->rf_mode != RF_OP_BY_FW) {
                if (bitmask != RFREG_OFFSET_MASK) {
                        original_value = _rtl92d_phy_rf_serial_read(hw,
@@ -347,7 +345,7 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
                }
                _rtl92d_phy_rf_serial_write(hw, rfpath, regaddr, data);
        }
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                 regaddr, bitmask, data, rfpath);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
index f03de8bdd2d1a301b97a480a4a4a4f4407f128d8..75265b4fdf7efb15a73c58e4438b477e977e5663 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
@@ -84,19 +84,18 @@ u32 rtl92ee_phy_query_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                  regaddr, rfpath, bitmask);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        original_value = _rtl92ee_phy_rf_serial_read(hw , rfpath, regaddr);
        bitshift = _rtl92ee_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x),rfpath(%#x),bitmask(%#x),original_value(%#x)\n",
@@ -111,13 +110,12 @@ void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  addr, bitmask, data, rfpath);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (bitmask != RFREG_OFFSET_MASK) {
                original_value = _rtl92ee_phy_rf_serial_read(hw, rfpath, addr);
@@ -127,7 +125,7 @@ void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,
 
        _rtl92ee_phy_rf_serial_write(hw, rfpath, addr, data);
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
index 1385e5a2e0b000df2e417f2e849741c619beefde..772aecedf0b4ea36bfa73f97cc3e7e9f8e9e2527 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
@@ -37,13 +37,12 @@ u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value = 0, readback_value, bitshift;
        struct rtl_phy *rtlphy = &rtlpriv->phy;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                 regaddr, rfpath, bitmask);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (rtlphy->rf_mode != RF_OP_BY_FW) {
                original_value = rtl8723_phy_rf_serial_read(hw,
@@ -53,7 +52,7 @@ u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw,
        bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -69,13 +68,12 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        u32 original_value = 0, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  regaddr, bitmask, data, rfpath);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (rtlphy->rf_mode != RF_OP_BY_FW) {
                if (bitmask != RFREG_OFFSET_MASK) {
@@ -99,7 +97,7 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
                _rtl8723e_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
        }
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
index d48364460922c7d11832438520015131a11658da..9528ac3f3b87d0fe68862692d4bc65d3f9d14fdb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
@@ -33,19 +33,18 @@ u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                  regaddr, rfpath, bitmask);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        original_value = rtl8723_phy_rf_serial_read(hw, rfpath, regaddr);
        bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -59,13 +58,12 @@ void rtl8723be_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path path,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  regaddr, bitmask, data, path);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (bitmask != RFREG_OFFSET_MASK) {
                        original_value = rtl8723_phy_rf_serial_read(hw, path,
@@ -77,7 +75,7 @@ void rtl8723be_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path path,
 
        rtl8723_phy_rf_serial_write(hw, path, regaddr, data);
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index c1a04efa69eadebf9175cd8b642113bc64b2a3f9..b8a2b23269023f29fa58b90ac36b8996df55f535 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -139,19 +139,18 @@ u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, readback_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
                 regaddr, rfpath, bitmask);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
        bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -166,13 +165,12 @@ void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u32 original_value, bitshift;
-       unsigned long flags;
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
                  regaddr, bitmask, data, rfpath);
 
-       spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
+       spin_lock(&rtlpriv->locks.rf_lock);
 
        if (bitmask != RFREG_OFFSET_MASK) {
                original_value =
@@ -183,7 +181,7 @@ void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw,
 
        _rtl8821ae_phy_rf_serial_write(hw, rfpath, regaddr, data);
 
-       spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
+       spin_unlock(&rtlpriv->locks.rf_lock);
 
        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
ep93xx device tree rework repo: git://git.maquefel.me/linux.git