wifi: rtw89: rewrite decision on channel by entity state

We need to invoke the callback of the changed band at the first
set_channel() after every power-off. Originally, we forced the
channel to be 0 when doing power-off, and then determined things
by comparing channel with 0.

However, deciding on such things by channel might be confusing.
It's also confusing to use this kind of decision when we consider
multiple channels in the follow-up patches. So, another flag,
entity_active, is added ahead to HAL to deal with this.

Besides, we also need to check if entity is active when we set
TX power.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220809104952.61355-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/chan.h b/drivers/net/wireless/realtek/rtw89/chan.h
new file mode 100644 (file)
index 0000000..bcaeb98
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtw89/chan.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ * Copyright(c) 2020-2022  Realtek Corporation
+ */
+
+#ifndef __RTW89_CHAN_H__
+#define __RTW89_CHAN_H__
+
+#include "core.h"
+
+static inline bool rtw89_get_entity_state(struct rtw89_dev *rtwdev)
+{
+       struct rtw89_hal *hal = &rtwdev->hal;
+
+       return READ_ONCE(hal->entity_active);
+}
+
+static inline void rtw89_set_entity_state(struct rtw89_dev *rtwdev, bool active)
+{
+       struct rtw89_hal *hal = &rtwdev->hal;
+
+       WRITE_ONCE(hal->entity_active, active);
+}
+
+#endif

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index a5880a54812e75e09be66c2a23b2e6bbd0a74229..68c9b12d223a084ae7563a013503772789dc8cc5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -5,6 +5,7 @@
 #include <linux/udp.h>
 
 #include "cam.h"
+#include "chan.h"
 #include "coex.h"
 #include "core.h"
 #include "efuse.h"
@@ -352,6 +353,19 @@ static void rtw89_get_channel_params(struct cfg80211_chan_def *chandef,
        chan_param->subband_type = subband;
 }
 
+void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev)
+{
+       const struct rtw89_chip_info *chip = rtwdev->chip;
+       bool entity_active;
+
+       entity_active = rtw89_get_entity_state(rtwdev);
+       if (!entity_active)
+               return;
+
+       if (chip->ops->set_txpwr)
+               chip->ops->set_txpwr(rtwdev);
+}
+
 void rtw89_set_channel(struct rtw89_dev *rtwdev)
 {
        struct ieee80211_hw *hw = rtwdev->hw;
@@ -361,6 +375,9 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev)
        struct rtw89_channel_help_params bak;
        u8 center_chan, bandwidth;
        bool band_changed;
+       bool entity_active;
+
+       entity_active = rtw89_get_entity_state(rtwdev);
 
        rtw89_get_channel_params(&hw->conf.chandef, &ch_param);
        if (WARN(ch_param.center_chan == 0, "Invalid channel\n"))
@@ -368,8 +385,7 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev)
 
        center_chan = ch_param.center_chan;
        bandwidth = ch_param.bandwidth;
-       band_changed = hal->current_band_type != ch_param.band_type ||
-                      hal->current_channel == 0;
+       band_changed = hal->current_band_type != ch_param.band_type;
 
        hal->current_band_width = bandwidth;
        hal->current_channel = center_chan;
@@ -380,15 +396,17 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev)
        hal->current_band_type = ch_param.band_type;
        hal->current_subband = ch_param.subband_type;
 
+       rtw89_set_entity_state(rtwdev, true);
+
        rtw89_chip_set_channel_prepare(rtwdev, &bak);
 
        chip->ops->set_channel(rtwdev, &ch_param);
 
-       rtw89_chip_set_txpwr(rtwdev);
+       rtw89_core_set_chip_txpwr(rtwdev);
 
        rtw89_chip_set_channel_done(rtwdev, &bak);
 
