Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mt76

Browse Source
This commit is contained in:
DHDAXCW
2024-08-01 17:30:06 +08:00
parent e8c6f8f165
commit ed1029d103
2 changed files with 242 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/kernel/mt76/Makefile
View File

@@ -238,6 +238,9 @@ define KernelPackage/mt7915e
DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
AUTOLOAD:=$(call AutoProbe,mt7915e)
ifneq ($(CONFIG_TARGET_mediatek_filogic)$(CONFIG_TARGET_mediatek_mt7622),)
MODPARAMS.mt7915e:=wed_enable=Y
endif
endef
define KernelPackage/mt7916-firmware
@@ -288,7 +291,7 @@ define KernelPackage/mt7921-common
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7921 wireless driver common code
HIDDEN:=1
DEPENDS+=+kmod-mt792x-common +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
DEPENDS+=+kmod-mt792x-common +kmod-mt7921-firmware +kmod-mt7922-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921-common.ko
endef
@@ -572,16 +575,6 @@ define KernelPackage/mt7915-firmware/install
$(1)/lib/firmware/mediatek
endef
#define KernelPackage/mt7916-firmware/install
# $(INSTALL_DIR) $(1)/lib/firmware/mediatek
# cp \
# $(PKG_BUILD_DIR)/firmware/mt7916_wa.bin \
# $(PKG_BUILD_DIR)/firmware/mt7916_wm.bin \
# $(PKG_BUILD_DIR)/firmware/mt7916_rom_patch.bin \
# $(1)/lib/firmware/mediatek
#endef
define KernelPackage/mt7916-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp ./firmware_7916/mt7916_wa.bin $(1)/lib/firmware/mediatek
@@ -589,7 +582,6 @@ define KernelPackage/mt7916-firmware/install
cp ./firmware_7916/mt7916_rom_patch.bin $(1)/lib/firmware/mediatek
endef
define KernelPackage/mt7981-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \

238
package/kernel/mt76/patches/003-mt76-allow-VHT-rate-on-2.4GHz.patch Normal file
View File

