From: Sean Wang <sean.wang@kernel.org>
To: nbd@nbd.name, lorenzo.bianconi@redhat.com
Cc: linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Sean Wang <sean.wang@mediatek.com>
Subject: [PATCH 3/3] wifi: mt76: mt792x: report txpower for the requested vif link
Date: Tue, 24 Mar 2026 23:33:18 -0500 [thread overview]
Message-ID: <20260325043318.13298-3-sean.wang@kernel.org> (raw)
In-Reply-To: <20260325043318.13298-1-sean.wang@kernel.org>
From: Sean Wang <sean.wang@mediatek.com>
mt792x currently reports txpower from the generic PHY cached state,
which may not match the requested vif/link context.
Resolve the requested link channel and derive txpower from that channel
instead, with fallback to the current PHY chandef if no valid chanctx is
available.
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/main.c | 2 +-
.../net/wireless/mediatek/mt76/mt7925/main.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt792x.h | 2 +
.../net/wireless/mediatek/mt76/mt792x_core.c | 41 +++++++++++++++++++
4 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 3d74fabe7408..2e7cdf8edc12 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -1552,7 +1552,7 @@ const struct ieee80211_ops mt7921_ops = {
.wake_tx_queue = mt76_wake_tx_queue,
.release_buffered_frames = mt76_release_buffered_frames,
.channel_switch_beacon = mt7921_channel_switch_beacon,
- .get_txpower = mt76_get_txpower,
+ .get_txpower = mt792x_get_txpower,
.get_stats = mt792x_get_stats,
.get_et_sset_count = mt792x_get_et_sset_count,
.get_et_strings = mt792x_get_et_strings,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 73d3722739d0..53e1a93c6976 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -2433,7 +2433,7 @@ const struct ieee80211_ops mt7925_ops = {
.wake_tx_queue = mt76_wake_tx_queue,
.release_buffered_frames = mt76_release_buffered_frames,
.channel_switch_beacon = mt7925_channel_switch_beacon,
- .get_txpower = mt76_get_txpower,
+ .get_txpower = mt792x_get_txpower,
.get_stats = mt792x_get_stats,
.get_et_sset_count = mt792x_get_et_sset_count,
.get_et_strings = mt792x_get_et_strings,
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 4ff93f2cd624..65eba18bc3a1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -397,6 +397,8 @@ void mt792x_roc_timer(struct timer_list *timer);
void mt792x_csa_timer(struct timer_list *timer);
void mt792x_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
u32 queues, bool drop);
+int mt792x_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ unsigned int link_id, int *dbm);
int mt792x_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *link_conf,
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index 152cfcca2f90..3fd1be7db1f4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -329,6 +329,47 @@ void mt792x_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
}
EXPORT_SYMBOL_GPL(mt792x_flush);
+int mt792x_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ unsigned int link_id, int *dbm)
+{
+ struct mt76_power_limits limits = {};
+ struct ieee80211_bss_conf *link_conf;
+ struct ieee80211_channel *chan;
+ struct mt792x_bss_conf *mconf;
+ struct mt792x_vif *mvif;
+ struct mt76_phy *phy;
+ s8 max_power;
+
+ if (!vif)
+ return mt76_get_txpower(hw, vif, link_id, dbm);
+
+ mvif = (struct mt792x_vif *)vif->drv_priv;
+ phy = mvif->phy->mt76;
+
+ mt792x_mutex_acquire(mvif->phy->dev);
+
+ link_conf = mt792x_vif_to_bss_conf(vif, link_id);
+ mconf = link_conf ? mt792x_link_conf_to_mconf(link_conf) : NULL;
+ if (mconf && mconf->mt76.ctx && mconf->mt76.ctx->def.chan)
+ chan = mconf->mt76.ctx->def.chan;
+ else
+ /* Fall back to the current PHY chandef if the requested link
+ * does not have a valid channel context.
+ */
+ chan = phy->chandef.chan;
+
+ mt792x_mutex_release(mvif->phy->dev);
+
+ if (!chan)
+ return -EINVAL;
+
+ max_power = mt76_connac_get_rate_power_limit(phy, chan, &limits);
+ *dbm = DIV_ROUND_UP(max_power, 2);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mt792x_get_txpower);
+
int mt792x_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *link_conf,
--
2.43.0
next prev parent reply other threads:[~2026-03-25 4:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-25 4:33 [PATCH 1/3] wifi: mt76: connac: use a helper to cache txpower_cur Sean Wang
2026-03-25 4:33 ` [PATCH 2/3] wifi: mt76: connac: factor out rate power limit calculation Sean Wang
2026-03-25 4:33 ` Sean Wang [this message]
2026-03-26 17:04 ` [PATCH 1/3] wifi: mt76: connac: use a helper to cache txpower_cur Lucid Duck
2026-03-27 0:23 ` Sean Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260325043318.13298-3-sean.wang@kernel.org \
--to=sean.wang@kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=sean.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox