Commit 24e65aac authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove rf type branching (fourth patch) 



remove all function calls to rtw_get_hw_reg made to
read HW_VAR_RF_TYPE and get value of rt_type, which
is always 1T1R. Clean up code on removal sites,
keeping 1T1R code unconditionally.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/8ca2f788c42d81b9cb4dbc46e23c7549dc27d081.1628329348.git.fabioaiuto83@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f75b87a6

drivers/staging/rtl8723bs/core/rtw_ap.c

+2 −6
Original line number Diff line number Diff line
@@ -1034,7 +1034,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
		(pbss_network->ie_length - _BEACON_IE_OFFSET_)

	);

	if (p && ie_len > 0) {

		u8 rf_type = 0;

		u8 max_rx_ampdu_factor = 0;

		struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p + 2);
@@ -1080,11 +1079,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
			IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor

		); /* set  Max Rx AMPDU size  to 64K */



		rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));

		if (rf_type == RF_1T1R) {

		pht_cap->mcs.rx_mask[0] = 0xff;

		pht_cap->mcs.rx_mask[1] = 0x0;

		}



		memcpy(&pmlmepriv->htpriv.ht_cap, p + 2, ie_len);

	}

drivers/staging/rtl8723bs/core/rtw_debug.c

+4 −14
Original line number Diff line number Diff line
@@ -58,21 +58,11 @@ static void dump_4_rf_regs(struct adapter *adapter, int path, int offset) 


void rf_reg_dump(struct adapter *adapter)

{

	int i, path;

	u8 rf_type = 0;

	u8 path_nums = 0;



	rtw_hal_get_hwreg(adapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));

	if ((RF_1T2R == rf_type) || (RF_1T1R == rf_type))

		path_nums = 1;

	else

		path_nums = 2;

	int i, path = 0;



	netdev_dbg(adapter->pnetdev, "======= RF REG =======\n");



	for (path = 0; path < path_nums; path++) {

	netdev_dbg(adapter->pnetdev, "RF_Path(%x)\n", path);

	for (i = 0; i < 0x100; i++)

		dump_4_rf_regs(adapter, path, i);

}
 
}

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+18 −55
Original line number Diff line number Diff line
@@ -1106,11 +1106,10 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
}



/* show MCS rate, unit: 100Kbps */

u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate)

u16 rtw_mcs_rate(u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate)

{

	u16 max_rate = 0;



	if (rf_type == RF_1T1R) {

	if (MCS_rate[0] & BIT(7))

		max_rate = (bw_40MHz) ? ((short_GI)?1500:1350):((short_GI)?722:650);

	else if (MCS_rate[0] & BIT(6))
@@ -1127,43 +1126,7 @@ u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate) 
		max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);

	else if (MCS_rate[0] & BIT(0))

		max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65);

	} else {

		if (MCS_rate[1]) {

			if (MCS_rate[1] & BIT(7))

				max_rate = (bw_40MHz) ? ((short_GI)?3000:2700):((short_GI)?1444:1300);

			else if (MCS_rate[1] & BIT(6))

				max_rate = (bw_40MHz) ? ((short_GI)?2700:2430):((short_GI)?1300:1170);

			else if (MCS_rate[1] & BIT(5))

				max_rate = (bw_40MHz) ? ((short_GI)?2400:2160):((short_GI)?1156:1040);

			else if (MCS_rate[1] & BIT(4))

				max_rate = (bw_40MHz) ? ((short_GI)?1800:1620):((short_GI)?867:780);

			else if (MCS_rate[1] & BIT(3))

				max_rate = (bw_40MHz) ? ((short_GI)?1200:1080):((short_GI)?578:520);

			else if (MCS_rate[1] & BIT(2))

				max_rate = (bw_40MHz) ? ((short_GI)?900:810):((short_GI)?433:390);

			else if (MCS_rate[1] & BIT(1))

				max_rate = (bw_40MHz) ? ((short_GI)?600:540):((short_GI)?289:260);

			else if (MCS_rate[1] & BIT(0))

				max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);

		} else {

			if (MCS_rate[0] & BIT(7))

				max_rate = (bw_40MHz) ? ((short_GI)?1500:1350):((short_GI)?722:650);

			else if (MCS_rate[0] & BIT(6))

				max_rate = (bw_40MHz) ? ((short_GI)?1350:1215):((short_GI)?650:585);

			else if (MCS_rate[0] & BIT(5))

				max_rate = (bw_40MHz) ? ((short_GI)?1200:1080):((short_GI)?578:520);

			else if (MCS_rate[0] & BIT(4))

				max_rate = (bw_40MHz) ? ((short_GI)?900:810):((short_GI)?433:390);

			else if (MCS_rate[0] & BIT(3))

				max_rate = (bw_40MHz) ? ((short_GI)?600:540):((short_GI)?289:260);

			else if (MCS_rate[0] & BIT(2))

				max_rate = (bw_40MHz) ? ((short_GI)?450:405):((short_GI)?217:195);

			else if (MCS_rate[0] & BIT(1))

				max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);

			else if (MCS_rate[0] & BIT(0))

				max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65);

		}

	}



	return max_rate;

}

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+1 −5
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
	struct wlan_bssid_ex	*pcur_bss = &pmlmepriv->cur_network.network;

	struct sta_info *psta = NULL;

	u8 short_GI = 0;

	u8 rf_type = 0;



	if ((check_fwstate(pmlmepriv, _FW_LINKED) != true)

		&& (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
@@ -554,10 +553,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
	short_GI = query_ra_short_GI(psta);



	if (is_supported_ht(psta->wireless_mode)) {

		rtw_hal_get_hwreg(adapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));



		max_rate = rtw_mcs_rate(rf_type,

					((psta->bw_mode == CHANNEL_WIDTH_40)?1:0),

		max_rate = rtw_mcs_rate(psta->bw_mode == CHANNEL_WIDTH_40 ? 1 : 0,

					short_GI,

					psta->htpriv.ht_cap.mcs.rx_mask);

	} else {

drivers/staging/rtl8723bs/core/rtw_mlme.c

+5 −31
Original line number Diff line number Diff line
@@ -2313,7 +2313,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;

	unsigned char *p;

	struct ieee80211_ht_cap ht_capie;

	u8 cbw40_enable = 0, stbc_rx_enable = 0, rf_type = 0, operation_bw = 0;

	u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct ht_priv 	*phtpriv = &pmlmepriv->htpriv;
@@ -2392,25 +2392,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	memcpy(&ht_capie.mcs, pmlmeext->default_supported_mcs_set, 16);



	/* update default supported_mcs_set */

	rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));



	switch (rf_type) {

	case RF_1T1R:

	if (stbc_rx_enable)

		ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX STBC One spatial stream */



	set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R);

		break;



	case RF_2T2R:

	case RF_1T2R:

	default:

		if (stbc_rx_enable)

			ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_2R);/* RX STBC two spatial stream */



		set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);

		break;

	}



	{

		u32 rx_packet_offset, max_recvbuf_sz;
@@ -2510,24 +2495,13 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 
	    (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &

	      BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {

		int i;

		u8 rf_type;



		rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));



		/* update the MCS set */

		for (i = 0; i < 16; i++)

			pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= pmlmeext->default_supported_mcs_set[i];



		/* update the MCS rates */

		switch (rf_type) {

		case RF_1T1R:

		case RF_1T2R:

		set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_1R);

			break;

		case RF_2T2R:

		default:

			set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);

		}



		/* switch to the 40M Hz mode according to the AP */

		/* pmlmeext->cur_bwmode = CHANNEL_WIDTH_40; */