Linux wireless drivers development
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Subject: [PATCH mt76-next 16/20] wifi: mt76: mt7925: keep the antenna mask across a firmware reload
Date: Thu, 19 Nov 2026 13:43:48 +0100	[thread overview]
Message-ID: <20261119124352.1842164-16-nbd@nbd.name> (raw)
In-Reply-To: <20261119124352.1842164-1-nbd@nbd.name>

mt7925_mcu_parse_phy_cap() sets antenna_mask and chainmask to every
chain that the firmware reports, also when the chip reset of
mt7925_mac_reset_work() loads the firmware again. A mask that
mt7925_set_antenna() set is thus lost, while the stream caps of each
band still follow it.

Only set the mask of every chain at the first firmware load. On a
reload, keep the current mask, limited to the chains of the reloaded
firmware, and build the stream caps again if that limit changes it.

Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 218815e64a81..cc7a020c14ab 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1122,16 +1122,28 @@ mt7925_mcu_parse_phy_cap(struct mt792x_dev *dev, char *data, int len)
 		WF0_24G,
 		WF0_5G
 	};
+	bool changed;
+	u8 mask;
 
 	if (len < offsetofend(struct mt7925_mcu_phy_cap, hw_path))
 		return;
 
 	cap = (struct mt7925_mcu_phy_cap *)data;
 
-	mdev->phy.antenna_mask = BIT(cap->nss) - 1;
-	mdev->phy.chainmask = mdev->phy.antenna_mask;
+	mask = BIT(cap->nss) - 1;
+	if (dev->hw_init_done)
+		mask &= mdev->phy.antenna_mask;
+	changed = mask != mdev->phy.antenna_mask;
+
+	mdev->phy.antenna_mask = mask;
+	mdev->phy.chainmask = mask;
 	mdev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G);
 	mdev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G);
+
+	if (dev->hw_init_done && changed) {
+		mt76_set_stream_caps(mphy, true);
+		mt7925_set_stream_he_eht_caps(&dev->phy);
+	}
 }
 
 static void
-- 
2.47.3


  parent reply	other threads:[~2026-11-19 12:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 12:43 [PATCH mt76-next 01/20] wifi: mt76: mt7921: skip the ND offload update of a vif not in the driver Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 02/20] wifi: mt76: mt7925: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 03/20] wifi: mt76: take the remaining wcids off the phy tx_list at reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 04/20] wifi: mt76: take the remaining wcids off sta_poll_list " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 05/20] wifi: mt76: mt7915: take the remaining stations off sta_rc_list " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 06/20] wifi: mt76: mt7996: list only published links on sta_rc_list Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 07/20] wifi: mt76: mt7996: take the remaining links off sta_rc_list at reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 08/20] wifi: mt76: mt7915: take the TWT flows of a removed station off twt_list Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 09/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 10/20] wifi: mt76: mt7915: drop the TWT agreements at a full reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 11/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 12/20] wifi: mt76: mt7915: read twt_list under the mutex in twt_stats Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 13/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 14/20] wifi: mt76: mt7915: publish the global wcid again after a full reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 15/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` Felix Fietkau [this message]
2026-11-19 12:43 ` [PATCH mt76-next 17/20] wifi: mt76: mt7925: remove mt7925_mcu_del_dev() Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 18/20] wifi: mt76: mt7921: keep the antenna mask across a firmware reload Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 19/20] wifi: mt76: mt792x: flush frames that still wait for the TX worker Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 20/20] wifi: mt76: mt7925: send the deauth of an MLD station on its AC queue Felix Fietkau

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=20261119124352.1842164-16-nbd@nbd.name \
    --to=nbd@nbd.name \
    --cc=linux-wireless@vger.kernel.org \
    /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