Commit c1edc864 authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

rtw88: add ieee80211:sta_rc_update ops 



Adding this allows us to get notification when bitrate configuration
of the station changes. Update according parameters to firmware so
the rate control algorithm can work properly.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220407095858.46807-2-pkshih@realtek.com
parent af5175ac

drivers/net/wireless/realtek/rtw88/fw.c

+3 −4
Original line number Diff line number Diff line
@@ -585,10 +585,10 @@ void rtw_fw_send_rssi_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) 
	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);

}



void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)

void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,

			 bool reset_ra_mask)

{

	u8 h2c_pkt[H2C_PKT_SIZE] = {0};

	bool no_update = si->updated;

	bool disable_pt = true;



	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_RA_INFO);
@@ -599,7 +599,7 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) 
	SET_RA_INFO_SGI_EN(h2c_pkt, si->sgi_enable);

	SET_RA_INFO_BW_MODE(h2c_pkt, si->bw_mode);

	SET_RA_INFO_LDPC(h2c_pkt, !!si->ldpc_en);

	SET_RA_INFO_NO_UPDATE(h2c_pkt, no_update);

	SET_RA_INFO_NO_UPDATE(h2c_pkt, !reset_ra_mask);

	SET_RA_INFO_VHT_EN(h2c_pkt, si->vht_enable);

	SET_RA_INFO_DIS_PT(h2c_pkt, disable_pt);

	SET_RA_INFO_RA_MASK0(h2c_pkt, (si->ra_mask & 0xff));
@@ -608,7 +608,6 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) 
	SET_RA_INFO_RA_MASK3(h2c_pkt, (si->ra_mask & 0xff000000) >> 24);



	si->init_ra_lv = 0;

	si->updated = true;



	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);

}

drivers/net/wireless/realtek/rtw88/fw.h

+2 −1
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ void rtw_fw_coex_query_hid_info(struct rtw_dev *rtwdev, u8 sub_id, u8 data); 


void rtw_fw_bt_wifi_control(struct rtw_dev *rtwdev, u8 op_code, u8 *data);

void rtw_fw_send_rssi_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);

void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);

void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,

			 bool reset_ra_mask);

void rtw_fw_media_status_report(struct rtw_dev *rtwdev, u8 mac_id, bool conn);

void rtw_fw_update_wl_phy_info(struct rtw_dev *rtwdev);

void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect,

drivers/net/wireless/realtek/rtw88/mac80211.c

+13 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void rtw_ra_mask_info_update_iter(void *data, struct ieee80211_sta *sta) 
	}



	si->use_cfg_mask = true;

	rtw_update_sta_info(br_data->rtwdev, si);

	rtw_update_sta_info(br_data->rtwdev, si, true);

}



static void rtw_ra_mask_info_update(struct rtw_dev *rtwdev,
@@ -850,6 +850,17 @@ static int rtw_ops_set_sar_specs(struct ieee80211_hw *hw, 
	return 0;

}



static void rtw_ops_sta_rc_update(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  struct ieee80211_sta *sta, u32 changed)

{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv;



	if (changed & IEEE80211_RC_BW_CHANGED)

		rtw_update_sta_info(rtwdev, si, true);

}



const struct ieee80211_ops rtw_ops = {

	.tx			= rtw_ops_tx,

	.wake_tx_queue		= rtw_ops_wake_tx_queue,
@@ -879,6 +890,7 @@ const struct ieee80211_ops rtw_ops = { 
	.reconfig_complete	= rtw_reconfig_complete,

	.hw_scan		= rtw_ops_hw_scan,

	.cancel_hw_scan		= rtw_ops_cancel_hw_scan,

	.sta_rc_update		= rtw_ops_sta_rc_update,

	.set_sar_specs          = rtw_ops_set_sar_specs,

#ifdef CONFIG_PM

	.suspend		= rtw_ops_suspend,

drivers/net/wireless/realtek/rtw88/main.c

+4 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ int rtw_sta_add(struct rtw_dev *rtwdev, struct ieee80211_sta *sta, 
	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		rtw_txq_init(rtwdev, sta->txq[i]);



	rtw_update_sta_info(rtwdev, si);

	rtw_update_sta_info(rtwdev, si, true);

	rtw_fw_media_status_report(rtwdev, si->mac_id, true);



	rtwdev->sta_cnt++;
@@ -1105,7 +1105,8 @@ static u64 rtw_rate_mask_cfg(struct rtw_dev *rtwdev, struct rtw_sta_info *si, 
	return ra_mask;

}



void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)

void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,

			 bool reset_ra_mask)

{

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	struct ieee80211_sta *sta = si->sta;
@@ -1223,7 +1224,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) 
	si->ra_mask = ra_mask;

	si->rate_id = rate_id;



	rtw_fw_send_ra_info(rtwdev, si);

	rtw_fw_send_ra_info(rtwdev, si, reset_ra_mask);

}



static int rtw_wait_firmware_completion(struct rtw_dev *rtwdev)

drivers/net/wireless/realtek/rtw88/main.h

+2 −2
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ struct rtw_sta_info { 
	u8 ldpc_en:2;

	bool sgi_enable;

	bool vht_enable;

	bool updated;

	u8 init_ra_lv;

	u64 ra_mask;
@@ -2145,7 +2144,8 @@ void rtw_chip_prepare_tx(struct rtw_dev *rtwdev); 
void rtw_vif_port_config(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif,

			 u32 config);

void rtw_tx_report_purge_timer(struct timer_list *t);

void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si);

void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,

			 bool reset_ra_mask);

void rtw_core_scan_start(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif,

			 const u8 *mac_addr, bool hw_scan);

void rtw_core_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,