Commit b3cb885e authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move sar utilities to mt76-core module 



Move mt76_get_sar_power and mt76_init_sar_power in the common code.
This is a preliminary patch to add sar support to mt76x02 drivers.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5d461321

drivers/net/wireless/mediatek/mt76/mac80211.c

+53 −0
Original line number Diff line number Diff line
@@ -1348,6 +1348,59 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76_get_txpower);



int mt76_init_sar_power(struct ieee80211_hw *hw,

			const struct cfg80211_sar_specs *sar)

{

	struct mt76_phy *phy = hw->priv;

	const struct cfg80211_sar_capa *capa = hw->wiphy->sar_capa;

	int i;



	if (sar->type != NL80211_SAR_TYPE_POWER || !sar->num_sub_specs)

		return -EINVAL;



	for (i = 0; i < sar->num_sub_specs; i++) {

		u32 index = sar->sub_specs[i].freq_range_index;

		/* SAR specifies power limitaton in 0.25dbm */

		s32 power = sar->sub_specs[i].power >> 1;



		if (power > 127 || power < -127)

			power = 127;



		phy->frp[index].range = &capa->freq_ranges[index];

		phy->frp[index].power = power;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_init_sar_power);



int mt76_get_sar_power(struct mt76_phy *phy,

		       struct ieee80211_channel *chan,

		       int power)

{

	const struct cfg80211_sar_capa *capa = phy->hw->wiphy->sar_capa;

	int freq, i;



	if (!capa || !phy->frp)

		return power;



	if (power > 127 || power < -127)

		power = 127;



	freq = ieee80211_channel_to_frequency(chan->hw_value, chan->band);

	for (i = 0 ; i < capa->num_freq_ranges; i++) {

		if (phy->frp[i].range &&

		    freq >= phy->frp[i].range->start_freq &&

		    freq < phy->frp[i].range->end_freq) {

			power = min_t(int, phy->frp[i].power, power);

			break;

		}

	}



	return power;

}

EXPORT_SYMBOL_GPL(mt76_get_sar_power);



static void

__mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

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

+5 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,11 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy); 


int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     int *dbm);

int mt76_init_sar_power(struct ieee80211_hw *hw,

			const struct cfg80211_sar_specs *sar);

int mt76_get_sar_power(struct mt76_phy *phy,

		       struct ieee80211_channel *chan,

		       int power);



void mt76_csa_check(struct mt76_dev *dev);

void mt76_csa_finish(struct mt76_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+1 −26
Original line number Diff line number Diff line
@@ -1881,30 +1881,6 @@ mt76_connac_mcu_build_sku(struct mt76_dev *dev, s8 *sku, 
	}

}



static s8 mt76_connac_get_sar_power(struct mt76_phy *phy,

				    struct ieee80211_channel *chan,

				    s8 target_power)

{

	const struct cfg80211_sar_capa *capa = phy->hw->wiphy->sar_capa;

	struct mt76_freq_range_power *frp = phy->frp;

	int freq, i;



	if (!capa || !frp)

		return target_power;



	freq = ieee80211_channel_to_frequency(chan->hw_value, chan->band);

	for (i = 0 ; i < capa->num_freq_ranges; i++) {

		if (frp[i].range &&

		    freq >= frp[i].range->start_freq &&

		    freq < frp[i].range->end_freq) {

			target_power = min_t(s8, frp[i].power, target_power);

			break;

		}

	}



	return target_power;

}



static s8 mt76_connac_get_ch_power(struct mt76_phy *phy,

				   struct ieee80211_channel *chan,

				   s8 target_power)
@@ -2049,8 +2025,7 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, 


			reg_power = mt76_connac_get_ch_power(phy, &chan,

							     tx_power);

			sar_power = mt76_connac_get_sar_power(phy, &chan,

							      reg_power);

			sar_power = mt76_get_sar_power(phy, &chan, reg_power);



			mt76_get_rate_power_limits(phy, &chan, &limits,

						   sar_power);

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

+4 −22
Original line number Diff line number Diff line
@@ -1350,35 +1350,17 @@ static void mt7921_sta_set_decap_offload(struct ieee80211_hw *hw, 
static int mt7921_set_sar_specs(struct ieee80211_hw *hw,

				const struct cfg80211_sar_specs *sar)

{

	const struct cfg80211_sar_capa *capa = hw->wiphy->sar_capa;

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt76_freq_range_power *data, *frp;

	struct mt76_phy *mphy = hw->priv;

	int err;

	u32 i;



	if (sar->type != NL80211_SAR_TYPE_POWER || !sar->num_sub_specs)

		return -EINVAL;



	mt7921_mutex_acquire(dev);



	data = mphy->frp;



	for (i = 0; i < sar->num_sub_specs; i++) {

		u32 index = sar->sub_specs[i].freq_range_index;

		/* SAR specifies power limitaton in 0.25dbm */

		s32 power = sar->sub_specs[i].power >> 1;



		if (power > 127 || power < -127)

			power = 127;



		frp = &data[index];

		frp->range = &capa->freq_ranges[index];

		frp->power = power;

	}

	err = mt76_init_sar_power(hw, sar);

	if (err)

		goto out;



	err = mt76_connac_mcu_set_rate_txpower(mphy);



out:

	mt7921_mutex_release(dev);



	return err;