wifi: rtw89: phy: support EDCCA per PHY

Dynamic mechanism EDCCA (Energy Detection Clear Channel Assessment) is to
dynamically adjusted to make EDCCA suitable for situations.

Use PHY context to support two PHY.

For the EDCCA log part, registers to report EDCCA for PHY 1 is not a
simple offset from PHY 0, so add them by separate patch.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250117072828.16728-7-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index e39fb696ac13cfd9ffb2143a90ab5a885e20705a..b730f70c82aa9457e072fa3d2b04c4d2d0281eb6 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -4906,6 +4906,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwv
 {
        const struct rtw89_chan *chan = rtw89_chan_get(rtwdev,
                                                       rtwvif_link->chanctx_idx);
+       struct rtw89_bb_ctx *bb = rtw89_get_bb_ctx(rtwdev, rtwvif_link->phy_idx);
 
        rtwdev->scanning = true;
        rtw89_leave_lps(rtwdev);
@@ -4916,7 +4917,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwv
        rtw89_btc_ntfy_scan_start(rtwdev, rtwvif_link->phy_idx, chan->band_type);
        rtw89_chip_rfk_scan(rtwdev, rtwvif_link, true);
        rtw89_hci_recalc_int_mit(rtwdev);
-       rtw89_phy_config_edcca(rtwdev, true);
+       rtw89_phy_config_edcca(rtwdev, bb, true);
 
        rtw89_fw_h2c_cam(rtwdev, rtwvif_link, NULL, mac_addr);
 }
@@ -4941,7 +4942,8 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,
 
        rtw89_chip_rfk_scan(rtwdev, rtwvif_link, false);
        rtw89_btc_ntfy_scan_finish(rtwdev, rtwvif_link->phy_idx);
-       rtw89_phy_config_edcca(rtwdev, false);
+       bb = rtw89_get_bb_ctx(rtwdev, rtwvif_link->phy_idx);
+       rtw89_phy_config_edcca(rtwdev, bb, false);
 
        rtwdev->scanning = false;
        rtw89_for_each_active_bb(rtwdev, bb)

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index ca2719957bbfb96e80a070a5d611e84e5d094c57..c8b4809c2f3680832824dfbfeb7e1d7cc8ae5088 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4768,7 +4768,6 @@ struct rtw89_hal {
        enum rtw89_entity_mode entity_mode;
        struct rtw89_entity_mgnt entity_mgnt;
 
-       struct rtw89_edcca_bak edcca_bak;
        u32 disabled_dm_bitmap; /* bitmap of enum rtw89_dm_type */
 
        u8 thermal_prot_th;
@@ -5683,7 +5682,6 @@ struct rtw89_dev {
        struct rtw89_power_trim_info pwr_trim;
 
        struct rtw89_cfo_tracking_info cfo_tracking;
-       struct rtw89_phy_ch_info ch_info;
        union {
                struct rtw89_phy_bb_gain_info ax;
                struct rtw89_phy_bb_gain_info_be be;
@@ -5697,6 +5695,7 @@ struct rtw89_dev {
                struct rtw89_env_monitor_info env_monitor;
                struct rtw89_dig_info dig;
                struct rtw89_phy_ch_info ch_info;
+               struct rtw89_edcca_bak edcca_bak;
        } bbs[RTW89_PHY_NUM];
 
        struct delayed_work track_work;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index e07f874590d2cb4070deec28e49e292d6f614c08..f1029da4a78eaeb265e7313caf0291536b262671 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -6584,10 +6584,13 @@ static void rtw89_phy_env_monitor_init(struct rtw89_dev *rtwdev)
                __rtw89_phy_env_monitor_init(rtwdev, bb);
 }
 
-static void rtw89_phy_edcca_init(struct rtw89_dev *rtwdev)
+static void __rtw89_phy_edcca_init(struct rtw89_dev *rtwdev,
+                                  struct rtw89_bb_ctx *bb)
 {
        const struct rtw89_edcca_regs *edcca_regs = rtwdev->chip->edcca_regs;
-       struct rtw89_edcca_bak *edcca_bak = &rtwdev->hal.edcca_bak;
+       struct rtw89_edcca_bak *edcca_bak = &bb->edcca_bak;
+
+       rtw89_debug(rtwdev, RTW89_DBG_EDCCA, "BB-%d edcca init\n", bb->phy_idx);
 
        memset(edcca_bak, 0, sizeof(*edcca_bak));
 
@@ -6603,8 +6606,16 @@ static void rtw89_phy_edcca_init(struct rtw89_dev *rtwdev)
                rtw89_phy_set_phy_regs(rtwdev, R_DFS_FFT_CG, B_DFS_FFT_EN, 1);
        }
 
-       rtw89_phy_write32_mask(rtwdev, edcca_regs->tx_collision_t2r_st,
-                              edcca_regs->tx_collision_t2r_st_mask, 0x29);
+       rtw89_phy_write32_idx(rtwdev, edcca_regs->tx_collision_t2r_st,
+                             edcca_regs->tx_collision_t2r_st_mask, 0x29, bb->phy_idx);
+}
+
+static void rtw89_phy_edcca_init(struct rtw89_dev *rtwdev)
+{
+       struct rtw89_bb_ctx *bb;
+
+       rtw89_for_each_capab_bb(rtwdev, bb)
+               __rtw89_phy_edcca_init(rtwdev, bb);
 }
 
 void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)
