Commit 769f3263 authored by Martin Kaistra's avatar Martin Kaistra Committed by Kalle Valo
Browse files

wifi: rtl8xxxu: Add parameter macid to update_rate_mask 



The HW maintains a rate_mask for each connection, referenced by the
macid. Add a parameter to update_rate_mask and add the macid to the
h2c call in the gen2 implementation.

Also extend refresh_rate_mask to get the macid from sta_info.

Signed-off-by: default avatarMartin Kaistra <martin.kaistra@linutronix.de>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230428150833.218605-13-martin.kaistra@linutronix.de
parent 9aa45598

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+4 −3
Original line number Diff line number Diff line
@@ -1916,7 +1916,8 @@ struct rtl8xxxu_fileops { 
	void (*set_tx_power) (struct rtl8xxxu_priv *priv, int channel,

			      bool ht40);

	void (*update_rate_mask) (struct rtl8xxxu_priv *priv,

				  u32 ramask, u8 rateid, int sgi, int txbw_40mhz);

				  u32 ramask, u8 rateid, int sgi, int txbw_40mhz,

				  u8 macid);

	void (*report_connect) (struct rtl8xxxu_priv *priv,

				u8 macid, u8 role, bool connect);

	void (*report_rssi) (struct rtl8xxxu_priv *priv, u8 macid, u8 rssi);
@@ -2035,9 +2036,9 @@ void rtl8xxxu_gen2_config_channel(struct ieee80211_hw *hw); 
void rtl8xxxu_gen1_usb_quirks(struct rtl8xxxu_priv *priv);

void rtl8xxxu_gen2_usb_quirks(struct rtl8xxxu_priv *priv);

void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv,

			       u32 ramask, u8 rateid, int sgi, int txbw_40mhz);

			       u32 ramask, u8 rateid, int sgi, int txbw_40mhz, u8 macid);

void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv,

				    u32 ramask, u8 rateid, int sgi, int txbw_40mhz);

				    u32 ramask, u8 rateid, int sgi, int txbw_40mhz, u8 macid);

void rtl8xxxu_gen1_report_connect(struct rtl8xxxu_priv *priv,

				  u8 macid, u8 role, bool connect);

void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv,

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c

+2 −1
Original line number Diff line number Diff line
@@ -1794,7 +1794,8 @@ static void rtl8188e_arfb_refresh(struct rtl8xxxu_ra_info *ra) 


static void

rtl8188e_update_rate_mask(struct rtl8xxxu_priv *priv,

			  u32 ramask, u8 rateid, int sgi, int txbw_40mhz)

			  u32 ramask, u8 rateid, int sgi, int txbw_40mhz,

			  u8 macid)

{

	struct rtl8xxxu_ra_info *ra = &priv->ra_info;

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+9 −4
Original line number Diff line number Diff line
@@ -4566,7 +4566,8 @@ static void rtl8xxxu_sw_scan_complete(struct ieee80211_hw *hw, 
}



void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv,

			       u32 ramask, u8 rateid, int sgi, int txbw_40mhz)

			       u32 ramask, u8 rateid, int sgi, int txbw_40mhz,

			       u8 macid)

{

	struct h2c_cmd h2c;
@@ -4586,7 +4587,8 @@ void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv, 
}



void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv,

				    u32 ramask, u8 rateid, int sgi, int txbw_40mhz)

				    u32 ramask, u8 rateid, int sgi, int txbw_40mhz,

				    u8 macid)

{

	struct h2c_cmd h2c;

	u8 bw;
@@ -4603,6 +4605,7 @@ void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv, 
	h2c.b_macid_cfg.ramask1 = (ramask >> 8) & 0xff;

	h2c.b_macid_cfg.ramask2 = (ramask >> 16) & 0xff;

	h2c.b_macid_cfg.ramask3 = (ramask >> 24) & 0xff;

	h2c.b_macid_cfg.macid = macid;



	h2c.b_macid_cfg.data1 = rateid;

	if (sgi)
@@ -4968,7 +4971,8 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			priv->vif = vif;

			priv->rssi_level = RTL8XXXU_RATR_STA_INIT;



			priv->fops->update_rate_mask(priv, ramask, 0, sgi, bw == RATE_INFO_BW_40);

			priv->fops->update_rate_mask(priv, ramask, 0, sgi,

						     bw == RATE_INFO_BW_40, 0);



			rtl8xxxu_write8(priv, REG_BCN_MAX_ERR, 0xff);
@@ -6875,6 +6879,7 @@ static void rtl8xxxu_refresh_rate_mask(struct rtl8xxxu_priv *priv, 
	u8 txbw_40mhz;

	u8 snr, snr_thresh_high, snr_thresh_low;

	u8 go_up_gap = 5;

	u8 macid = rtl8xxxu_get_macid(priv, sta);



	rssi_level = priv->rssi_level;

	snr = rtl8xxxu_signal_to_snr(signal);
@@ -6994,7 +6999,7 @@ static void rtl8xxxu_refresh_rate_mask(struct rtl8xxxu_priv *priv, 
		}



		priv->rssi_level = rssi_level;

		priv->fops->update_rate_mask(priv, rate_bitmap, ratr_idx, sgi, txbw_40mhz);

		priv->fops->update_rate_mask(priv, rate_bitmap, ratr_idx, sgi, txbw_40mhz, macid);

	}

}