rtw88: 8821c: add beamformee support

Beamforming is used for directional signal transmission/reception.
Beamformee plays the role for signal reception, and makes the RX
performance better in middle distance range.

Implement beamformee related callbacks for 8821c.

Since 8821c only support 1ss rate, nc_index in beamformee setting
needs to be adjusted based on the capability.

Signed-off-by: Tzu-En Huang <tehuang@realtek.com>
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200603094218.19942-4-yhchuang@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c
index 8a070d5..aff70e4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/bf.c
+++ b/drivers/net/wireless/realtek/rtw88/bf.c
@@ -183,7 +183,7 @@ void rtw_bf_del_sounding(struct rtw_dev *rtwdev)
 void rtw_bf_enable_bfee_su(struct rtw_dev *rtwdev, struct rtw_vif *vif,
                           struct rtw_bfee *bfee)
 {
-       u8 nc_index = 1;
+       u8 nc_index = hweight8(rtwdev->hal.antenna_rx) - 1;
        u8 nr_index = bfee->sound_dim;
        u8 grouping = 0, codebookinfo = 1, coefficientsize = 3;
        u32 addr_bfer_info, addr_csi_rpt, csi_param;
@@ -231,7 +231,8 @@ void rtw_bf_enable_bfee_mu(struct rtw_dev *rtwdev, struct rtw_vif *vif,
 {
        struct rtw_bf_info *bf_info = &rtwdev->bf_info;
        struct mu_bfer_init_para param;
-       u8 nc_index = 1, nr_index = 1;
+       u8 nc_index = hweight8(rtwdev->hal.antenna_rx) - 1;
+       u8 nr_index = 1;
        u8 grouping = 0, codebookinfo = 1, coefficientsize = 0;
        u32 csi_param;
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index aa24570..c41c61e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -101,6 +101,13 @@ static void rtw8821c_pwrtrack_init(struct rtw_dev *rtwdev)
        dm_info->thermal_meter_k = rtwdev->efuse.thermal_meter_k;
 }
 
+static void rtw8821c_phy_bf_init(struct rtw_dev *rtwdev)
+{
+       rtw_bf_phy_init(rtwdev);
+       /* Grouping bitmap parameters */
+       rtw_write32(rtwdev, 0x1C94, 0xAFFFAFFF);
+}
+
 static void rtw8821c_phy_set_param(struct rtw_dev *rtwdev)
 {
        u8 crystal_cap, val;
@@ -145,6 +152,8 @@ static void rtw8821c_phy_set_param(struct rtw_dev *rtwdev)
        rtwdev->dm_info.cck_pd_default = rtw_read8(rtwdev, REG_CSRATIO) & 0x1f;
 
        rtw8821c_pwrtrack_init(rtwdev);
+
+       rtw8821c_phy_bf_init(rtwdev);
 }
 
 static int rtw8821c_mac_init(struct rtw_dev *rtwdev)
@@ -786,6 +795,37 @@ static void rtw8821c_pwr_track(struct rtw_dev *rtwdev)
        dm_info->pwr_trk_triggered = false;
 }
 
+static void rtw8821c_bf_config_bfee_su(struct rtw_dev *rtwdev,
+                                      struct rtw_vif *vif,
+                                      struct rtw_bfee *bfee, bool enable)
+{
+       if (enable)
+               rtw_bf_enable_bfee_su(rtwdev, vif, bfee);
+       else
+               rtw_bf_remove_bfee_su(rtwdev, bfee);
+}
+
+static void rtw8821c_bf_config_bfee_mu(struct rtw_dev *rtwdev,
+                                      struct rtw_vif *vif,
+                                      struct rtw_bfee *bfee, bool enable)
+{
+       if (enable)
+               rtw_bf_enable_bfee_mu(rtwdev, vif, bfee);
+       else
+               rtw_bf_remove_bfee_mu(rtwdev, bfee);
+}
+
+static void rtw8821c_bf_config_bfee(struct rtw_dev *rtwdev, struct rtw_vif *vif,
+                                   struct rtw_bfee *bfee, bool enable)
+{
+       if (bfee->role == RTW_BFEE_SU)
+               rtw8821c_bf_config_bfee_su(rtwdev, vif, bfee, enable);
+       else if (bfee->role == RTW_BFEE_MU)
+               rtw8821c_bf_config_bfee_mu(rtwdev, vif, bfee, enable);
+       else
+               rtw_warn(rtwdev, "wrong bfee role\n");
+}
+
 static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl)
 {
        struct rtw_dm_info *dm_info = &rtwdev->dm_info;
@@ -1250,6 +1290,9 @@ static struct rtw_chip_ops rtw8821c_ops = {
        .phy_calibration        = rtw8821c_phy_calibration,
        .cck_pd_set             = rtw8821c_phy_cck_pd_set,
        .pwr_track              = rtw8821c_pwr_track,
+       .config_bfee            = rtw8821c_bf_config_bfee,
+       .set_gid_table          = rtw_bf_set_gid_table,
+       .cfg_csi_rate           = rtw_bf_cfg_csi_rate,
 };
 
 static const u8 rtw8821c_pwrtrk_5gb_n[][RTW_PWR_TRK_TBL_SZ] = {
@@ -1395,6 +1438,8 @@ struct rtw_chip_info rtw8821c_hw_spec = {
        .rx_ldpc = false,
        .pwr_track_tbl = &rtw8821c_rtw_pwr_track_tbl,
        .iqk_threshold = 8,
+       .bfer_su_max_num = 2,
+       .bfer_mu_max_num = 1,
 };
 EXPORT_SYMBOL(rtw8821c_hw_spec);