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

wifi: rtw89: link rtw89_vif and chanctx stuffs 



First, introduce struct rtw89_sub_entity for chanctx related stuffs.
Second, add enum rtw89_sub_entity_idx to rtw89_vif for vif operation
to access its/right chanctx stuffs after future multi-channel support.

Besides, RTW89_SUB_ENTITY_0 is the default chanctx entry throughout
driver, i.e. it's used for things which may not have a target chanctx
yet. So, we need to ensure that RTW89_SUB_ENTITY_0 is always working.
If there is at least one alive chanctx, then one of them must take
RTW89_SUB_ENTITY_0. If no alive chanctx, RTW89_SUB_ENTITY_0 will be
filled by rtw89_config_default_chandef().

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/20221129083130.45708-7-pkshih@realtek.com
parent c008c4b0

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

+36 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include "chan.h"

#include "debug.h"

#include "util.h"



static enum rtw89_subband rtw89_get_subband_type(enum rtw89_band band,

						 u8 center_chan)
@@ -108,8 +109,8 @@ bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev, 
			      const struct rtw89_chan *new)

{

	struct rtw89_hal *hal = &rtwdev->hal;

	struct rtw89_chan *chan = &hal->chan[idx];

	struct rtw89_chan_rcd *rcd = &hal->chan_rcd[idx];

	struct rtw89_chan *chan = &hal->sub[idx].chan;

	struct rtw89_chan_rcd *rcd = &hal->sub[idx].rcd;

	bool band_changed;



	rcd->prev_primary_channel = chan->primary_channel;
@@ -127,7 +128,7 @@ static void __rtw89_config_entity_chandef(struct rtw89_dev *rtwdev, 
{

	struct rtw89_hal *hal = &rtwdev->hal;



	hal->chandef[idx] = *chandef;

	hal->sub[idx].chandef = *chandef;



	if (from_stack)

		set_bit(idx, hal->entity_map);
@@ -195,6 +196,7 @@ int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev, 
	rtw89_config_entity_chandef(rtwdev, idx, &ctx->def);

	rtw89_set_channel(rtwdev);

	cfg->idx = idx;

	hal->sub[idx].cfg = cfg;

	return 0;

}
@@ -203,8 +205,34 @@ void rtw89_chanctx_ops_remove(struct rtw89_dev *rtwdev, 
{

	struct rtw89_hal *hal = &rtwdev->hal;

	struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv;

	struct rtw89_vif *rtwvif;

	u8 drop, roll;



	clear_bit(cfg->idx, hal->entity_map);

	drop = cfg->idx;

	if (drop != RTW89_SUB_ENTITY_0)

		goto out;



	roll = find_next_bit(hal->entity_map, NUM_OF_RTW89_SUB_ENTITY, drop + 1);



	/* Follow rtw89_config_default_chandef() when rtw89_entity_recalc(). */

	if (roll == NUM_OF_RTW89_SUB_ENTITY)

		goto out;



	/* RTW89_SUB_ENTITY_0 is going to release, and another exists.

	 * Make another roll down to RTW89_SUB_ENTITY_0 to replace.

	 */

	hal->sub[roll].cfg->idx = RTW89_SUB_ENTITY_0;

	hal->sub[RTW89_SUB_ENTITY_0] = hal->sub[roll];



	rtw89_for_each_rtwvif(rtwdev, rtwvif) {

		if (rtwvif->sub_entity_idx == roll)

			rtwvif->sub_entity_idx = RTW89_SUB_ENTITY_0;

	}



	drop = roll;



out:

	clear_bit(drop, hal->entity_map);

	rtw89_set_channel(rtwdev);

}
@@ -225,6 +253,9 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev, 
				 struct rtw89_vif *rtwvif,

				 struct ieee80211_chanctx_conf *ctx)

{

	struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv;



	rtwvif->sub_entity_idx = cfg->idx;

	return 0;

}
@@ -232,4 +263,5 @@ void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev, 
				    struct rtw89_vif *rtwvif,

				    struct ieee80211_chanctx_conf *ctx)

{

	rtwvif->sub_entity_idx = RTW89_SUB_ENTITY_0;

}

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

+13 −7
Original line number Diff line number Diff line
@@ -2240,6 +2240,8 @@ struct rtw89_phy_rate_pattern { 
struct rtw89_vif {

	struct list_head list;

	struct rtw89_dev *rtwdev;

	enum rtw89_sub_entity_idx sub_entity_idx;



	u8 mac_id;

	u8 port;

	u8 mac_addr[ETH_ALEN];
@@ -2953,6 +2955,13 @@ enum rtw89_entity_mode { 
	RTW89_ENTITY_MODE_SCC,

};



struct rtw89_sub_entity {

	struct cfg80211_chan_def chandef;

	struct rtw89_chan chan;

	struct rtw89_chan_rcd rcd;

	struct rtw89_chanctx_cfg *cfg;

};



struct rtw89_hal {

	u32 rx_fltr;

	u8 cv;
@@ -2966,13 +2975,10 @@ struct rtw89_hal { 
	bool support_igi;



	DECLARE_BITMAP(entity_map, NUM_OF_RTW89_SUB_ENTITY);

	struct cfg80211_chan_def chandef[NUM_OF_RTW89_SUB_ENTITY];

	struct rtw89_sub_entity sub[NUM_OF_RTW89_SUB_ENTITY];



	bool entity_active;

	enum rtw89_entity_mode entity_mode;



	struct rtw89_chan chan[NUM_OF_RTW89_SUB_ENTITY];

	struct rtw89_chan_rcd chan_rcd[NUM_OF_RTW89_SUB_ENTITY];

};



#define RTW89_MAX_MAC_ID_NUM 128
@@ -4138,7 +4144,7 @@ const struct cfg80211_chan_def *rtw89_chandef_get(struct rtw89_dev *rtwdev, 
{

	struct rtw89_hal *hal = &rtwdev->hal;



	return &hal->chandef[idx];

	return &hal->sub[idx].chandef;

}



static inline
@@ -4147,7 +4153,7 @@ const struct rtw89_chan *rtw89_chan_get(struct rtw89_dev *rtwdev, 
{

	struct rtw89_hal *hal = &rtwdev->hal;



	return &hal->chan[idx];

	return &hal->sub[idx].chan;

}



static inline
@@ -4156,7 +4162,7 @@ const struct rtw89_chan_rcd *rtw89_chan_rcd_get(struct rtw89_dev *rtwdev, 
{

	struct rtw89_hal *hal = &rtwdev->hal;



	return &hal->chan_rcd[idx];

	return &hal->sub[idx].rcd;

}



static inline void rtw89_chip_fem_setup(struct rtw89_dev *rtwdev)

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, 
	rtwvif->bcn_hit_cond = 0;

	rtwvif->mac_idx = RTW89_MAC_0;

	rtwvif->phy_idx = RTW89_PHY_0;

	rtwvif->sub_entity_idx = RTW89_SUB_ENTITY_0;

	rtwvif->hit_rule = 0;

	ether_addr_copy(rtwvif->mac_addr, vif->addr);