Commit c2258b29 authored by Zong-Zhe Yang's avatar Zong-Zhe Yang Committed by Kalle Valo
Browse files

rtw89: remove cch_by_bw which is not used 



Originally, cch_by_bw recorded center channels of each available
bandwidths under current bandwidth. And the plan was to iterate
cch_by_bw as parameters to query other configurations. However,
we have not used it for the time being. Keeping it will disturb
the follow-up things, such as bandwidth 160 MHz, so we remove it
for now. If it's really needed at some point, we will redesign it.

Signed-off-by: default avatarZong-Zhe Yang <kevin_yang@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/20211201080901.12125-1-pkshih@realtek.com
parent 40822e07

drivers/net/wireless/realtek/rtw89/core.c

+0 −23
Original line number Diff line number Diff line
@@ -143,20 +143,15 @@ static void rtw89_get_channel_params(struct cfg80211_chan_def *chandef, 
{

	struct ieee80211_channel *channel = chandef->chan;

	enum nl80211_chan_width width = chandef->width;

	u8 *cch_by_bw = chan_param->cch_by_bw;

	u32 primary_freq, center_freq;

	u8 center_chan;

	u8 bandwidth = RTW89_CHANNEL_WIDTH_20;

	u8 primary_chan_idx = 0;

	u8 i;



	center_chan = channel->hw_value;

	primary_freq = channel->center_freq;

	center_freq = chandef->center_freq1;



	/* assign the center channel used while 20M bw is selected */

	cch_by_bw[RTW89_CHANNEL_WIDTH_20] = channel->hw_value;



	switch (width) {

	case NL80211_CHAN_WIDTH_20_NOHT:

	case NL80211_CHAN_WIDTH_20:
@@ -183,10 +178,6 @@ static void rtw89_get_channel_params(struct cfg80211_chan_def *chandef, 
				primary_chan_idx = RTW89_SC_20_UPMOST;

				center_chan -= 6;

			}

			/* assign the center channel used

			 * while 40M bw is selected

			 */

			cch_by_bw[RTW89_CHANNEL_WIDTH_40] = center_chan + 4;

		} else {

			if (center_freq - primary_freq == 10) {

				primary_chan_idx = RTW89_SC_20_LOWER;
@@ -195,10 +186,6 @@ static void rtw89_get_channel_params(struct cfg80211_chan_def *chandef, 
				primary_chan_idx = RTW89_SC_20_LOWEST;

				center_chan += 6;

			}

			/* assign the center channel used

			 * while 40M bw is selected

			 */

			cch_by_bw[RTW89_CHANNEL_WIDTH_40] = center_chan - 4;

		}

		break;

	default:
@@ -210,12 +197,6 @@ static void rtw89_get_channel_params(struct cfg80211_chan_def *chandef, 
	chan_param->primary_chan = channel->hw_value;

	chan_param->bandwidth = bandwidth;

	chan_param->pri_ch_idx = primary_chan_idx;



	/* assign the center channel used while current bw is selected */

	cch_by_bw[bandwidth] = center_chan;



	for (i = bandwidth + 1; i <= RTW89_MAX_CHANNEL_WIDTH; i++)

		cch_by_bw[i] = 0;

}



void rtw89_set_channel(struct rtw89_dev *rtwdev)
@@ -228,7 +209,6 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev) 
	u8 center_chan, bandwidth;

	u8 band_type;

	bool band_changed;

	u8 i;



	rtw89_get_channel_params(&hw->conf.chandef, &ch_param);

	if (WARN(ch_param.center_chan == 0, "Invalid channel\n"))
@@ -261,9 +241,6 @@ void rtw89_set_channel(struct rtw89_dev *rtwdev) 
		break;

	}



	for (i = RTW89_CHANNEL_WIDTH_20; i <= RTW89_MAX_CHANNEL_WIDTH; i++)

		hal->cch_by_bw[i] = ch_param.cch_by_bw[i];



	rtw89_chip_set_channel_prepare(rtwdev, &bak);



	chip->ops->set_channel(rtwdev, &ch_param);

drivers/net/wireless/realtek/rtw89/core.h

+0 −6
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ enum rtw89_ps_mode { 
	RTW89_PS_MODE_PWR_GATED	= 3,

};



#define RTW89_MAX_CHANNEL_WIDTH RTW89_CHANNEL_WIDTH_80

#define RTW89_2G_BW_NUM (RTW89_CHANNEL_WIDTH_40 + 1)

#define RTW89_5G_BW_NUM (RTW89_CHANNEL_WIDTH_80 + 1)

#define RTW89_PPE_BW_NUM (RTW89_CHANNEL_WIDTH_80 + 1)
@@ -574,7 +573,6 @@ struct rtw89_channel_params { 
	u8 primary_chan;

	u8 bandwidth;

	u8 pri_ch_idx;

	u8 cch_by_bw[RTW89_MAX_CHANNEL_WIDTH + 1];

};



struct rtw89_channel_help_params {
@@ -2354,10 +2352,6 @@ struct rtw89_hal { 
	enum rtw89_subband current_subband;

	u8 current_band_width;

	u8 current_band_type;

	/* center channel for different available bandwidth,

	 * val of (bw > current_band_width) is invalid

	 */

	u8 cch_by_bw[RTW89_MAX_CHANNEL_WIDTH + 1];

	u32 sw_amsdu_max_size;

	u32 antenna_tx;

	u32 antenna_rx;