Commit 11a60bd2 authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

wifi: mt76: change txpower init to per-phy 



Use per-phy structure for maximum txpower value initializing, since each
phy may have a different chainmask, which can impact the calculation of
power gain.

Co-developed-by: default avatarAllen Ye <allen.ye@mediatek.com>
Signed-off-by: default avatarAllen Ye <allen.ye@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 1e3f3877

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+20 −10
Original line number Diff line number Diff line
@@ -275,10 +275,11 @@ static void mt7915_led_set_brightness(struct led_classdev *led_cdev, 
		mt7915_led_set_config(led_cdev, 0xff, 0);

}



void mt7915_init_txpower(struct mt7915_dev *dev,

static void __mt7915_init_txpower(struct mt7915_phy *phy,

				  struct ieee80211_supported_band *sband)

{

	int i, n_chains = hweight8(dev->mphy.antenna_mask);

	struct mt7915_dev *dev = phy->dev;

	int i, n_chains = hweight16(phy->mt76->chainmask);

	int nss_delta = mt76_tx_power_nss_delta(n_chains);

	int pwr_delta = mt7915_eeprom_get_power_delta(dev, sband->band);

	struct mt76_power_limits limits;
@@ -296,7 +297,7 @@ void mt7915_init_txpower(struct mt7915_dev *dev, 
		}



		target_power += pwr_delta;

		target_power = mt76_get_rate_power_limits(&dev->mphy, chan,

		target_power = mt76_get_rate_power_limits(phy->mt76, chan,

							  &limits,

							  target_power);

		target_power += nss_delta;
@@ -307,6 +308,19 @@ void mt7915_init_txpower(struct mt7915_dev *dev, 
	}

}



void mt7915_init_txpower(struct mt7915_phy *phy)

{

	if (!phy)

		return;



	if (phy->mt76->cap.has_2ghz)

		__mt7915_init_txpower(phy, &phy->mt76->sband_2g.sband);

	if (phy->mt76->cap.has_5ghz)

		__mt7915_init_txpower(phy, &phy->mt76->sband_5g.sband);

	if (phy->mt76->cap.has_6ghz)

		__mt7915_init_txpower(phy, &phy->mt76->sband_6g.sband);

}



static void

mt7915_regd_notifier(struct wiphy *wiphy,

		     struct regulatory_request *request)
@@ -322,9 +336,7 @@ mt7915_regd_notifier(struct wiphy *wiphy, 
	if (dev->mt76.region == NL80211_DFS_UNSET)

		mt7915_mcu_rdd_background_enable(phy, NULL);



	mt7915_init_txpower(dev, &mphy->sband_2g.sband);

	mt7915_init_txpower(dev, &mphy->sband_5g.sband);

	mt7915_init_txpower(dev, &mphy->sband_6g.sband);

	mt7915_init_txpower(phy);



	mphy->dfs_state = MT_DFS_STATE_UNKNOWN;

	mt7915_dfs_init_radar_detector(phy);
@@ -442,6 +454,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy) 
	mt76_set_stream_caps(phy->mt76, true);

	mt7915_set_stream_vht_txbf_caps(phy);

	mt7915_set_stream_he_caps(phy);

	mt7915_init_txpower(phy);



	wiphy->available_antennas_rx = phy->mt76->antenna_mask;

	wiphy->available_antennas_tx = phy->mt76->antenna_mask;
@@ -703,9 +716,6 @@ static void mt7915_init_work(struct work_struct *work) 


	mt7915_mcu_set_eeprom(dev);

	mt7915_mac_init(dev);

	mt7915_init_txpower(dev, &dev->mphy.sband_2g.sband);

	mt7915_init_txpower(dev, &dev->mphy.sband_5g.sband);

	mt7915_init_txpower(dev, &dev->mphy.sband_6g.sband);

	mt7915_txbf_init(dev);

}

drivers/net/wireless/mediatek/mt76/mt7915/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -1401,8 +1401,8 @@ mt7915_mac_restart(struct mt7915_dev *dev) 
		goto out;



	mt7915_mac_init(dev);

	mt7915_init_txpower(dev, &dev->mphy.sband_2g.sband);

	mt7915_init_txpower(dev, &dev->mphy.sband_5g.sband);

	mt7915_init_txpower(&dev->phy);

	mt7915_init_txpower(phy2);

	ret = mt7915_txbf_init(dev);



	if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state)) {

drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h

+1 −2
Original line number Diff line number Diff line
@@ -425,8 +425,7 @@ void mt7915_dma_cleanup(struct mt7915_dev *dev); 
int mt7915_dma_reset(struct mt7915_dev *dev, bool force);

int mt7915_dma_start(struct mt7915_dev *dev, bool reset, bool wed_reset);

int mt7915_txbf_init(struct mt7915_dev *dev);

void mt7915_init_txpower(struct mt7915_dev *dev,

			 struct ieee80211_supported_band *sband);

void mt7915_init_txpower(struct mt7915_phy *phy);

void mt7915_reset(struct mt7915_dev *dev);

int mt7915_run(struct ieee80211_hw *hw);

int mt7915_mcu_init(struct mt7915_dev *dev);

drivers/net/wireless/mediatek/mt76/mt7996/init.c

+20 −10
Original line number Diff line number Diff line
@@ -288,10 +288,11 @@ static void mt7996_led_set_brightness(struct led_classdev *led_cdev, 
		mt7996_led_set_config(led_cdev, 0xff, 0);

}



void mt7996_init_txpower(struct mt7996_dev *dev,

static void __mt7996_init_txpower(struct mt7996_phy *phy,

				  struct ieee80211_supported_band *sband)

{

	int i, nss = hweight8(dev->mphy.antenna_mask);

	struct mt7996_dev *dev = phy->dev;

	int i, nss = hweight16(phy->mt76->chainmask);

	int nss_delta = mt76_tx_power_nss_delta(nss);

	int pwr_delta = mt7996_eeprom_get_power_delta(dev, sband->band);

	struct mt76_power_limits limits;
@@ -301,7 +302,7 @@ void mt7996_init_txpower(struct mt7996_dev *dev, 
		int target_power = mt7996_eeprom_get_target_power(dev, chan);



		target_power += pwr_delta;

		target_power = mt76_get_rate_power_limits(&dev->mphy, chan,

		target_power = mt76_get_rate_power_limits(phy->mt76, chan,

							  &limits,

							  target_power);

		target_power += nss_delta;
@@ -312,6 +313,19 @@ void mt7996_init_txpower(struct mt7996_dev *dev, 
	}

}



void mt7996_init_txpower(struct mt7996_phy *phy)

{

	if (!phy)

		return;



	if (phy->mt76->cap.has_2ghz)

		__mt7996_init_txpower(phy, &phy->mt76->sband_2g.sband);

	if (phy->mt76->cap.has_5ghz)

		__mt7996_init_txpower(phy, &phy->mt76->sband_5g.sband);

	if (phy->mt76->cap.has_6ghz)

		__mt7996_init_txpower(phy, &phy->mt76->sband_6g.sband);

}



static void

mt7996_regd_notifier(struct wiphy *wiphy,

		     struct regulatory_request *request)
@@ -326,9 +340,7 @@ mt7996_regd_notifier(struct wiphy *wiphy, 
	if (dev->mt76.region == NL80211_DFS_UNSET)

		mt7996_mcu_rdd_background_enable(phy, NULL);



	mt7996_init_txpower(dev, &phy->mt76->sband_2g.sband);

	mt7996_init_txpower(dev, &phy->mt76->sband_5g.sband);

	mt7996_init_txpower(dev, &phy->mt76->sband_6g.sband);

	mt7996_init_txpower(phy);



	phy->mt76->dfs_state = MT_DFS_STATE_UNKNOWN;

	mt7996_dfs_init_radar_detector(phy);
@@ -424,6 +436,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed) 
	mt76_set_stream_caps(phy->mt76, true);

	mt7996_set_stream_vht_txbf_caps(phy);

	mt7996_set_stream_he_eht_caps(phy);

	mt7996_init_txpower(phy);



	wiphy->available_antennas_rx = phy->mt76->antenna_mask;

	wiphy->available_antennas_tx = phy->mt76->antenna_mask;
@@ -656,9 +669,6 @@ static void mt7996_init_work(struct work_struct *work) 


	mt7996_mcu_set_eeprom(dev);

	mt7996_mac_init(dev);

	mt7996_init_txpower(dev, &dev->mphy.sband_2g.sband);

	mt7996_init_txpower(dev, &dev->mphy.sband_5g.sband);

	mt7996_init_txpower(dev, &dev->mphy.sband_6g.sband);

	mt7996_txbf_init(dev);

}

drivers/net/wireless/mediatek/mt76/mt7996/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -1755,9 +1755,9 @@ mt7996_mac_restart(struct mt7996_dev *dev) 
		goto out;



	mt7996_mac_init(dev);

	mt7996_init_txpower(dev, &dev->mphy.sband_2g.sband);

	mt7996_init_txpower(dev, &dev->mphy.sband_5g.sband);

	mt7996_init_txpower(dev, &dev->mphy.sband_6g.sband);

	mt7996_init_txpower(&dev->phy);

	mt7996_init_txpower(phy2);

	mt7996_init_txpower(phy3);

	ret = mt7996_txbf_init(dev);



	if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state)) {