gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: connac: use a helper to cache txpower_cur

Browse Source 
The cached txpower value is derived from the bounded channel power after
applying the chainmask path delta.

Use a helper for that conversion so callers do not open-code it.

--
v2:
- Rebased onto the latest mt76 tree
- Added Reported-by, Tested-by, Co-developed-by and Signed-off-by tags

Reported-by: Devin Wittmayer <[email protected]>
Closes: https://lore.kernel.org/linux-wireless/[email protected]/
Tested-by: Devin Wittmayer <[email protected]>
Tested-by: Satadru Pramanik <[email protected]>
Co-developed-by: Devin Wittmayer <[email protected]>
Signed-off-by: Devin Wittmayer <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Reported-by: Lucid Duck <[email protected]>
Tested-by: Lucid Duck <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Sean Wang
2026-06-02 13:19:17 +02:00
committed by Felix Fietkau
parent e640565e07
commit 761478b9b1
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76_connac.h
+1 -1
View File
@@ -436,7 +436,7 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm)
void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band);
int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,
int ring_base, void *wed, u32 flags);
void mt76_connac_set_txpower_cur(struct mt76_phy *phy, s8 max_power);
void mt76_connac_write_hw_txp(struct mt76_dev *dev,
struct mt76_tx_info *tx_info,
void *txp_ptr, u32 id);
mt76_connac_mac.c
+9
View File
@@ -275,6 +275,15 @@ int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,
}
EXPORT_SYMBOL_GPL(mt76_connac_init_tx_queues);
void mt76_connac_set_txpower_cur(struct mt76_phy *phy, s8 max_power)
{
int delta;
delta = mt76_tx_power_path_delta(hweight16(phy->chainmask));
phy->txpower_cur = max_power - delta;
}
EXPORT_SYMBOL_GPL(mt76_connac_set_txpower_cur);
#define __bitrate_mask_check(_mcs, _mode) \
({ \
u8 i = 0; \
mt76_connac_mcu.c
+8 -3
View File
@@ -2235,14 +2235,19 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,
.hw_value = ch_list[idx],
.band = band,
};
s8 reg_power, sar_power;
s8 reg_power, sar_power, max_power;
reg_power = mt76_connac_get_ch_power(phy, &chan,
tx_power);
sar_power = mt76_get_sar_power(phy, &chan, reg_power);
mt76_get_rate_power_limits(phy, &chan, limits,
sar_power);
max_power = mt76_get_rate_power_limits(phy, &chan, limits,
sar_power);
if (phy->chandef.chan &&
phy->chandef.chan->hw_value == ch_list[idx] &&
phy->chandef.chan->band == band)
mt76_connac_set_txpower_cur(phy, max_power);
tx_power_tlv.last_msg = ch_list[idx] == last_ch;
sku_tlbv.channel = ch_list[idx];