[][MAC80211][WiFi6][mt76][Fix merlin 5g can't receive rx data at two pcie mode]
[Description]
Fix merlin 5g can't receive rx data at two pcie mode
set RXQ QID6 select pcie1
[Release-log]
Change-Id: Ic171139f6aa1c09a4bd6403d6d39453f063a894b
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9329061
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
index cc3e8cd..1f9d540 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
@@ -1,20 +1,19 @@
-From cae043c9d117d77ed5189c8c258b7f4ea622e79f Mon Sep 17 00:00:00 2001
+From 1af0fe3345f26594c78e91681997ad3a1838fc7c Mon Sep 17 00:00:00 2001
From: Henry Yen <henry.yen@mediatek.com>
Date: Wed, 6 Mar 2024 12:42:06 +0800
-Subject: [PATCH 21/21] wifi: mt76: mt7915: remove unnecessary register
- settings
+Subject: [PATCH] wifi: mt76: mt7915: remove unnecessary register settings
Remove unnecessary register settings from the driver layer,
and let firmware take over the configuration control.
Signed-off-by: Henry.Yen <henry.yen@mediatek.com>
---
- mt7915/init.c | 35 -----------------------------------
+ mt7915/init.c | 30 ------------------------------
mt7915/mac.c | 43 +------------------------------------------
- 2 files changed, 1 insertion(+), 77 deletions(-)
+ 2 files changed, 1 insertion(+), 72 deletions(-)
diff --git a/mt7915/init.c b/mt7915/init.c
-index 19a68c5..2ae7977 100644
+index 19a68c5..15ae27a 100644
--- a/mt7915/init.c
+++ b/mt7915/init.c
@@ -475,30 +475,6 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
@@ -48,19 +47,19 @@
/* mt7915: disable rx rate report by default due to hw issues */
mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);
-@@ -601,23 +577,12 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
+@@ -601,23 +577,17 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
void mt7915_mac_init(struct mt7915_dev *dev)
{
int i;
- u32 rx_len = is_mt7915(&dev->mt76) ? 0x400 : 0x680;
--
-- /* config pse qid6 wfdma port selection */
-- if (!is_mt7915(&dev->mt76) && dev->hif2)
-- mt76_rmw(dev, MT_WF_PP_TOP_RXQ_WFDMA_CF_5, 0,
-- MT_WF_PP_TOP_RXQ_QID6_WFDMA_HIF_SEL_MASK);
--
-- mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, rx_len);
+ /* config pse qid6 wfdma port selection */
+ if (!is_mt7915(&dev->mt76) && dev->hif2)
+ mt76_rmw(dev, MT_WF_PP_TOP_RXQ_WFDMA_CF_5, 0,
+ MT_WF_PP_TOP_RXQ_QID6_WFDMA_HIF_SEL_MASK);
+
+- mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, rx_len);
+-
if (!is_mt7915(&dev->mt76))
mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
else