NACK: [PATCH 1/1][SRU][O] UBUNTU: SAUCE: Regression: MT7925 wifi fails to reconnect

[Chia-Lin Kao (AceLan)]

On Tue, May 27, 2025 at 03:43:59PM +0800, AceLan Kao wrote:
> From: "Chia-Lin Kao (AceLan)" <acelan.kao at canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/2111778
> 
> Revert "wifi: mt76: mt7925: Cleanup MLO settings post-disconnection"
> 
> This reverts commit ff6a34984ba133dfed2d13ea13d7922f944af412.
> 
> This commit leads to regression and the fix commit 0ebb60da8416c ("wifi:
> mt76: mt7925: adjust rm BSS flow to prevent next connection failure") in
> 6.15-rc1 is hard to backport to 6.11 kernel. So, simply revert this commit.
No signed off, I'll submit v2

> ---
>  .../net/wireless/mediatek/mt76/mt7925/main.c  | 36 ++-----------------
>  .../net/wireless/mediatek/mt76/mt7925/mcu.c   |  4 +--
>  .../net/wireless/mediatek/mt76/mt7925/mcu.h   |  2 +-
>  3 files changed, 5 insertions(+), 37 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> index 8b8a4bcedc3e0..97ee435e283a5 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> @@ -1146,7 +1146,8 @@ static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev,
>  		struct mt792x_bss_conf *mconf;
>  
>  		mconf = mt792x_link_conf_to_mconf(link_conf);
> -		mt792x_mac_link_bss_remove(dev, mconf, mlink);
> +		mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, link_conf,
> +					link_sta, false);
>  	}
>  
>  	spin_lock_bh(&mdev->sta_poll_lock);
> @@ -1204,45 +1205,12 @@ void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
>  {
>  	struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
>  	struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
> -	struct {
> -		struct {
> -			u8 omac_idx;
> -			u8 band_idx;
> -			__le16 pad;
> -		} __packed hdr;
> -		struct req_tlv {
> -			__le16 tag;
> -			__le16 len;
> -			u8 active;
> -			u8 link_idx; /* hw link idx */
> -			u8 omac_addr[ETH_ALEN];
> -		} __packed tlv;
> -	} dev_req = {
> -		.hdr = {
> -			.omac_idx = 0,
> -			.band_idx = 0,
> -		},
> -		.tlv = {
> -			.tag = cpu_to_le16(DEV_INFO_ACTIVE),
> -			.len = cpu_to_le16(sizeof(struct req_tlv)),
> -			.active = true,
> -		},
> -	};
>  	unsigned long rem;
>  
>  	rem = ieee80211_vif_is_mld(vif) ? msta->valid_links : BIT(0);
>  
>  	mt7925_mac_sta_remove_links(dev, vif, sta, rem);
>  
> -	if (ieee80211_vif_is_mld(vif)) {
> -		mt7925_mcu_set_dbdc(&dev->mphy, false);
> -
> -		/* recovery omac address for the legacy interface */
> -		memcpy(dev_req.tlv.omac_addr, vif->addr, ETH_ALEN);
> -		mt76_mcu_send_msg(mdev, MCU_UNI_CMD(DEV_INFO_UPDATE),
> -				  &dev_req, sizeof(dev_req), true);
> -	}
> -
>  	if (vif->type == NL80211_IFTYPE_STATION) {
>  		struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
>  
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> index 9bdbe9c4e592b..ce3de84f14efb 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> @@ -2657,7 +2657,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
>  				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);
>  }
>  
> -int mt7925_mcu_set_dbdc(struct mt76_phy *phy, bool enable)
> +int mt7925_mcu_set_dbdc(struct mt76_phy *phy)
>  {
>  	struct mt76_dev *mdev = phy->dev;
>  
> @@ -2677,7 +2677,7 @@ int mt7925_mcu_set_dbdc(struct mt76_phy *phy, bool enable)
>  	tlv = mt76_connac_mcu_add_tlv(skb, UNI_MBMC_SETTING, sizeof(*conf));
>  	conf = (struct mbmc_conf_tlv *)tlv;
>  
> -	conf->mbmc_en = enable;
> +	conf->mbmc_en = 1;
>  	conf->band = 0; /* unused */
>  
>  	err = mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(SET_DBDC_PARMS),
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
> index fe6a613ba0088..31bb8ed2ec513 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
> @@ -616,7 +616,7 @@ mt7925_mcu_get_cipher(int cipher)
>  	}
>  }
>  
> -int mt7925_mcu_set_dbdc(struct mt76_phy *phy, bool enable);
> +int mt7925_mcu_set_dbdc(struct mt76_phy *phy);
>  int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
>  		       struct ieee80211_scan_request *scan_req);
>  int mt7925_mcu_cancel_hw_scan(struct mt76_phy *phy,
> -- 
> 2.43.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team