[][mac80211][mt76][Update driver version and fix dual band performance issue]
[Description]
Refactor internal patches
1. Change driver version to 2.2.10.0 for mt76 20230301 driver.
2. Set HW_TOKEN_SIZE to 7168 to achieve higher throughput.
[Release-log]
N/A
Change-Id: Ia8d1755573895e53016f2264f89915ec7683759b
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7238602
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1009-mt76-mt7915-add-fw_version-dump.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1009-mt76-mt7915-add-fw_version-dump.patch
index f405a43..d88e542 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1009-mt76-mt7915-add-fw_version-dump.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1009-mt76-mt7915-add-fw_version-dump.patch
@@ -1,7 +1,7 @@
-From 5034a64c8d1905c639f2bb26f538f4d2d7703a21 Mon Sep 17 00:00:00 2001
+From 9f848ad3fee22fb9de2dce18ddc2a0f54a519b68 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
Date: Wed, 17 Aug 2022 13:40:24 +0800
-Subject: [PATCH 1009/1009] mt76: mt7915: add fw_version dump
+Subject: [PATCH] mt76: mt7915: add fw_version dump
---
mt76.h | 4 ++++
@@ -59,7 +59,7 @@
struct mt76_connac2_patch_sec *sec;
u32 len, addr, mode;
diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 4662f46f..05dc7d5a 100644
+index 4662f46f..f222efe7 100644
--- a/mt7915/mtk_debugfs.c
+++ b/mt7915/mtk_debugfs.c
@@ -2799,6 +2799,22 @@ static int mt7915_agginfo_read_band1(struct seq_file *s, void *data)
@@ -70,7 +70,7 @@
+{
+ struct mt7915_dev *dev = dev_get_drvdata(s->private);
+ struct mt76_dev *mdev = NULL;
-+ seq_printf(s, "Version: 2.2.8.0\n");
++ seq_printf(s, "Version: 2.2.10.0\n");
+
+ if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))
+ return 0;
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/3001-mt76-mt7915-wed-add-wed-tx-support.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/3001-mt76-mt7915-wed-add-wed-tx-support.patch
index deab403..27f30fe 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/3001-mt76-mt7915-wed-add-wed-tx-support.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/3001-mt76-mt7915-wed-add-wed-tx-support.patch
@@ -1,15 +1,16 @@
-From af605bd8d821cc9cd9dd4f3928c4632113574dc4 Mon Sep 17 00:00:00 2001
+From 8d299b6aeba33d46ff1abd15a3f37cc0dd649487 Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Fri, 25 Nov 2022 10:38:53 +0800
-Subject: [PATCH 3001/3013] mt76: mt7915: wed: add wed tx support
+Subject: [PATCH] mt76: mt7915: wed: add wed tx support
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
- mt76_connac.h | 1 +
- mt7915/mac.c | 11 +++++++----
- mt7915/main.c | 4 ++--
- mt7915/mmio.c | 5 +++--
- 4 files changed, 13 insertions(+), 8 deletions(-)
+ mt76_connac.h | 1 +
+ mt7915/mac.c | 11 +++++++----
+ mt7915/main.c | 4 ++--
+ mt7915/mmio.c | 5 +++--
+ mt7915/mt7915.h | 2 +-
+ 5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/mt76_connac.h b/mt76_connac.h
index b339c50b..323203df 100644
@@ -115,6 +116,19 @@
ret = dma_set_mask(wed->dev, DMA_BIT_MASK(32));
if (ret)
+diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
+index c14d13ae..fd31ee9f 100644
+--- a/mt7915/mt7915.h
++++ b/mt7915/mt7915.h
+@@ -55,7 +55,7 @@
+ #define MT7916_EEPROM_SIZE 4096
+
+ #define MT7915_EEPROM_BLOCK_SIZE 16
+-#define MT7915_HW_TOKEN_SIZE 4096
++#define MT7915_HW_TOKEN_SIZE 7168
+ #define MT7915_TOKEN_SIZE 8192
+
+ #define MT7915_CFEND_RATE_DEFAULT 0x49 /* OFDM 24M */
--
2.18.0
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/3006-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rro.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/3006-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rro.patch
index 4e22353..bcb5b02 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/3006-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rro.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/3006-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rro.patch
@@ -1,7 +1,7 @@
-From 72dda83ffb5d48393da817757f537770aeca4e40 Mon Sep 17 00:00:00 2001
+From 96b429c7da1a06920985887fbe522750b915dfa0 Mon Sep 17 00:00:00 2001
From: Sujuan Chen <sujuan.chen@mediatek.com>
Date: Fri, 6 Jan 2023 18:18:50 +0800
-Subject: [PATCH 3006/3013] mt76: mt7915: wed: add rxwi for further in chip rro
+Subject: [PATCH] mt76: mt7915: wed: add rxwi for further in chip rro
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
---
@@ -438,12 +438,12 @@
.tx_complete_skb = mt76_connac_tx_complete_skb,
.rx_skb = mt7915_queue_rx_skb,
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 0fbc1047..dd6b673b 100644
+index 1d906b78..f635ae2d 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
@@ -57,6 +57,7 @@
#define MT7915_EEPROM_BLOCK_SIZE 16
- #define MT7915_HW_TOKEN_SIZE 4096
+ #define MT7915_HW_TOKEN_SIZE 7168
#define MT7915_TOKEN_SIZE 8192
+#define MT7915_RX_TOKEN_SIZE 4096