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

wifi: rtw89: re-arrange channel related stuffs under HAL 



We are planning to support mac80211 chanctx. To reduce future works,
the driver architecture is adjusted first to isolate related things.

According to chip, our HW may have multiple sub-entities to support
multiple mac80211 chanctx. Struct rtw89_chan has been introduced for
things about channel/band/subband/... Now introduce struct rtw89_chan_rcd
to record difference after assigning new one of struct rtw89_chan.

We will implement and support chanctx with single channel first, i.e.
only use entry in RTW89_SUB_ENTITY_0, before handling dual channels.

Our hierarchy in planning will become as the following.
DEV
-> HAL
---> entity (manage status across sub-entities)
-----> sub-entity[*] (support mac80211 chanctx)
where each sub-entity contains one struct rtw89_chan.

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/20220809104952.61355-4-pkshih@realtek.com
parent 3e5831ca

drivers/net/wireless/realtek/rtw89/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ rtw89_core-y += core.o \ 
		sar.o \

		coex.o \

		ps.o \

		chan.o \

		ser.o



obj-$(CONFIG_RTW89_8852A) += rtw89_8852a.o

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/* Copyright(c) 2020-2022  Realtek Corporation

 */



#include "chan.h"



bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev,

			      enum rtw89_sub_entity_idx idx,

			      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];

	bool band_changed;



	rcd->prev_primary_channel = chan->primary_channel;

	rcd->prev_band_type = chan->band_type;

	band_changed = new->band_type != chan->band_type;



	*chan = *new;

	return band_changed;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -21,4 +21,8 @@ static inline void rtw89_set_entity_state(struct rtw89_dev *rtwdev, bool active) 
	WRITE_ONCE(hal->entity_active, active);

}



bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev,

			      enum rtw89_sub_entity_idx idx,

			      const struct rtw89_chan *new);



#endif

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

+5 −6
Original line number Diff line number Diff line
@@ -4150,7 +4150,7 @@ enum btc_wl_mode { 
void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,

			      struct rtw89_sta *rtwsta, enum btc_role_state state)

{

	struct rtw89_hal *hal = &rtwdev->hal;

	const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);

	struct ieee80211_vif *vif = rtwvif_to_vif(rtwvif);

	struct ieee80211_sta *sta = rtwsta_to_sta(rtwsta);

	struct rtw89_btc *btc = &rtwdev->btc;
@@ -4165,8 +4165,7 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif 
		    vif->type == NL80211_IFTYPE_STATION);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], port=%d\n", rtwvif->port);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], band=%d ch=%d bw=%d\n",

		    hal->current_band_type, hal->current_channel,

		    hal->current_band_width);

		    chan->band_type, chan->channel, chan->band_width);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], associated=%d\n",

		    state == BTC_ROLE_MSTS_STA_CONN_END);

	rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -4205,9 +4204,9 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif 
	r.connected = MLME_LINKED;

	r.bcn_period = vif->bss_conf.beacon_int;

	r.dtim_period = vif->bss_conf.dtim_period;

	r.band = hal->current_band_type;

	r.ch = hal->current_channel;

	r.bw = hal->current_band_width;

	r.band = chan->band_type;

	r.ch = chan->channel;

	r.bw = chan->band_width;

	ether_addr_copy(r.mac_addr, rtwvif->mac_addr);



	if (rtwsta && vif->type == NL80211_IFTYPE_STATION)

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

+2 −2
Original line number Diff line number Diff line
@@ -167,12 +167,12 @@ static inline u8 rtw89_btc_phymap(struct rtw89_dev *rtwdev, 
				  enum rtw89_phy_idx phy_idx,

				  enum rtw89_rf_path_bit paths)

{

	struct rtw89_hal *hal = &rtwdev->hal;

	const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);

	u8 phy_map;



	phy_map = FIELD_PREP(BTC_RFK_PATH_MAP, paths) |

		  FIELD_PREP(BTC_RFK_PHY_MAP, BIT(phy_idx)) |

		  FIELD_PREP(BTC_RFK_BAND_MAP, hal->current_band_type);

		  FIELD_PREP(BTC_RFK_BAND_MAP, chan->band_type);



	return phy_map;

}