[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
ced8594f [MAC80211][WiFi6][Misc][Fix the MT76 WiFi6 Makefile]
7221999e [MAC80211][WiFi7][Misc][Correct the MAC80211 WiFi7 Makefile.]
9d87794a [MAC80211][WiFi7][Misc][Correct the MT76 WiFi7 Makefile.]
ff24e1b2 [openwrt-24][Mac80211][Fix patch conflict with upstream openwrt]
3a6c13e2 [mac80211][misc][fix patch fail due to openwrt update]
05763faa [MAC80211][WiFi7][misc][fix patch failed of wifi-scripts]
f34fd014 [mac80211][misc][fix patch fail due to openwrt update]
f6796660 [openwrt-24][Release][Fix build fail of Wi-Fi7 MT76]
7076d96c [MAC80211][WiFi7][Misc][Fix release build fail because of mt76 version upgradation]
1f748b17 [mac80211][misc][fix patch fail due to openwrt update]
95ba6722 [mac80211][misc][fix patch fail due to openwrt update]
17680d7f [MAC80211][WiFi7][misc][Rename eeprom of eFEM variants]
b97cefa1 [MAC80211][WiFi7][app][Add Griffin support for atenl/iwpriv]
6de718a4 [MAC80211][WiFi7][misc][fix wifi-scripts patch failed]
9f1ace86 [MAC80211][WiFi7][misc][fix hostapd Makefile patch]
e4d0d28e [MAC80211][Misc][Add MT7990 Firmware OpenWrt config]
f3a8a8f7 [MAC80211][Release][Fix build fail of Wi-Fi6 MT76]
dabe8eae [openwrt-24][common][bsp][Fix line ending]
6d438a9d [openwrt-24][common][bsp][Use zstd to compress rootfs debug symbols for unified autobuild]
c268e47e [openwrt][common][bsp][Change SMC ID of wdt nonrst reg of reset-boot-count to 0x570]
c6819fbc [openwrt-24][Release][Update release note for Filogic 880 alpha release]
6897b4de [openwrt-24][common][bsp][Adjust unified autobuild for internal build detection]
fb9b9762 [MAC80211][WiFi6/7][app][Add ext eeprom write back cmd support]
d42b42a3 [openwrt-24][common][bsp][Add kernel6.6 Filogic880 BE19000/BE14000]
3806f047 [MAC80211][misc][Add Bpi-R4 support]
ddbda753 [MAC80211][WiFi7][Misc][Fix build fail because of mt76 version upgradation]
90959b08 [MAC80211][WiFi6][mt76][Rebase mt76 pathes]
728a3362 [MAC80211][WiFi6][mt76][Refactor Qos Map]
b46277b5 [MAC80211][WiFi6][mt76][Fix add ba issue on tid not equal to zero]
c084ee8b [MAC80211][WiFi7][mt76][split mt76 Makefile patch]
bbaec094 [MAC80211][Release][Update Filogic 830/820/630 firmware]
5ce2eece [MAC80211][wifi6][MT76][Fix build fail]
5ac1121f [MAC80211][wifi6][MT76][Fix mt76 version to 2024-07-13]
485f92b1 [MAC80211][WiFi7][misc][synchronize PP bitmap when association]
84db8818 [MAC80211][WiFi6/7][app][Add ATETXNSS in iwpriv wrapper]
cc5a4605 [MAC80211][WiFi7][mt76][fix patch failed of Makefile]
[Release-log]
Change-Id: I06704c04c4b5571af4ffd189d636c1fc9f0567fd
diff --git a/recipes-wifi/linux-mt76/files/patches-3.x/0146-mtk-mt76-mt7996-rework-debug-prints.patch b/recipes-wifi/linux-mt76/files/patches-3.x/0146-mtk-mt76-mt7996-rework-debug-prints.patch
new file mode 100644
index 0000000..28f11c6
--- /dev/null
+++ b/recipes-wifi/linux-mt76/files/patches-3.x/0146-mtk-mt76-mt7996-rework-debug-prints.patch
@@ -0,0 +1,376 @@
+From 28b5dc0783ecf0b3b173c76b9138f769ec6345f3 Mon Sep 17 00:00:00 2001
+From: Shayne Chen <shayne.chen@mediatek.com>
+Date: Wed, 19 Jun 2024 12:04:46 +0800
+Subject: [PATCH 146/223] mtk: mt76: mt7996: rework debug prints
+
+Trim debug messages, and move some of them (especially mcu cmd) into
+tracing log.
+
+Change-Id: I1cf15113a43990fdf201722738e32f08b9118b8f
+Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
+---
+ mt76_connac_mcu.c | 1 -
+ mt7996/mac.c | 3 ---
+ mt7996/main.c | 66 ++++++++++++++++++++++++++++-------------------
+ mt7996/mcu.c | 36 +++++++++++++-------------
+ mt7996/mt7996.h | 10 ++++++-
+ 5 files changed, 67 insertions(+), 49 deletions(-)
+
+diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
+index b62a1ac8..e4e6c0d3 100644
+--- a/mt76_connac_mcu.c
++++ b/mt76_connac_mcu.c
+@@ -428,7 +428,6 @@ void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb,
+ }
+
+ memcpy(basic->peer_addr, link_sta->addr, ETH_ALEN);
+- pr_info("%s: link %u addr [%pM]\n", __func__, link_sta->link_id, basic->peer_addr);
+ basic->qos = link_sta->sta->wme;
+ }
+ EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_basic_tlv);
+diff --git a/mt7996/mac.c b/mt7996/mac.c
+index 966cf314..0a96b5de 100644
+--- a/mt7996/mac.c
++++ b/mt7996/mac.c
+@@ -2942,9 +2942,6 @@ void mt7996_scan_work(struct work_struct *work)
+ return;
+ }
+
+- wiphy_info(hw->wiphy, "hw scan %d MHz\n",
+- req->channels[phy->scan_chan_idx]->center_freq);
+-
+ phy->scan_chan = req->channels[phy->scan_chan_idx++];
+
+ if (!req->n_ssids ||
+diff --git a/mt7996/main.c b/mt7996/main.c
+index d73fd9d6..647e0e8a 100644
+--- a/mt7996/main.c
++++ b/mt7996/main.c
+@@ -297,6 +297,9 @@ static void mt7996_remove_bss_conf(struct ieee80211_vif *vif,
+ if (!mlink || !mconf)
+ return;
+
++ mt76_vif_dbg(vif, "band=%u, bss_idx=%u, link_id=%u, wcid=%u\n",
++ mconf->phy->mt76->band_idx, mconf->mt76.idx, mconf->link_id, mlink->wcid.idx);
++
+ phy = mconf->phy;
+ dev = phy->dev;
+ mt7996_mcu_add_sta(dev, conf, mconf, NULL, mlink, false, false);
+@@ -448,8 +451,8 @@ static int mt7996_add_bss_conf(struct mt7996_phy *phy,
+ rcu_assign_pointer(mvif->link[link_id], mconf);
+ rcu_assign_pointer(mvif->sta.link[link_id], mlink);
+
+- mlo_dbg(phy, "bss_idx=%u, link_id=%u, wcid=%u\n",
+- mconf->mt76.idx, mconf->link_id, mlink->wcid.idx);
++ mt76_vif_dbg(vif, "band=%u, bss_idx=%u, link_id=%u, wcid=%u\n",
++ phy->mt76->band_idx, mconf->mt76.idx, mconf->link_id, mlink->wcid.idx);
+
+ return 0;
+ error:
+@@ -636,10 +639,11 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+ add = vif->valid_links ?: BIT(0);
+ }
+
+- mlo_dbg(mt7996_hw_phy(hw), "cipher = 0x%x, icv_len = %u, iv_len = %u, hw_key_idx = %u, keyidx = %d, flags = 0x%x, link_id = %d, keylen = %u\n",
+- key->cipher, key->icv_len, key->iv_len, key->hw_key_idx, key->keyidx, key->flags, key->link_id, key->keylen);
+- // print_hex_dump(KERN_INFO , "", DUMP_PREFIX_OFFSET, 16, 1, key->key, key->keylen, false);
+- mlo_dbg(mt7996_hw_phy(hw), "add=%lx, valid_links=%x, active_links=%x\n", add, vif->valid_links, vif->active_links);
++ if (sta)
++ mt76_trace(vif, "keyidx=%d, link_bitmap=0x%lx (STA %pM)\n",
++ key->keyidx, add, sta->addr);
++ else
++ mt76_trace(vif, "keyidx=%d, link_bitmap=0x%lx\n", key->keyidx, add);
+
+ mutex_lock(&dev->mt76.mutex);
+
+@@ -1216,7 +1220,8 @@ static int mt7996_add_link_sta(struct mt7996_dev *dev,
+ rcu_assign_pointer(dev->mt76.wcid[idx], &mlink->wcid);
+ mt76_wcid_init(&mlink->wcid);
+
+- mlo_dbg(mconf->phy, "wcid=%u, link_id=%u, link_addr=%pM, pri_link=%u, sec_link=%u\n", mlink->wcid.idx, link_id, link_sta->addr, msta->pri_link, msta->sec_link);
++ mt76_vif_dbg(conf->vif, "STA %pM, wcid=%u, link_id=%u (%pM), pri_link=%u, sec_link=%u\n",
++ sta->addr, mlink->wcid.idx, link_id, link_sta->addr, msta->pri_link, msta->sec_link);
+ }
+
+ if (!assoc)
+@@ -1255,7 +1260,7 @@ mt7996_mac_sta_remove_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
+ if (!ieee80211_vif_is_mld(vif) || rem == sta->valid_links)
+ cancel_delayed_work(&mvif->beacon_mon_work);
+
+- mlo_dbg(mt7996_hw_phy(mvif->hw), "rem=%lu\n", rem);
++ mt76_vif_dbg(vif, "removed_links=0x%lx\n", rem);
+ for_each_set_bit(link_id, &rem, IEEE80211_MLD_MAX_NUM_LINKS) {
+ struct mt7996_bss_conf *mconf =
+ mconf_dereference_protected(mvif, link_id);
+@@ -1282,7 +1287,7 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
+ unsigned int link_id;
+ int i, ret;
+
+- mlo_dbg(mt7996_hw_phy(mvif->hw), "add=%lu, assoc=%d\n", add, assoc);
++ mt76_vif_dbg(vif, "added_links=0x%lx, assoc=%d\n", add, assoc);
+ for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) {
+ struct mt7996_bss_conf *mconf =
+ mconf_dereference_protected(mvif, link_id);
+@@ -1291,6 +1296,9 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
+ struct ieee80211_link_sta *link_sta =
+ link_sta_dereference_protected(sta, link_id);
+
++ if (!mconf || !conf || !link_sta)
++ continue;
++
+ ret = mt7996_add_link_sta(dev, conf, mconf, link_sta, assoc);
+ if (ret)
+ goto error;
+@@ -1461,13 +1469,13 @@ static void mt7996_tx(struct ieee80211_hw *hw,
+ rcu_dereference(sta->link[link_id]);
+
+ if (!link_sta) {
+- mlo_dbg(mt7996_hw_phy(mvif->hw), "request TX on invalid link_id=%u, use primary link (id=%u) instead.\n",
+- link_id, msta->pri_link);
++ mt76_vif_dbg(vif, "request TX on invalid link_id=%u, use primary link (id=%u) instead.\n",
++ link_id, msta->pri_link);
+ link_id = msta->pri_link;
+ link_sta = rcu_dereference(sta->link[link_id]);
+
+ if (!link_sta) {
+- mlo_dbg(mt7996_hw_phy(mvif->hw), "primary link became invalid, give up the TX\n");
++ mt76_vif_dbg(vif, "primary link became invalid, give up the TX\n");
+ goto unlock;
+ }
+ }
+@@ -2499,6 +2507,7 @@ mt7996_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ struct mt7996_bss_conf *mconf;
+ int ret;
+
++ mt76_vif_dbg(vif, "trigger scan on mt76 band %u\n", phy->mt76->band_idx);
+ mutex_lock(&phy->dev->mt76.mutex);
+ if (WARN_ON(phy->scan_req || phy->scan_chan)) {
+ mutex_unlock(&phy->dev->mt76.mutex);
+@@ -2628,7 +2637,7 @@ mt7996_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf)
+ struct mt7996_chanctx *ctx = mt7996_chanctx_get(conf);
+ int ret;
+
+- wiphy_info(hw->wiphy, "%s: add %u\n", __func__, conf->def.chan->hw_value);
++ mt76_dbg(hw, "add %u on mt76 band %d\n", conf->def.chan->hw_value, phy->mt76->band_idx);
+ mutex_lock(&phy->dev->mt76.mutex);
+
+ if (ctx->assigned) {
+@@ -2667,7 +2676,7 @@ mt7996_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *co
+ struct mt7996_chanctx *ctx = mt7996_chanctx_get(conf);
+ struct mt7996_phy *phy = ctx->phy;
+
+- wiphy_info(hw->wiphy, "%s: remove %u\n", __func__, conf->def.chan->hw_value);
++ mt76_dbg(hw, "remove %u\n", conf->def.chan->hw_value);
+ cancel_delayed_work_sync(&phy->scan_work);
+ cancel_delayed_work_sync(&phy->mt76->mac_work);
+
+@@ -2687,13 +2696,14 @@ mt7996_change_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *co
+ struct mt7996_chanctx *ctx = mt7996_chanctx_get(conf);
+ struct mt7996_phy *phy = ctx->phy;
+
+- wiphy_info(hw->wiphy, "%s: change %u, 0x%x\n", __func__, conf->def.chan->hw_value, changed);
+ if (changed & IEEE80211_CHANCTX_CHANGE_WIDTH ||
+ changed & IEEE80211_CHANCTX_CHANGE_RADAR) {
+ ctx->chandef = conf->def;
+ phy->mt76->radar_enabled = conf->radar_enabled;
+
+ mt7996_set_channel(phy, &ctx->chandef);
++
++ mt76_dbg(hw, "change to %u, 0x%x\n", conf->def.chan->hw_value, changed);
+ }
+ }
+
+@@ -2709,9 +2719,8 @@ mt7996_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ u8 link_id = link_conf->link_id;
+ int ret;
+
+- wiphy_info(hw->wiphy, "Assign VIF (addr: %pM, type: %d, link_id: %d) to channel context: %d MHz\n",
+- vif->addr, vif->type, link_conf->link_id,
+- conf->def.chan->center_freq);
++ mt76_vif_dbg(vif, "assign link_id %u to %d MHz\n", link_conf->link_id,
++ conf->def.chan->center_freq);
+
+ mutex_lock(&phy->dev->mt76.mutex);
+
+@@ -2751,9 +2760,8 @@ mt7996_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ struct mt7996_chanctx *ctx = mt7996_chanctx_get(conf);
+ struct mt7996_phy *phy = ctx->phy;
+
+- wiphy_info(hw->wiphy, "Remove VIF (addr: %pM, type: %d, link_id: %d) from channel context: %d MHz\n",
+- vif->addr, vif->type, link_conf->link_id,
+- conf->def.chan->center_freq);
++ mt76_vif_dbg(vif, "remove link %u from %d MHz\n",
++ link_conf->link_id, conf->def.chan->center_freq);
+ cancel_delayed_work_sync(&phy->scan_work);
+
+ mutex_lock(&phy->dev->mt76.mutex);
+@@ -2782,9 +2790,15 @@ mt7996_switch_vif_chanctx(struct ieee80211_hw *hw,
+ if (vifs[i].old_ctx == vifs[i].new_ctx)
+ continue;
+
+- wiphy_info(hw->wiphy, "%s: old=%d, new=%d\n",
+- __func__, vifs[i].old_ctx->def.chan->hw_value,
+- vifs[i].new_ctx->def.chan->hw_value);
++ mt76_vif_dbg(vifs[i].vif,
++ "chan=%d->%d, width=%d->%d, punct_bitmap=0x%04x->0x%04x, link=%u\n",
++ vifs[i].old_ctx->def.chan->hw_value,
++ vifs[i].new_ctx->def.chan->hw_value,
++ vifs[i].old_ctx->def.width,
++ vifs[i].new_ctx->def.width,
++ vifs[i].old_ctx->def.punctured,
++ vifs[i].new_ctx->def.punctured,
++ vifs[i].link_conf->link_id);
+
+ mutex_lock(&dev->mt76.mutex);
+
+@@ -2834,7 +2848,7 @@ mt7996_change_vif_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ unsigned int link_id;
+ int ret = 0;
+
+- mlo_dbg(phy, "old=%u, new=%u\n", old_links, new_links);
++ mt76_vif_dbg(vif, "old=0x%x, new=0x%x\n", old_links, new_links);
+ if (old_links == new_links)
+ return 0;
+
+@@ -2880,7 +2894,7 @@ mt7996_change_sta_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ unsigned long rem = old_links & ~new_links;
+ int ret = 0;
+
+- mlo_dbg(mt7996_hw_phy(hw), "old=%u, new=%u\n", old_links, new_links);
++ mt76_vif_dbg(vif, "STA %pM old=0x%x, new=0x%x\n", sta->addr, old_links, new_links);
+ mutex_lock(&dev->mt76.mutex);
+
+ if (rem)
+diff --git a/mt7996/mcu.c b/mt7996/mcu.c
+index 28bccc15..6149f227 100644
+--- a/mt7996/mcu.c
++++ b/mt7996/mcu.c
+@@ -387,7 +387,6 @@ mt7996_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
+ if (!link_conf || !link_conf->csa_active || vif->type == NL80211_IFTYPE_STATION)
+ return;
+
+- pr_info("%s: link_id=%d\n", __func__, link_id);
+ mvif->cs_ready_links = 0;
+ mvif->cs_link_id = IEEE80211_LINK_UNSPECIFIED;
+ ieee80211_csa_finish(vif, link_id);
+@@ -1513,8 +1512,8 @@ mt7996_mcu_bss_mld_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
+ }
+
+ mld->own_mld_id = mconf->own_mld_id;
+- pr_info("%s: group_mld_id=%d own_mld_id=%d remap_idx=%d mld->addr[%pM]\n",
+- __func__, mld->group_mld_id, mld->own_mld_id, mld->remap_idx, mld->mac_addr);
++ mt76_trace(vif, "group_mld_id=%d, own_mld_id=%d, remap_idx=%d, mld->addr[%pM]\n",
++ mld->group_mld_id, mld->own_mld_id, mld->remap_idx, mld->mac_addr);
+ }
+
+ static void
+@@ -1667,8 +1666,8 @@ mt7996_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_bss_conf *conf,
+
+ memcpy(bss->bssid, conf->bssid, ETH_ALEN);
+
+- mlo_dbg(mconf->phy, "omac_idx=%d band_idx=%d wmm_idx=%d bss->bssid=%pM enable=%d\n",
+- bss->omac_idx, bss->band_idx, bss->wmm_idx, bss->bssid, enable);
++ mt76_trace(vif, "band=%d, omac=%d, wmm_idx=%d, bssid=%pM, link=%d, en=%d\n",
++ bss->band_idx, bss->omac_idx, bss->wmm_idx, bss->bssid, conf->link_id, enable);
+
+ bss->bcn_interval = cpu_to_le16(conf->beacon_int);
+ bss->dtim_period = conf->dtim_period;
+@@ -1807,8 +1806,6 @@ mt7996_mcu_sta_tx_cap(struct mt7996_dev *dev, struct mt76_vif *mvif,
+ tx_cap = (struct sta_rec_tx_cap *)tlv;
+ tx_cap->ampdu_limit_en = true;
+
+- dev_info(dev->mt76.dev, "%s: limit wcid %d ampdu to 512\n", __func__, wcid->idx);
+-
+ return mt76_mcu_skb_send_msg(&dev->mt76, skb,
+ MCU_WMWA_UNI_CMD(STA_REC_UPDATE), true);
+ }
+@@ -2968,8 +2965,8 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_bss_conf *conf,
+ conn_state = enable ? CONN_STATE_PORT_SECURE : CONN_STATE_DISCONNECT;
+ mt76_connac_mcu_sta_basic_tlv(&dev->mt76, skb, conf, link_sta,
+ conn_state, newly);
+- mlo_dbg(mconf->phy, "link=%u, newly=%d, conn_state=%d\n",
+- mlink->wcid.link_id, newly, conn_state);
++ mt76_trace(vif, "link=%u, wcid=%u, newly=%d, conn_state=%d\n",
++ mlink->wcid.link_id, mlink->wcid.idx, newly, conn_state);
+
+ if (!enable)
+ goto out;
+@@ -3029,6 +3026,8 @@ mt7996_mcu_sta_mld_setup_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
+ struct tlv *tlv;
+ unsigned long valid_links = sta->valid_links;
+ unsigned int link_id;
++ struct ieee80211_vif *vif = container_of((void *)msta->vif, struct ieee80211_vif,
++ drv_priv);
+
+ mlink = mlink_dereference_protected(msta, msta->pri_link);
+ if (!mlink)
+@@ -3052,15 +3051,16 @@ mt7996_mcu_sta_mld_setup_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
+ mld_setup->link_num = hweight16(sta->valid_links);
+
+ mld_setup_link = (struct mld_setup_link *)mld_setup->link_info;
+- mlo_dbg(mt7996_hw_phy(mlink->sta->vif->hw), "pri_link(%u) primary_id(%d) seconed_id(%d) wcid(%d), link_num(%d), mld_addr[%pM]\n",
+- msta->pri_link, mld_setup->primary_id, mld_setup->seconed_id, mld_setup->setup_wcid, mld_setup->link_num, mld_setup->mld_addr);
++ mt76_trace(vif, "STA %pM pri_link=%u, pri_wcid=%u, sec_link=%u, sec_wcid=%u\n",
++ sta->addr, msta->pri_link, le16_to_cpu(mld_setup->primary_id),
++ msta->sec_link, le16_to_cpu(mld_setup->seconed_id));
+ for_each_set_bit(link_id, &valid_links, IEEE80211_MLD_MAX_NUM_LINKS) {
+ mlink = mlink_dereference_protected(msta, link_id);
+ mconf = mconf_dereference_protected(msta->vif, link_id);
+
+ mld_setup_link->wcid = cpu_to_le16(mlink->wcid.idx);
+ mld_setup_link->bss_idx = mconf->mt76.idx;
+- mlo_dbg(mt7996_hw_phy(mlink->sta->vif->hw), "link_id(%d) wcid(%d) bss_idx(%d)\n",
++ mt76_trace(vif, "link_id(%d) wcid(%d) bss_idx(%d)\n",
+ link_id, mld_setup_link->wcid, mld_setup_link->bss_idx);
+ mld_setup_link++;
+ }
+@@ -3326,8 +3326,8 @@ int mt7996_mcu_add_dev_info(struct mt7996_phy *phy,
+ return mt7996_mcu_muar_config(phy, conf, mconf, false, enable);
+
+ memcpy(data.tlv.omac_addr, conf->addr, ETH_ALEN);
+- mlo_dbg(phy, "omac=%u, band=%u, addr=%pM, en=%d\n",
+- data.hdr.omac_idx,data.hdr.band_idx, data.tlv.omac_addr, enable);
++ mt76_trace(conf->vif, "band=%u, omac=%u, addr=%pM, en=%d\n",
++ data.hdr.band_idx, data.hdr.omac_idx, data.tlv.omac_addr, enable);
+ return mt76_mcu_send_msg(&dev->mt76, MCU_WMWA_UNI_CMD(DEV_INFO_UPDATE),
+ &data, sizeof(data), true);
+ }
+@@ -6559,10 +6559,10 @@ int mt7996_mcu_set_eml_omn(struct ieee80211_hw *hw,
+ }
+ }
+
+- mlo_dbg(mconf->phy, "link:%u, wcid:%d, control:%x, mode:%d, bmp:%x\n",
+- mlink->wcid.link_id, mlink->wcid.idx, eml_omn->control,
+- !!(eml_omn->control & EML_OMN_CONTROL_EMLSR_MODE),
+- eml_op->bitmap);
++ mt76_vif_dbg(vif, "link:%u, wcid:%d, control:%x, mode:%d, bmp:%x\n",
++ mlink->wcid.link_id, mlink->wcid.idx, eml_omn->control,
++ !!(eml_omn->control & EML_OMN_CONTROL_EMLSR_MODE),
++ eml_op->bitmap);
+
+ return mt76_mcu_skb_send_msg(&dev->mt76, skb,
+ MCU_WMWA_UNI_CMD(STA_REC_UPDATE), true);
+diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
+index c20206c6..d56d9715 100644
+--- a/mt7996/mt7996.h
++++ b/mt7996/mt7996.h
+@@ -986,7 +986,15 @@ mt7996_get_link_wcid(struct mt7996_dev *dev, u16 idx, u8 band_idx)
+ return &mlink->wcid;
+ }
+
+-#define mlo_dbg(phy, fmt, ...) wiphy_info(phy->mt76->hw->wiphy, "%s: " fmt, __func__, ##__VA_ARGS__)
++#define mt76_dbg(hw, fmt, ...) wiphy_info(hw->wiphy, "%s: " fmt, __func__, ##__VA_ARGS__)
++#define mt76_vif_dbg(vif, fmt, ...) \
++ pr_info("%s: %s: " fmt, \
++ ieee80211_vif_to_wdev(vif)->netdev->name, \
++ __func__, ##__VA_ARGS__)
++#define mt76_trace(vif, fmt, ...) \
++ trace_printk("(%s) " fmt, \
++ ieee80211_vif_to_wdev(vif)->netdev->name, \
++ ##__VA_ARGS__)
+
+ extern const struct ieee80211_ops mt7996_ops;
+ extern struct pci_driver mt7996_pci_driver;
+--
+2.45.2
+