@@ -6967,42 +6978,43 @@ void rtw89_decode_chan_idx(struct rtw89_dev *rtwdev, u8 chan_idx,
 }
 EXPORT_SYMBOL(rtw89_decode_chan_idx);
 
-void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev, bool scan)
+void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev,
+                           struct rtw89_bb_ctx *bb, bool scan)
 {
        const struct rtw89_edcca_regs *edcca_regs = rtwdev->chip->edcca_regs;
-       struct rtw89_edcca_bak *edcca_bak = &rtwdev->hal.edcca_bak;
+       struct rtw89_edcca_bak *edcca_bak = &bb->edcca_bak;
 
        if (scan) {
                edcca_bak->a =
-                       rtw89_phy_read32_mask(rtwdev, edcca_regs->edcca_level,
-                                             edcca_regs->edcca_mask);
+                       rtw89_phy_read32_idx(rtwdev, edcca_regs->edcca_level,
+                                            edcca_regs->edcca_mask, bb->phy_idx);
                edcca_bak->p =
-                       rtw89_phy_read32_mask(rtwdev, edcca_regs->edcca_level,
-                                             edcca_regs->edcca_p_mask);
+                       rtw89_phy_read32_idx(rtwdev, edcca_regs->edcca_level,
+                                            edcca_regs->edcca_p_mask, bb->phy_idx);
                edcca_bak->ppdu =
-                       rtw89_phy_read32_mask(rtwdev, edcca_regs->ppdu_level,
-                                             edcca_regs->ppdu_mask);
-
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                                      edcca_regs->edcca_mask, EDCCA_MAX);
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                                      edcca_regs->edcca_p_mask, EDCCA_MAX);
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->ppdu_level,
-                                      edcca_regs->ppdu_mask, EDCCA_MAX);
+                       rtw89_phy_read32_idx(rtwdev, edcca_regs->ppdu_level,
+                                            edcca_regs->ppdu_mask, bb->phy_idx);
+
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                                     edcca_regs->edcca_mask, EDCCA_MAX, bb->phy_idx);
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                                     edcca_regs->edcca_p_mask, EDCCA_MAX, bb->phy_idx);
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->ppdu_level,
+                                     edcca_regs->ppdu_mask, EDCCA_MAX, bb->phy_idx);
        } else {
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                                      edcca_regs->edcca_mask,
-                                      edcca_bak->a);
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                                      edcca_regs->edcca_p_mask,
-                                      edcca_bak->p);
-               rtw89_phy_write32_mask(rtwdev, edcca_regs->ppdu_level,
-                                      edcca_regs->ppdu_mask,
-                                      edcca_bak->ppdu);
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                                     edcca_regs->edcca_mask,
+                                     edcca_bak->a, bb->phy_idx);
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                                     edcca_regs->edcca_p_mask,
+                                     edcca_bak->p, bb->phy_idx);
+               rtw89_phy_write32_idx(rtwdev, edcca_regs->ppdu_level,
+                                     edcca_regs->ppdu_mask,
+                                     edcca_bak->ppdu, bb->phy_idx);
        }
 }
 
-static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev)
+static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb)
 {
        const struct rtw89_edcca_regs *edcca_regs = rtwdev->chip->edcca_regs;
        bool flag_fb, flag_p20, flag_s20, flag_s40, flag_s80;
@@ -7099,9 +7111,10 @@ static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev)
                    pwdb_fb, pwdb_p20, pwdb_s20, pwdb_s40, pwdb_s80);
 }
 
