renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

rtw88: move IQK/DPK into phy_calibration

Browse Source 
Since 8822c requires to do not only IQK, but also DPK.
Move these calibrations that need to be done once the channel
is determined, into phy_calibration.

And note that the order of the calibrations matters, 8822c
should do IQK first, then DPK.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Yan-Hsuan Chuang 2019-09-09 15:16:09 +08:00 committed by Kalle Valo
parent 5227c2ee45
commit f27b886d0d
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/realtek/rtw88/mac80211.c
View File

@ -256,7 +256,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
if (conf->assoc) { if (conf->assoc) {
rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH); rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH);
net_type = RTW_NET_MGD_LINKED; net_type = RTW_NET_MGD_LINKED;
chip->ops->do_iqk(rtwdev); chip->ops->phy_calibration(rtwdev);
rtwvif->aid = conf->aid; rtwvif->aid = conf->aid;
rtw_add_rsvd_page(rtwdev, RSVD_PS_POLL, true); rtw_add_rsvd_page(rtwdev, RSVD_PS_POLL, true);

3
drivers/net/wireless/realtek/rtw88/main.h
View File

@ -640,9 +640,8 @@ struct rtw_chip_ops {
u8 antenna_rx); u8 antenna_rx);
void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable); void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable);
void (*false_alarm_statistics)(struct rtw_dev *rtwdev); void (*false_alarm_statistics)(struct rtw_dev *rtwdev);
void (*do_iqk)(struct rtw_dev *rtwdev); void (*phy_calibration)(struct rtw_dev *rtwdev);
void (*dpk_track)(struct rtw_dev *rtwdev); void (*dpk_track)(struct rtw_dev *rtwdev);
void (*do_dpk)(struct rtw_dev *rtwdev);
/* for coex */ /* for coex */
void (*coex_set_init)(struct rtw_dev *rtwdev); void (*coex_set_init)(struct rtw_dev *rtwdev);

6
drivers/net/wireless/realtek/rtw88/rtw8822b.c
View File

@ -1001,8 +1001,9 @@ static void rtw8822b_do_iqk(struct rtw_dev *rtwdev)
counter, reload, ++do_iqk_cnt, iqk_fail_mask); counter, reload, ++do_iqk_cnt, iqk_fail_mask);
} }
static void rtw8822b_do_dpk(struct rtw_dev *rtwdev) static void rtw8822b_phy_calibration(struct rtw_dev *rtwdev)
{ {
rtw8822b_do_iqk(rtwdev);
} }
static void rtw8822b_coex_cfg_init(struct rtw_dev *rtwdev) static void rtw8822b_coex_cfg_init(struct rtw_dev *rtwdev)
@ -1798,8 +1799,7 @@ static struct rtw_chip_ops rtw8822b_ops = {
.set_antenna = rtw8822b_set_antenna, .set_antenna = rtw8822b_set_antenna,
.cfg_ldo25 = rtw8822b_cfg_ldo25, .cfg_ldo25 = rtw8822b_cfg_ldo25,
.false_alarm_statistics = rtw8822b_false_alarm_statistics, .false_alarm_statistics = rtw8822b_false_alarm_statistics,
.do_iqk = rtw8822b_do_iqk, .phy_calibration = rtw8822b_phy_calibration,
.do_dpk = rtw8822b_do_dpk,
.coex_set_init = rtw8822b_coex_cfg_init, .coex_set_init = rtw8822b_coex_cfg_init,
.coex_set_ant_switch = rtw8822b_coex_cfg_ant_switch, .coex_set_ant_switch = rtw8822b_coex_cfg_ant_switch,

9
drivers/net/wireless/realtek/rtw88/rtw8822c.c
View File

@ -3078,6 +3078,12 @@ static void rtw8822c_do_dpk(struct rtw_dev *rtwdev)
rtw8822c_dpk_restore_registers(rtwdev, DPK_BB_REG_NUM, bckp); rtw8822c_dpk_restore_registers(rtwdev, DPK_BB_REG_NUM, bckp);
} }
static void rtw8822c_phy_calibration(struct rtw_dev *rtwdev)
{
rtw8822c_do_iqk(rtwdev);
rtw8822c_do_dpk(rtwdev);
}
void rtw8822c_dpk_track(struct rtw_dev *rtwdev) void rtw8822c_dpk_track(struct rtw_dev *rtwdev)
{ {
struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info; struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;
@ -3487,9 +3493,8 @@ static struct rtw_chip_ops rtw8822c_ops = {
.set_tx_power_index = rtw8822c_set_tx_power_index, .set_tx_power_index = rtw8822c_set_tx_power_index,
.cfg_ldo25 = rtw8822c_cfg_ldo25, .cfg_ldo25 = rtw8822c_cfg_ldo25,
.false_alarm_statistics = rtw8822c_false_alarm_statistics, .false_alarm_statistics = rtw8822c_false_alarm_statistics,
.do_iqk = rtw8822c_do_iqk,
.do_dpk = rtw8822c_do_dpk,
.dpk_track = rtw8822c_dpk_track, .dpk_track = rtw8822c_dpk_track,
.phy_calibration = rtw8822c_phy_calibration,
.coex_set_init = rtw8822c_coex_cfg_init, .coex_set_init = rtw8822c_coex_cfg_init,
.coex_set_ant_switch = NULL, .coex_set_ant_switch = NULL,