* [PATCH 1/2] wifi: mt76: connac: remove useless tx_power calculation
@ 2026-11-20 4:40 Shiji Yang
2026-11-20 4:40 ` [PATCH 2/2] wifi: mt76: connac: correct rate power limit logic Shiji Yang
0 siblings, 1 reply; 3+ messages in thread
From: Shiji Yang @ 2026-11-20 4:40 UTC (permalink / raw)
To: linux-wireless
Cc: Felix Fietkau, Lorenzo Bianconi, Ryder Lee, Shayne Chen,
Sean Wang, Matthias Brugger, AngeloGioacchino Del Regno,
Shiji Yang, Mark Brown, linux-kernel, linux-arm-kernel,
linux-mediatek, stable
The variable tx_power was calculated but never used.
Fixes: 317bc1a0590e ("wifi: mt76: connac: factor out rate power limit calculation")
Cc: stable@vger.kernel.org
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 2f925d22b9aa..2ac3b757942e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2225,7 +2225,7 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,
209, 211, 213, 215, 217, 219, 221,
225, 227, 229, 233
};
- int i, n_chan, batch_size, idx = 0, tx_power, last_ch, err = 0;
+ int i, n_chan, batch_size, idx = 0, last_ch, err = 0;
struct mt76_connac_sku_tlv sku_tlbv;
struct mt76_power_limits *limits;
const u8 *ch_list;
@@ -2235,9 +2235,6 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,
return -ENOMEM;
sku_len = is_connac2(dev) ? sizeof(sku_tlbv) : sizeof(sku_tlbv) - 92;
- tx_power = 2 * phy->hw->conf.power_level;
- if (!tx_power)
- tx_power = 127;
if (band == NL80211_BAND_2GHZ) {
n_chan = ARRAY_SIZE(chan_list_2ghz);
--
2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 2/2] wifi: mt76: connac: correct rate power limit logic
2026-11-20 4:40 [PATCH 1/2] wifi: mt76: connac: remove useless tx_power calculation Shiji Yang
@ 2026-11-20 4:40 ` Shiji Yang
2026-11-21 8:14 ` Felix Fietkau
0 siblings, 1 reply; 3+ messages in thread
From: Shiji Yang @ 2026-11-20 4:40 UTC (permalink / raw)
To: linux-wireless
Cc: Felix Fietkau, Lorenzo Bianconi, Ryder Lee, Shayne Chen,
Sean Wang, Matthias Brugger, AngeloGioacchino Del Regno,
Shiji Yang, Mark Brown, linux-kernel, linux-arm-kernel,
linux-mediatek, stable
When mac80211 sets the power to 0, it does not make sense to change
the tx power to the maximum value. The original purpose should be to
limit the tx power to not exceed the hardware limit.
Fixes: 8225816d2974 ("mt76: mt7921: limit txpower according to userlevel power")
Cc: stable@vger.kernel.org
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 2ac3b757942e..931dc550c47e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -3035,12 +3035,9 @@ s8 mt76_connac_get_rate_power_limit(struct mt76_phy *phy,
struct mt76_power_limits *limits)
{
s8 reg_power, sar_power;
- int tx_power;
-
- tx_power = 2 * phy->hw->conf.power_level;
- if (!tx_power)
- tx_power = 127;
+ int tx_power = phy->hw->conf.power_level * 2;
+ tx_power = min_t(int, tx_power, is_connac2(phy->dev) ? 127 : 63);
reg_power = mt76_connac_get_ch_power(phy, chan, tx_power);
sar_power = mt76_get_sar_power(phy, chan, reg_power);
return mt76_get_rate_power_limits(phy, chan, limits, sar_power);
--
2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2/2] wifi: mt76: connac: correct rate power limit logic
2026-11-20 4:40 ` [PATCH 2/2] wifi: mt76: connac: correct rate power limit logic Shiji Yang
@ 2026-11-21 8:14 ` Felix Fietkau
0 siblings, 0 replies; 3+ messages in thread
From: Felix Fietkau @ 2026-11-21 8:14 UTC (permalink / raw)
To: Shiji Yang, linux-wireless
Cc: Lorenzo Bianconi, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Mark Brown,
linux-kernel, linux-arm-kernel, linux-mediatek, stable
On 20.11.26 05:40, Shiji Yang wrote:
> When mac80211 sets the power to 0, it does not make sense to change
> the tx power to the maximum value. The original purpose should be to
> limit the tx power to not exceed the hardware limit.
>
> Fixes: 8225816d2974 ("mt76: mt7921: limit txpower according to userlevel power")
> Cc: stable@vger.kernel.org
> Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
I think in some cases (e.g. on mt792x), hw->conf.power_level is always
0, so this might cause regressions there.
- Felix
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-21 8:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 4:40 [PATCH 1/2] wifi: mt76: connac: remove useless tx_power calculation Shiji Yang
2026-11-20 4:40 ` [PATCH 2/2] wifi: mt76: connac: correct rate power limit logic Shiji Yang
2026-11-21 8:14 ` Felix Fietkau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®