-       if (band_changed) {
+       if (!entity_active || band_changed) {
                rtw89_btc_ntfy_switch_band(rtwdev, RTW89_PHY_0, hal->current_band_type);
                rtw89_chip_rfk_band_changed(rtwdev);
        }

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 7a9d6f5d8a5136d7d86034700ead0aafc8033f58..9d5aa47e03878fed9d47ef0eb671cd224a0292f7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -2617,6 +2617,8 @@ struct rtw89_hal {
        u8 rx_nss;
        bool support_cckpd;
        bool support_igi;
+
+       bool entity_active;
 };
 
 #define RTW89_MAX_MAC_ID_NUM 128
@@ -3664,18 +3666,6 @@ static inline void rtw89_chip_set_txpwr_ctrl(struct rtw89_dev *rtwdev)
                chip->ops->set_txpwr_ctrl(rtwdev);
 }
 
-static inline void rtw89_chip_set_txpwr(struct rtw89_dev *rtwdev)
-{
-       const struct rtw89_chip_info *chip = rtwdev->chip;
-       u8 ch = rtwdev->hal.current_channel;
-
-       if (!ch)
-               return;
-
-       if (chip->ops->set_txpwr)
-               chip->ops->set_txpwr(rtwdev);
-}
-
 static inline void rtw89_chip_power_trim(struct rtw89_dev *rtwdev)
 {
        const struct rtw89_chip_info *chip = rtwdev->chip;
@@ -3906,6 +3896,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev);
 void rtw89_core_deinit(struct rtw89_dev *rtwdev);
 int rtw89_core_register(struct rtw89_dev *rtwdev);
 void rtw89_core_unregister(struct rtw89_dev *rtwdev);
+void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev);
 void rtw89_set_channel(struct rtw89_dev *rtwdev);
 u8 rtw89_core_acquire_bit_map(unsigned long *addr, unsigned long size);
 void rtw89_core_release_bit_map(unsigned long *addr, u8 bit);

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 93124b815825feb0c445bf032d51df64239120b6..85e333e995d2a1ef2ce52f37df875e7dcf4eebf2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -3,6 +3,7 @@
  */
 
 #include "cam.h"
+#include "chan.h"
 #include "debug.h"
 #include "fw.h"
 #include "mac.h"
@@ -1081,7 +1082,6 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)
        const struct rtw89_chip_info *chip = rtwdev->chip;
        const struct rtw89_pwr_cfg * const *cfg_seq;
        int (*cfg_func)(struct rtw89_dev *rtwdev);
-       struct rtw89_hal *hal = &rtwdev->hal;
        int ret;
        u8 val;
 
@@ -1113,7 +1113,7 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)
                clear_bit(RTW89_FLAG_POWERON, rtwdev->flags);
                clear_bit(RTW89_FLAG_FW_RDY, rtwdev->flags);
                rtw89_write8(rtwdev, R_AX_SCOREBOARD + 3, MAC_AX_NOTIFY_PWR_MAJOR);
-               hal->current_channel = 0;
+               rtw89_set_entity_state(rtwdev, false);
        }
 
        return 0;

diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c
index 20c7afd3e70fe57aa327a25f2f024c6c62d1f67f..6e5a740b128f027ca4dfeefcaf133e3cad3a6dca 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/regd.c
+++ b/drivers/net/wireless/realtek/rtw89/regd.c
@@ -346,7 +346,7 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request
        rtw89_debug_regd(rtwdev, rtwdev->regd, "get from initiator %d, alpha2",
                         request->initiator);
 
-       rtw89_chip_set_txpwr(rtwdev);
+       rtw89_core_set_chip_txpwr(rtwdev);
 
 exit:
        mutex_unlock(&rtwdev->mutex);

diff --git a/drivers/net/wireless/realtek/rtw89/sar.c b/drivers/net/wireless/realtek/rtw89/sar.c
index eb2d3ec28775f37f19b9a7e48ad670acb0d50578..41cd619f4e980f4d57e6d9baac26275fdac25f98 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/sar.c
+++ b/drivers/net/wireless/realtek/rtw89/sar.c
@@ -228,7 +228,7 @@ static int rtw89_apply_sar_common(struct rtw89_dev *rtwdev,
        }
 
        rtw89_sar_set_src(rtwdev, RTW89_SAR_SOURCE_COMMON, cfg_common, sar);
-       rtw89_chip_set_txpwr(rtwdev);
+       rtw89_core_set_chip_txpwr(rtwdev);
 
 exit:
        mutex_unlock(&rtwdev->mutex);