From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from flow-b6-smtp.messagingengine.com (flow-b6-smtp.messagingengine.com [202.12.124.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB3E13890F2; Wed, 25 Mar 2026 22:11:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774476681; cv=none; b=gV0BV3ddJu3ZheumVvt9A1MiJCwHg0lkzItSIrIGcXI3OULn+CzXV/lhxiVjfNMpbi2N3o6bdpyMDIKP2ltfBDcmuHTUkiwPq8LSjAE+CpqlfXlHOoIkRRPDt6pV451ksXJyqG8b/7KGbopJWxRpnhTU47fX1MC2NvvcisJ8zYU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774476681; c=relaxed/simple; bh=k7ML223623/sKHJ5G4m8RaRLCZYBr2GHAeNHlqaNLws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc: In-Reply-To:References; b=r9jPK/yzINFUQMh3rb9ydbI3sFbUFhdjludLHTRu02aEF7a5SK1DJ2gBFq1x4arlKlHfeEQ5oeu5IOddmMPWL5Yh6J+3PyMbwJXXjjL00Aq1kDOQsPRf5K5lRra03/90vocPO+zwj48o8b/ghU+Gw40hvTd4wqqelDnFwj9dsFs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jetm.me; spf=pass smtp.mailfrom=jetm.me; dkim=pass (2048-bit key) header.d=jetm.me header.i=@jetm.me header.b=D3tYomih; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=nqmpQRBZ; arc=none smtp.client-ip=202.12.124.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jetm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jetm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jetm.me header.i=@jetm.me header.b="D3tYomih"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="nqmpQRBZ" Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailflow.stl.internal (Postfix) with ESMTP id BC8B6130053A; Wed, 25 Mar 2026 18:11:15 -0400 (EDT) Received: from phl-imap-07 ([10.202.2.97]) by phl-compute-02.internal (MEProxy); Wed, 25 Mar 2026 18:11:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jetm.me; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1774476675; x=1774483875; bh=9RiVDNxFY8iLYQgVth/o2a88iVWrgG/0vCHV/lBcUvY=; b= D3tYomih7DWQPXMbTzxA/UK9jOEConTj/AzIHACmmpN1Dc477JfIpgEtRbjwO9XJ 94uwskDlJFBt9Xx4VtpBSDnkd4VZed0FHlb6jelNh1eGz9Do2lpmSI3161p/B7AW hAe+CSQTODso7Px1VNvoi6CqDnv1cSexsxeEKAd8RRmDPvsJjEvZrlUWlIWAOdOf NkpN64sr5w/HpL8AH72S3vhokS+q1uUDhKvceDjjeILaOfDFVkgOeFozmeSYvOjY 765mq95YINyWlcqrnx3+8G2fAyWqShroYyAldCnbIZGG55UAsAcOW+2DPAXPaKwS PSJq1ZA3tsk/CEk/DKdskQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1774476675; x= 1774483875; bh=9RiVDNxFY8iLYQgVth/o2a88iVWrgG/0vCHV/lBcUvY=; b=n qmpQRBZmR7kjDeHWPU/rG/+BPO3+sD5++qOkxcG0Nbara34lFdD3jtzE8IPQCsPb J4E67wFp1wKd3G9xYYxf/e+RU/fxQAyGxXTC8VTrR/rWHdoV1V1sC9sdP/jv7LDI 7QyAMEVuXTA50zgXdWPrbLcUMVjjgKP5UBgZQS2vyCBYCguBiKXRWbYDz/2i/TfT YWimJ6GExH2Hd67qp/GdCpIEhcREZOd7gpXcMsmTEqAkS3mm0sfrSGnVl5u0KF8e jSHq8M/33ruBJlwENhVJ8mYsdzPnHIOpKOBRn87sLRgVtVLCHvNyu5PGOTXyngpp gbbeTwIui0gN2iwK5QCaw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdefvdehiedvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepoffhfffugggtgffkvfevofgjfhesthekredtredtjeenucfhrhhomheplfgrvhhi vghrucfvihgruceofhhlohhsshesjhgvthhmrdhmvgeqnecuggftrfgrthhtvghrnhepte egveefkeetvdfhteduueehgfehhfeiveeifeeflefgteeuhfelfeefjeeikeeunecuffho mhgrihhnpehmthejiedrsggrnhgunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepfhhlohhsshesjhgvthhmrdhmvgdpnhgspghrtghpthhtohep vddvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegrnhhgvghlohhgihhorggttg hhihhnohdruggvlhhrvghgnhhosegtohhllhgrsghorhgrrdgtohhmpdhrtghpthhtohep feduleefieefudesghhmrghilhdrtghomhdprhgtphhtthhopehlohhonhhgrddtgidttd esghhmrghilhdrtghomhdprhgtphhtthhopegrrhhivghlrdhrohhsvghnfhgvlhgurdej hedtsehgmhgrihhlrdgtohhmpdhrtghpthhtoheptghhrghpuhhishgurghrihhogeesgh hmrghilhdrtghomhdprhgtphhtthhopehgihhoshgrlheltdesghhmrghilhdrtghomhdp rhgtphhtthhopehmrghtthhhihgrshdrsghgghesghhmrghilhdrtghomhdprhgtphhtth hopehrrgguohhirdgthhhrihhssehgmhgrihhlrdgtohhmpdhrtghpthhtohepshgrmhhu rdhtohhljhgrmhhosehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i9dde48b3:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 717541EA006B; Wed, 25 Mar 2026 18:11:15 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface From: Javier Tia Date: Wed, 25 Mar 2026 16:11:00 -0600 Subject: [PATCH v3 11/13] wifi: mt76: mt7925: fix band_idx for stable 5GHz/6GHz operation Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260325-mt7927-wifi-support-v2-v3-11-5ca66c97a755@jetm.me> To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Ming Yen Hsieh , Deren Wu Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Marcin FM , =?utf-8?q?=E5=BC=A0=E6=97=AD=E6=B6=B5?= , Cristian-Florin Radoi , George Salukvadze , Evgeny Kapusta <3193631@gmail.com>, Samu Toljamo , Ariel Rosenfeld , Chapuis Dario , =?utf-8?q?Thibaut_Fran=C3=A7ois?= X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=8944; i=floss@jetm.me; h=from:subject:message-id; bh=k7ML223623/sKHJ5G4m8RaRLCZYBr2GHAeNHlqaNLws=; b=owEB7QES/pANAwAKAbXuwwuoZ3cfAcsmYgBpxF1qMN3twc4/dSHmP0UDAg3MQ5lv34qluEiVo 5p4m9NG9IqJAbMEAAEKAB0WIQSbE7ILzw7eI0VKk8m17sMLqGd3HwUCacRdagAKCRC17sMLqGd3 H/HMDAC/NsY/pUuxmtQE/cH+rSGCTTvQZqnBl74nbPX7dy7lHkc+UGjWK782Zl+dX+XHhIL27gH sz+dtByAETMniHY+8h0tE1LuPu5ptVm+FnstKxKlKoh34ao5+EuJ57eGXOf7jhJeGXHLy5Wax0M gRsnt9RtRr3QorQXrQtrX0IScdnBSgG1RtTfYs5Lf6GKqreuBsN6zOAvAso9twG0p28cjfTlWVB rE71fsTQe6xUBTfUvEky9f/fyK+AejBhzn7/lroV19q/WElptratqZsR6cLJ6G8WCjBu6ag1/47 LMzEQQkmd+cRywY/IptMhFi5q3tQD64e8Ycgilwfkcbv91J8lTcanRnx4oPcQ5pWfAB+vvFwotp f7G2gN/lqRQ4jTQD0p+FmeqjJBF4/43DRjGY3UNcMrRRMNyeZPc4nGOJexlIzqOh7JLMvlqinkY c5o+zfyM3oXVtadh7+PUE1tUGnejbr3qaxkKmADcgWYTH+wozNYQjNxmBEIVesu23Hrf8= X-Developer-Key: i=floss@jetm.me; a=openpgp; fpr=9B13B20BCF0EDE23454A93C9B5EEC30BA867771F In-Reply-To: <20260325-mt7927-wifi-support-v2-v3-0-5ca66c97a755@jetm.me> References: <20260325-mt7927-wifi-support-v2-v3-0-5ca66c97a755@jetm.me> The MT7927 firmware requires explicit band_idx assignment (0 for 2.4GHz, 1 for 5GHz/6GHz) instead of 0xff (auto-select) used by MT7925. Without this, the firmware selects the wrong radio for 5GHz and 6GHz connections, causing WPA 4-way handshake timeout and data plane failures on those bands. Introduce mt7925_band_idx(dev, band) helper that encapsulates the chip check: returns the hardware band index for MT7927, or 0xff (auto-select) for MT7925. Replace all scattered is_mt7927() + band mapping patterns with the unified helper across BSS creation, channel context assignment, ROC requests, and BSS info TLVs. For ROC requests on MT7925, the helper returns 0xff which is then refined to 0xfe (BAND_ALL with DBDC) for JOIN-type requests. Also clamp invalid grant band_idx values using rfband as fallback, and process grants for all MT7927 request types (not just JOIN). Originally discovered and fixed by marcin-fm; Loong0x00 contributed additional improvements based on marcin-fm's patch. Co-developed-by: Marcin FM Signed-off-by: Marcin FM Co-developed-by: 张旭涵 Signed-off-by: 张旭涵 Tested-by: Marcin FM Tested-by: Cristian-Florin Radoi Tested-by: George Salukvadze Tested-by: Evgeny Kapusta <3193631@gmail.com> Tested-by: Samu Toljamo Tested-by: Ariel Rosenfeld Tested-by: Chapuis Dario Tested-by: Thibaut François Tested-by: 张旭涵 Signed-off-by: Javier Tia --- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 35 ++++++++++++++- drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 50 +++++++++++++++++----- drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 7 +++ 3 files changed, 80 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c index cfce851a94e2..f36638b35481 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -394,7 +394,19 @@ static int mt7925_mac_link_bss_add(struct mt792x_dev *dev, mconf->mt76.omac_idx = ieee80211_vif_is_mld(vif) ? 0 : mconf->mt76.idx; - mconf->mt76.band_idx = 0xff; + + { + struct ieee80211_channel *chan = NULL; + + if (link_conf->chanreq.oper.chan) + chan = link_conf->chanreq.oper.chan; + else if (mvif->phy->mt76->chandef.chan) + chan = mvif->phy->mt76->chandef.chan; + + mconf->mt76.band_idx = chan ? + mt7925_band_idx(&dev->mt76, chan->band) : 0xff; + } + mconf->mt76.wmm_idx = ieee80211_vif_is_mld(vif) ? 0 : mconf->mt76.idx % MT76_CONNAC_MAX_WMM_SETS; mconf->mt76.link_idx = hweight16(mvif->valid_links); @@ -411,7 +423,8 @@ static int mt7925_mac_link_bss_add(struct mt792x_dev *dev, mlink->wcid.idx = idx; mlink->wcid.tx_info |= MT_WCID_TX_INFO_SET; - mt76_wcid_init(&mlink->wcid, 0); + mt76_wcid_init(&mlink->wcid, + mconf->mt76.band_idx == 0xff ? 0 : mconf->mt76.band_idx); mt7925_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); @@ -2113,9 +2126,12 @@ static int mt7925_assign_vif_chanctx(struct ieee80211_hw *hw, { struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv; struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv; + struct mt792x_link_sta *mlink; struct mt792x_dev *dev = mt792x_hw_dev(hw); struct ieee80211_bss_conf *pri_link_conf; struct mt792x_bss_conf *mconf; + u8 band_idx; + u8 old_band; mutex_lock(&dev->mt76.mutex); @@ -2131,6 +2147,21 @@ static int mt7925_assign_vif_chanctx(struct ieee80211_hw *hw, mconf = &mvif->bss_conf; } + old_band = mconf->mt76.band_idx; + if (ctx->def.chan) { + band_idx = mt7925_band_idx(&dev->mt76, ctx->def.chan->band); + mconf->mt76.band_idx = band_idx; + mlink = mt792x_sta_to_link(&mvif->sta, mconf->link_id); + if (mlink) + mlink->wcid.phy_idx = band_idx; + + if (old_band != band_idx && vif->type == NL80211_IFTYPE_STATION && + mlink) + mt76_connac_mcu_uni_add_dev(&dev->mphy, link_conf, + &mconf->mt76, &mlink->wcid, + true); + } + mconf->mt76.ctx = ctx; mctx->bss_conf = mconf; mutex_unlock(&dev->mt76.mutex); diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c index a7f27c5014d5..0755fee6cdff 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c @@ -301,16 +301,36 @@ mt7925_mcu_connection_loss_event(struct mt792x_dev *dev, struct sk_buff *skb) static void mt7925_mcu_roc_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) { - struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv; + struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv; struct mt7925_roc_grant_tlv *grant = priv; + u8 band_idx = grant->dbdcband; if (ieee80211_vif_is_mld(vif) && vif->type == NL80211_IFTYPE_STATION) return; - if (mvif->idx != grant->bss_idx) + if (mvif->bss_conf.mt76.idx != grant->bss_idx) return; - mvif->band_idx = grant->dbdcband; + /* MT7927 firmware requires band_idx 0 (2.4G) or 1 (5/6G). + * Clamp invalid grant values using rfband as fallback. + */ + if (is_mt7927(&mvif->phy->dev->mt76) && band_idx > 1) { + switch (grant->rfband) { + case 1: /* 2.4 GHz */ + band_idx = 0; + break; + case 2: /* 5 GHz */ + case 3: /* 6 GHz */ + band_idx = 1; + break; + default: + band_idx = mvif->bss_conf.mt76.band_idx <= 1 ? + mvif->bss_conf.mt76.band_idx : 0; + break; + } + } + + mvif->bss_conf.mt76.band_idx = band_idx; } static void mt7925_mcu_roc_handle_grant(struct mt792x_dev *dev, @@ -327,10 +347,11 @@ static void mt7925_mcu_roc_handle_grant(struct mt792x_dev *dev, if (grant->reqtype == MT7925_ROC_REQ_ROC) ieee80211_ready_on_channel(hw); - else if (grant->reqtype == MT7925_ROC_REQ_JOIN) + else if (is_mt7927(&dev->mt76) || grant->reqtype == MT7925_ROC_REQ_JOIN) ieee80211_iterate_active_interfaces_atomic(hw, IEEE80211_IFACE_ITER_RESUME_ALL, mt7925_mcu_roc_iter, grant); + dev->phy.roc_grant = true; wake_up(&dev->phy.roc_wait); duration = le32_to_cpu(grant->max_interval); @@ -1378,10 +1399,14 @@ int mt7925_mcu_set_mlo_roc(struct mt792x_bss_conf *mconf, u16 sel_links, req.roc[i].center_chan2 = 0; req.roc[i].center_chan2_from_ap = 0; - /* STR : 0xfe indicates BAND_ALL with enabling DBDC - * EMLSR : 0xff indicates (BAND_AUTO) without DBDC - */ - req.roc[i].dbdcband = type == MT7925_ROC_REQ_JOIN ? 0xfe : 0xff; + req.roc[i].dbdcband = + mt7925_band_idx(&mvif->phy->dev->mt76, chan->band); + if (req.roc[i].dbdcband == 0xff) + /* STR : 0xfe indicates BAND_ALL with enabling DBDC + * EMLSR : 0xff indicates (BAND_AUTO) without DBDC + */ + req.roc[i].dbdcband = type == MT7925_ROC_REQ_JOIN ? + 0xfe : 0xff; if (chan->hw_value < center_ch) req.roc[i].sco = 1; /* SCA */ @@ -1419,7 +1444,8 @@ int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf, .bw_from_ap = CMD_CBW_20MHZ, .center_chan = center_ch, .center_chan_from_ap = center_ch, - .dbdcband = 0xff, /* auto */ + .dbdcband = mt7925_band_idx(&dev->mt76, + chan->band), }, }; @@ -1466,7 +1492,9 @@ int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf, .len = cpu_to_le16(sizeof(struct roc_abort_tlv)), .tokenid = token_id, .bss_idx = mconf->mt76.idx, - .dbdcband = 0xff, /* auto*/ + .dbdcband = mconf->mt76.band_idx <= 1 ? + mconf->mt76.band_idx : + 0xff, /* auto */ }, }; @@ -2499,6 +2527,8 @@ mt7925_mcu_bss_basic_tlv(struct sk_buff *skb, basic_req->phymode_ext = mt7925_get_phy_mode_ext(phy, vif, band, link_sta); + mconf->mt76.band_idx = mt7925_band_idx(phy->dev, band); + if (band == NL80211_BAND_2GHZ) basic_req->nonht_basic_phy = cpu_to_le16(PHY_TYPE_ERP_INDEX); else diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h index 6b9bf1b89032..2f908d159e30 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h @@ -63,6 +63,13 @@ enum mt7925_roc_req { MT7925_ROC_REQ_NUM }; +static inline u8 mt7925_band_idx(struct mt76_dev *dev, enum nl80211_band band) +{ + if (is_mt7927(dev)) + return band == NL80211_BAND_2GHZ ? 0 : 1; + return 0xff; /* auto-select for mt7925 */ +} + enum { UNI_EVENT_ROC_GRANT = 0, UNI_EVENT_ROC_GRANT_SUB_LINK = 4, -- 2.53.0