Commit 63db9d40 authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

mt76: mt7921: introduce ACPI SAR config in tx power 



Add new function mt7921_set_tx_sar_pwr() to update SAR power from
.set_sar_specs and ACPI setting. Both settings would be merged into
mt76_freq_range_power for final tx power value.

Reviewed-by: default avatarSean Wang <sean.wang@mediatek.com>
Co-developed-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f965333e

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

+1 −2
Original line number Diff line number Diff line
@@ -34,14 +34,13 @@ mt7921_regd_notifier(struct wiphy *wiphy, 
{

	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);



	memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));

	dev->mt76.region = request->dfs_region;



	mt7921_mutex_acquire(dev);

	mt76_connac_mcu_set_channel_domain(hw->priv);

	mt76_connac_mcu_set_rate_txpower(phy->mt76);

	mt7921_set_tx_sar_pwr(hw, NULL);

	mt7921_mutex_release(dev);

}

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+22 −9
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ int __mt7921_start(struct mt7921_phy *phy) 
	if (err)

		return err;



	err = mt76_connac_mcu_set_rate_txpower(phy->mt76);

	err = mt7921_set_tx_sar_pwr(mphy->hw, NULL);

	if (err)

		return err;
@@ -548,7 +548,7 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed) 
	mt7921_mutex_acquire(dev);



	if (changed & IEEE80211_CONF_CHANGE_POWER) {

		ret = mt76_connac_mcu_set_rate_txpower(phy->mt76);

		ret = mt7921_set_tx_sar_pwr(hw, NULL);

		if (ret)

			goto out;

	}
@@ -1469,20 +1469,33 @@ static void mt7921_ipv6_addr_change(struct ieee80211_hw *hw, 
}

#endif



static int mt7921_set_sar_specs(struct ieee80211_hw *hw,

int mt7921_set_tx_sar_pwr(struct ieee80211_hw *hw,

			  const struct cfg80211_sar_specs *sar)

{

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt76_phy *mphy = hw->priv;

	int err;



	mt7921_mutex_acquire(dev);

	if (sar) {

		err = mt76_init_sar_power(hw, sar);

		if (err)

		goto out;

			return err;

	}



	mt7921_init_acpi_sar_power(mt7921_hw_phy(hw), !sar);



	err = mt76_connac_mcu_set_rate_txpower(mphy);

out:



	return err;

}



static int mt7921_set_sar_specs(struct ieee80211_hw *hw,

				const struct cfg80211_sar_specs *sar)

{

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	int err;



	mt7921_mutex_acquire(dev);

	err = mt7921_set_tx_sar_pwr(hw, sar);

	mt7921_mutex_release(dev);



	return err;

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

+2 −0
Original line number Diff line number Diff line
@@ -501,4 +501,6 @@ mt7921_init_acpi_sar_power(struct mt7921_phy *phy, bool set_default) 
	return 0;

}

#endif

int mt7921_set_tx_sar_pwr(struct ieee80211_hw *hw,

			  const struct cfg80211_sar_specs *sar);

#endif