@@ -0,0 +1,238 @@
--- /dev/null
+++ b/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
@@ -0,0 +1,234 @@
+From 12c2b3f818d2e0c53e14f0d1b13242cee7138feb Mon Sep 17 00:00:00 2001
+From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
+Date: Mon, 23 Nov 2020 10:46:37 +0800
+Subject: [PATCH 1/6] mt76: allow VHT rate on 2.4GHz
+
+Allow chips that support 11ac to use 256QAM on 2.4GHz
+
+Signed-off-by: DENG Qingfang <dqfext@gmail.com>
+Signed-off-by: rany <ranygh@riseup.net>
+---
+ mac80211.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mac80211.c b/mac80211.c
+index 2c4a5290..df3fbd35 100644
+--- a/mac80211.c
++++ b/mac80211.c
+@@ -282,7 +282,7 @@ static void mt76_init_stream_cap(struct mt76_phy *phy,
+ void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)
+ {
+ if (phy->cap.has_2ghz)
+- mt76_init_stream_cap(phy, &phy->sband_2g.sband, false);
++ mt76_init_stream_cap(phy, &phy->sband_2g.sband, vht);
+ if (phy->cap.has_5ghz)
+ mt76_init_stream_cap(phy, &phy->sband_5g.sband, vht);
+ if (phy->cap.has_6ghz)
+@@ -349,13 +349,13 @@ mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband,
+
+ static int
+ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates,
+- int n_rates)
++ int n_rates, bool vht)
+ {
+ phy->hw->wiphy->bands[NL80211_BAND_2GHZ] = &phy->sband_2g.sband;
+
+ return mt76_init_sband(phy, &phy->sband_2g, mt76_channels_2ghz,
+ ARRAY_SIZE(mt76_channels_2ghz), rates,
+- n_rates, true, false);
++ n_rates, true, vht);
+ }
+
+ static int
+@@ -508,7 +508,7 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht,
+ return ret;
+
+ if (phy->cap.has_2ghz) {
+- ret = mt76_init_sband_2g(phy, rates, n_rates);
++ ret = mt76_init_sband_2g(phy, rates, n_rates, vht);
+ if (ret)
+ return ret;
+ }
+@@ -691,7 +691,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,
+ return ret;
+
+ if (phy->cap.has_2ghz) {
+- ret = mt76_init_sband_2g(phy, rates, n_rates);
++ ret = mt76_init_sband_2g(phy, rates, n_rates, vht);
+ if (ret)
+ return ret;
+ }
+--
+2.34.1
+
+
+From 1eee3cd65b71ad465b07fae78db7a1e6d766e572 Mon Sep 17 00:00:00 2001
+From: rany <ranygh@riseup.net>
+Date: Fri, 12 May 2023 19:49:38 +0300
+Subject: [PATCH 2/6] wifi: mt76: mt7615: add 256-QAM support in 2.4GHz
+
+Signed-off-by: rany <ranygh@riseup.net>
+---
+ mt7615/init.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mt7615/init.c b/mt7615/init.c
+index 621e69f0..13ada39b 100644
+--- a/mt7615/init.c
++++ b/mt7615/init.c
+@@ -410,6 +410,8 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)
+ hw->max_tx_fragments = MT_HW_TXP_MAX_BUF_NUM;
+
+ phy->mt76->sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
++ phy->mt76->sband_2g.sband.vht_cap.cap |=
++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
+ phy->mt76->sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
+ phy->mt76->sband_5g.sband.vht_cap.cap |=
+ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
+--
+2.34.1
+
+
+From b8628fd465befe391a5bdaeb64d6fe34d864dcab Mon Sep 17 00:00:00 2001
+From: rany <ranygh@riseup.net>
+Date: Fri, 12 May 2023 20:01:24 +0300
+Subject: [PATCH 3/6] wifi: mt76: mt7915: add 256-QAM support in 2.4Ghz
+
+Signed-off-by: rany <ranygh@riseup.net>
+---
+ mt7915/init.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/mt7915/init.c b/mt7915/init.c
+index ada878e0..2ef0040e 100644
+--- a/mt7915/init.c
++++ b/mt7915/init.c
+@@ -395,11 +395,24 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+ wiphy->txq_memory_limit = 32 << 20; /* 32 MiB */
+
+ if (phy->mt76->cap.has_2ghz) {
++ struct ieee80211_sta_vht_cap *vht_cap;
++
++ vht_cap = &phy->mt76->sband_2g.sband.vht_cap;
+ phy->mt76->sband_2g.sband.ht_cap.cap |=
+ IEEE80211_HT_CAP_LDPC_CODING |
+ IEEE80211_HT_CAP_MAX_AMSDU;
+ phy->mt76->sband_2g.sband.ht_cap.ampdu_density =
+ IEEE80211_HT_MPDU_DENSITY_4;
++
++ if (is_mt7915(&dev->mt76)) {
++ vht_cap->cap |=
++ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
++ } else {
++ vht_cap->cap |=
++ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
++ }
+ }
+
+ if (phy->mt76->cap.has_5ghz) {
+--
+2.34.1
+
+
+From 6eea63810b9ee351281f34f36d36f8fe6804d295 Mon Sep 17 00:00:00 2001
+From: rany <ranygh@riseup.net>
+Date: Fri, 12 May 2023 20:03:41 +0300
+Subject: [PATCH 4/6] wifi: mt76: mt7921: add 256-QAM support in 2.4Ghz
+
+Signed-off-by: rany <ranygh@riseup.net>
+---
+ mt7921/init.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mt7921/init.c b/mt7921/init.c
+index e929f6eb..ba69b063 100644
+--- a/mt7921/init.c
++++ b/mt7921/init.c
+@@ -431,6 +431,12 @@ int mt7921_register_device(struct mt7921_dev *dev)
+ dev->mphy.sband_5g.sband.ht_cap.cap |=
+ IEEE80211_HT_CAP_LDPC_CODING |
+ IEEE80211_HT_CAP_MAX_AMSDU;
++ dev->mphy.sband_2g.sband.vht_cap.cap |=
++ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
++ IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
++ IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |
++ (3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);
+ dev->mphy.sband_5g.sband.vht_cap.cap |=
+ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
+ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
+--
+2.34.1
+
+
+From c8fac2a17aacb57b73ad139635169e3fd0b8e2fa Mon Sep 17 00:00:00 2001
+From: rany <ranygh@riseup.net>
+Date: Fri, 12 May 2023 20:04:23 +0300
+Subject: [PATCH 5/6] wifi: mt76: mt7996: add 256-QAM support in 2.4Ghz
+
+Signed-off-by: rany <ranygh@riseup.net>
+---
+ mt7996/init.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mt7996/init.c b/mt7996/init.c
+index f1b48cdd..1e4f1471 100644
+--- a/mt7996/init.c
++++ b/mt7996/init.c
+@@ -201,6 +201,10 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)
+ phy->mt76->sband_2g.sband.ht_cap.cap |=
+ IEEE80211_HT_CAP_LDPC_CODING |
+ IEEE80211_HT_CAP_MAX_AMSDU;
++
++ phy->mt76->sband_2g.sband.vht_cap.cap |=
++ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
+ phy->mt76->sband_2g.sband.ht_cap.ampdu_density =
+ IEEE80211_HT_MPDU_DENSITY_2;
+ }
+--
+2.34.1
+
+
+From 4f0670343704f41b68378164092e31c7d2dd6207 Mon Sep 17 00:00:00 2001
+From: Rani Hod <rani.hod@gmail.com>
+Date: Thu, 15 Jun 2023 15:44:32 +0300
+Subject: [PATCH 6/6] Set the vendor_qam256_supported flag when initializing 2g
+ bands.
+
+Signed-off-by: Rani Hod <rani.hod@gmail.com>
+---
+ mac80211.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/mac80211.c b/mac80211.c
+index df3fbd35..c42be544 100644
+--- a/mac80211.c
++++ b/mac80211.c
+@@ -351,11 +351,20 @@ static int
+ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates,
+ int n_rates, bool vht)
+ {
++ int ret;
++
+ phy->hw->wiphy->bands[NL80211_BAND_2GHZ] = &phy->sband_2g.sband;
+
+- return mt76_init_sband(phy, &phy->sband_2g, mt76_channels_2ghz,
++ ret = mt76_init_sband(phy, &phy->sband_2g, mt76_channels_2ghz,
+ ARRAY_SIZE(mt76_channels_2ghz), rates,
+ n_rates, true, vht);
++
++ if (ret)
++ return ret;
++
++ phy->sband_2g.sband.vht_cap.vendor_qam256_supported = true;
++
++ return 0;
+ }
+
+ static int
+--
+2.34.1
+