-static u8 rtw89_phy_edcca_get_thre_by_rssi(struct rtw89_dev *rtwdev)
+static u8 rtw89_phy_edcca_get_thre_by_rssi(struct rtw89_dev *rtwdev,
+                                          struct rtw89_bb_ctx *bb)
 {
-       struct rtw89_phy_ch_info *ch_info = &rtwdev->ch_info;
+       struct rtw89_phy_ch_info *ch_info = &bb->ch_info;
        bool is_linked = rtwdev->total_sta_assoc > 0;
        u8 rssi_min = ch_info->rssi_min >> 1;
        u8 edcca_thre;
@@ -7117,13 +7130,13 @@ static u8 rtw89_phy_edcca_get_thre_by_rssi(struct rtw89_dev *rtwdev)
        return edcca_thre;
 }
 
-void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev)
+void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb)
 {
        const struct rtw89_edcca_regs *edcca_regs = rtwdev->chip->edcca_regs;
-       struct rtw89_edcca_bak *edcca_bak = &rtwdev->hal.edcca_bak;
+       struct rtw89_edcca_bak *edcca_bak = &bb->edcca_bak;
        u8 th;
 
-       th = rtw89_phy_edcca_get_thre_by_rssi(rtwdev);
+       th = rtw89_phy_edcca_get_thre_by_rssi(rtwdev, bb);
        if (th == edcca_bak->th_old)
                return;
 
@@ -7132,23 +7145,33 @@ void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev)
        rtw89_debug(rtwdev, RTW89_DBG_EDCCA,
                    "[EDCCA]: Normal Mode, EDCCA_th = %d\n", th);
 
-       rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                              edcca_regs->edcca_mask, th);
-       rtw89_phy_write32_mask(rtwdev, edcca_regs->edcca_level,
-                              edcca_regs->edcca_p_mask, th);
-       rtw89_phy_write32_mask(rtwdev, edcca_regs->ppdu_level,
-                              edcca_regs->ppdu_mask, th);
+       rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                             edcca_regs->edcca_mask, th, bb->phy_idx);
+       rtw89_phy_write32_idx(rtwdev, edcca_regs->edcca_level,
+                             edcca_regs->edcca_p_mask, th, bb->phy_idx);
+       rtw89_phy_write32_idx(rtwdev, edcca_regs->ppdu_level,
+                             edcca_regs->ppdu_mask, th, bb->phy_idx);
+}
+
+static
+void __rtw89_phy_edcca_track(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb)
+{
+       rtw89_debug(rtwdev, RTW89_DBG_EDCCA, "BB-%d edcca track\n", bb->phy_idx);
+
+       rtw89_phy_edcca_thre_calc(rtwdev, bb);
+       rtw89_phy_edcca_log(rtwdev, bb);
 }
 
 void rtw89_phy_edcca_track(struct rtw89_dev *rtwdev)
 {
        struct rtw89_hal *hal = &rtwdev->hal;
+       struct rtw89_bb_ctx *bb;
 
        if (hal->disabled_dm_bitmap & BIT(RTW89_DM_DYNAMIC_EDCCA))
                return;
 
-       rtw89_phy_edcca_thre_calc(rtwdev);
-       rtw89_phy_edcca_log(rtwdev);
+       rtw89_for_each_active_bb(rtwdev, bb)
+               __rtw89_phy_edcca_track(rtwdev, bb);
 }
 
 enum rtw89_rf_path_bit rtw89_phy_get_kpath(struct rtw89_dev *rtwdev,

diff --git a/drivers/net/wireless/realtek/rtw89/phy.h b/drivers/net/wireless/realtek/rtw89/phy.h
index db748c7453cd9f8ec8496247319b8ba895f86a34..33d466c519e3ac866308a6c3fe67fe476f76ad3b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.h
+++ b/drivers/net/wireless/realtek/rtw89/phy.h
@@ -1002,9 +1002,10 @@ void rtw89_phy_ul_tb_ctrl_track(struct rtw89_dev *rtwdev);
 u8 rtw89_encode_chan_idx(struct rtw89_dev *rtwdev, u8 central_ch, u8 band);
 void rtw89_decode_chan_idx(struct rtw89_dev *rtwdev, u8 chan_idx,
                           u8 *ch, enum nl80211_band *band);
-void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev, bool scan);
+void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev,
+                           struct rtw89_bb_ctx *bb, bool scan);
 void rtw89_phy_edcca_track(struct rtw89_dev *rtwdev);
-void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev);
+void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb);
 enum rtw89_rf_path_bit rtw89_phy_get_kpath(struct rtw89_dev *rtwdev,
                                           enum rtw89_phy_idx phy_idx);
 enum rtw89_rf_path rtw89_phy_get_syn_sel(struct rtw89_dev *rtwdev,