298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: fixes build error for mt7925

Browse Source 
Fixes: #12328
This commit is contained in:
coolsnowwolf 2024-07-13 23:01:31 +08:00
parent b3de7a9adf
commit 665cedd251
5 changed files with 126 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/kernel/mt76/Makefile
View File

@ -15,9 +15,9 @@ PKG_SOURCE_VERSION:=5b509e80384ab019ac11aa90c81ec0dbb5b0d7f2
PKG_MIRROR_HASH:=6fc25df4d28becd010ff4971b23731c08b53e69381a9e4c868091899712f78a9 PKG_MIRROR_HASH:=6fc25df4d28becd010ff4971b23731c08b53e69381a9e4c868091899712f78a9
PATCH_DIR:=./patches-5.4 PATCH_DIR:=./patches-5.4
else ifndef ($(filter on,$(CONFIG_LINUX_6_1) $(CONFIG_LINUX_6_6)),) else ifndef ($(filter on,$(CONFIG_LINUX_6_1) $(CONFIG_LINUX_6_6)),)
PKG_SOURCE_DATE:=2024-05-17 PKG_SOURCE_DATE:=2024-04-04
PKG_SOURCE_VERSION:=513c131c6309712a51502870b041f45b4bd6a6d4 PKG_SOURCE_VERSION:=8f301a5c5fe3d998b50666bde1d35d412833be89
PKG_MIRROR_HASH:=9f5d7a846912e7deafa216c2aabb038ec58666ecbf8a394e947b144001994d78 PKG_MIRROR_HASH:=49291145ccceeac2964c9a43a46bed88298e5c1da63c6f3c2c1f6b3c1902a61e
PATCH_DIR:=./patches-6.x PATCH_DIR:=./patches-6.x
else else
PKG_SOURCE_DATE:=2023-08-14 PKG_SOURCE_DATE:=2023-08-14
@ -645,11 +645,6 @@ define Package/mt76-test/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
endef endef
define Build/InstallDev
mkdir -p $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/firmware/mt7981_eeprom_mt7976_dbdc.bin $(STAGING_DIR_IMAGE)/
endef
$(eval $(call KernelPackage,mt76-core)) $(eval $(call KernelPackage,mt76-core))
$(eval $(call KernelPackage,mt76-usb)) $(eval $(call KernelPackage,mt76-usb))
$(eval $(call KernelPackage,mt76x02-usb)) $(eval $(call KernelPackage,mt76x02-usb))

195
package/kernel/mt76/patches-6.x/002-Revert-wifi-mt76-mt7925-add-EHT-radiotap-support.patch
View File

@ -1,195 +0,0 @@
From aa868357891cf4be8e7a1ca43edd1e335aa10710 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Thu, 4 Jul 2024 13:24:22 +0800
Subject: [PATCH] Revert "wifi: mt76: mt7925: add EHT radiotap support in
monitor mode"
This reverts commit 1d6e4f7de8a6c93540bd8d616cb6b917d2ac400e.
---
mt76_connac.h | 2 --
mt76_connac3_mac.c | 85 ----------------------------------------------
mt76_connac3_mac.h | 22 ------------
mt7925/mac.c | 15 ++------
4 files changed, 2 insertions(+), 122 deletions(-)
diff --git a/mt76_connac.h b/mt76_connac.h
index 445d0f0a..91987bdf 100644
--- a/mt76_connac.h
+++ b/mt76_connac.h
@@ -451,6 +451,4 @@ void mt76_connac2_tx_token_put(struct mt76_dev *dev);
/* connac3 */
void mt76_connac3_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv,
u8 mode);
-void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv,
- u8 mode);
#endif /* __MT76_CONNAC_H */
diff --git a/mt76_connac3_mac.c b/mt76_connac3_mac.c
index 92ad1ecf..73e9f283 100644
--- a/mt76_connac3_mac.c
+++ b/mt76_connac3_mac.c
@@ -6,11 +6,8 @@
#include "dma.h"
#define HE_BITS(f) cpu_to_le16(IEEE80211_RADIOTAP_HE_##f)
-#define EHT_BITS(f) cpu_to_le32(IEEE80211_RADIOTAP_EHT_##f)
#define HE_PREP(f, m, v) le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\
IEEE80211_RADIOTAP_HE_##f)
-#define EHT_PREP(f, m, v) le32_encode_bits(le32_get_bits(v, MT_CRXV_EHT_##m),\
- IEEE80211_RADIOTAP_EHT_##f)
static void
mt76_connac3_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,
@@ -183,85 +180,3 @@ void mt76_connac3_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv,
}
}
EXPORT_SYMBOL_GPL(mt76_connac3_mac_decode_he_radiotap);
-
-static void *
-mt76_connac3_mac_radiotap_push_tlv(struct sk_buff *skb, u16 type, u16 len)
-{
- struct ieee80211_radiotap_tlv *tlv;
-
- tlv = skb_push(skb, sizeof(*tlv) + len);
- tlv->type = cpu_to_le16(type);
- tlv->len = cpu_to_le16(len);
- memset(tlv->data, 0, len);
-
- return tlv->data;
-}
-
-void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv,
- u8 mode)
-{
- struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
- struct ieee80211_radiotap_eht_usig *usig;
- struct ieee80211_radiotap_eht *eht;
- u32 ltf_size = le32_get_bits(rxv[4], MT_CRXV_HE_LTF_SIZE) + 1;
- u8 bw = FIELD_GET(MT_PRXV_FRAME_MODE, le32_to_cpu(rxv[2]));
-
- if (WARN_ONCE(skb_mac_header(skb) != skb->data,
- "Should push tlv at the top of mac hdr"))
- return;
-
- eht = mt76_connac3_mac_radiotap_push_tlv(skb, IEEE80211_RADIOTAP_EHT,
- sizeof(*eht) + sizeof(u32));
- usig = mt76_connac3_mac_radiotap_push_tlv(skb, IEEE80211_RADIOTAP_EHT_USIG,
- sizeof(*usig));
-
- status->flag |= RX_FLAG_RADIOTAP_TLV_AT_END;
-
- eht->known |= EHT_BITS(KNOWN_SPATIAL_REUSE) |
- EHT_BITS(KNOWN_GI) |
- EHT_BITS(KNOWN_EHT_LTF) |
- EHT_BITS(KNOWN_LDPC_EXTRA_SYM_OM) |
- EHT_BITS(KNOWN_PE_DISAMBIGUITY_OM) |
- EHT_BITS(KNOWN_NSS_S);
-
- eht->data[0] |=
- EHT_PREP(DATA0_SPATIAL_REUSE, SR_MASK, rxv[13]) |
- cpu_to_le32(FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_GI, status->eht.gi) |
- FIELD_PREP(IEEE80211_RADIOTAP_EHT_DATA0_LTF, ltf_size)) |
- EHT_PREP(DATA0_PE_DISAMBIGUITY_OM, PE_DISAMBIG, rxv[5]) |
- EHT_PREP(DATA0_LDPC_EXTRA_SYM_OM, LDPC_EXT_SYM, rxv[4]);
-
- eht->data[7] |= le32_encode_bits(status->nss, IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);
-
- eht->user_info[0] |=
- EHT_BITS(USER_INFO_MCS_KNOWN) |
- EHT_BITS(USER_INFO_CODING_KNOWN) |
- EHT_BITS(USER_INFO_NSS_KNOWN_O) |
- EHT_BITS(USER_INFO_BEAMFORMING_KNOWN_O) |
- EHT_BITS(USER_INFO_DATA_FOR_USER) |
- le32_encode_bits(status->rate_idx, IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |
- le32_encode_bits(status->nss, IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O);
-
- if (le32_to_cpu(rxv[0]) & MT_PRXV_TXBF)
- eht->user_info[0] |= EHT_BITS(USER_INFO_BEAMFORMING_O);
-
- if (le32_to_cpu(rxv[0]) & MT_PRXV_HT_AD_CODE)
- eht->user_info[0] |= EHT_BITS(USER_INFO_CODING);
-
- if (mode == MT_PHY_TYPE_EHT_MU)
- eht->user_info[0] |= EHT_BITS(USER_INFO_STA_ID_KNOWN) |
- EHT_PREP(USER_INFO_STA_ID, MU_AID, rxv[8]);
-
- usig->common |=
- EHT_BITS(USIG_COMMON_PHY_VER_KNOWN) |
- EHT_BITS(USIG_COMMON_BW_KNOWN) |
- EHT_BITS(USIG_COMMON_UL_DL_KNOWN) |
- EHT_BITS(USIG_COMMON_BSS_COLOR_KNOWN) |
- EHT_BITS(USIG_COMMON_TXOP_KNOWN) |
- le32_encode_bits(0, IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER) |
- le32_encode_bits(bw, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW) |
- EHT_PREP(USIG_COMMON_UL_DL, UPLINK, rxv[5]) |
- EHT_PREP(USIG_COMMON_BSS_COLOR, BSS_COLOR, rxv[9]) |
- EHT_PREP(USIG_COMMON_TXOP, TXOP_DUR, rxv[9]);
-}
-EXPORT_SYMBOL_GPL(mt76_connac3_mac_decode_eht_radiotap);
diff --git a/mt76_connac3_mac.h b/mt76_connac3_mac.h
index 353e6606..83dcd964 100644
--- a/mt76_connac3_mac.h
+++ b/mt76_connac3_mac.h
@@ -142,28 +142,6 @@ enum {
#define MT_CRXV_HE_RU3_L GENMASK(31, 27)
#define MT_CRXV_HE_RU3_H GENMASK(3, 0)
-#define MT_CRXV_EHT_NUM_USER GENMASK(26, 20)
-#define MT_CRXV_EHT_LTF_SIZE GENMASK(28, 27)
-#define MT_CRXV_EHT_LDPC_EXT_SYM BIT(30)
-#define MT_CRXV_EHT_PE_DISAMBIG BIT(1)
-#define MT_CRXV_EHT_UPLINK BIT(2)
-#define MT_CRXV_EHT_MU_AID GENMASK(27, 17)
-#define MT_CRXV_EHT_BEAM_CHNG BIT(29)
-#define MT_CRXV_EHT_DOPPLER BIT(0)
-#define MT_CRXV_EHT_BSS_COLOR GENMASK(15, 10)
-#define MT_CRXV_EHT_TXOP_DUR GENMASK(23, 17)
-#define MT_CRXV_EHT_SR_MASK GENMASK(11, 8)
-#define MT_CRXV_EHT_SR1_MASK GENMASK(15, 12)
-#define MT_CRXV_EHT_SR2_MASK GENMASK(19, 16)
-#define MT_CRXV_EHT_SR3_MASK GENMASK(23, 20)
-#define MT_CRXV_EHT_RU0 GENMASK(8, 0)
-#define MT_CRXV_EHT_RU1 GENMASK(17, 9)
-#define MT_CRXV_EHT_RU2 GENMASK(26, 18)
-#define MT_CRXV_EHT_RU3_L GENMASK(31, 27)
-#define MT_CRXV_EHT_RU3_H GENMASK(3, 0)
-#define MT_CRXV_EHT_SIG_MCS GENMASK(19, 18)
-#define MT_CRXV_EHT_LTF_SYM GENMASK(22, 20)
-
enum tx_header_format {
MT_HDR_FORMAT_802_3,
MT_HDR_FORMAT_CMD,
diff --git a/mt7925/mac.c b/mt7925/mac.c
index c2460ef4..1b9fbd9a 100644
--- a/mt7925/mac.c
+++ b/mt7925/mac.c
@@ -590,25 +590,14 @@ mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
seq_ctrl = le16_to_cpu(hdr->seq_ctrl);
qos_ctl = *ieee80211_get_qos_ctl(hdr);
}
- skb_set_mac_header(skb, (unsigned char *)hdr - skb->data);
} else {
status->flag |= RX_FLAG_8023;
}
mt792x_mac_assoc_rssi(dev, skb);
- if (rxv && !(status->flag & RX_FLAG_8023)) {
- switch (status->encoding) {
- case RX_ENC_EHT:
- mt76_connac3_mac_decode_eht_radiotap(skb, rxv, mode);
- break;
- case RX_ENC_HE:
- mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode);
- break;
- default:
- break;
- }
- }
+ if (rxv && mode >= MT_PHY_TYPE_HE_SU && !(status->flag & RX_FLAG_8023))
+ mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode);
if (!status->wcid || !ieee80211_is_data_qos(fc))
return 0;
--
2.43.2

100
package/kernel/mt76/patches-6.x/002-wifi-mt76-mt7915-fix-oops.patch Normal file
View File

@ -0,0 +1,100 @@
From 3b47d9df427c4833605a172f2a8f0e0012b04c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Sat, 13 Jul 2024 15:00:10 +0200
Subject: [PATCH] wifi: mt76: mt7915: fix oops on non-dbdc mt7986
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
mt7915_band_config() sets band_idx = 1 on the main phy for mt7986
with MT7975_ONE_ADIE or MT7976_ONE_ADIE.
Commit 0335c034e726 ("wifi: mt76: fix race condition related to
checking tx queue fill status") introduced a dereference of the
phys array indirectly indexed by band_idx via wcid->phy_idx in
mt76_wcid_cleanup(). This caused the following Oops on affected
mt7986 devices:
Unable to handle kernel read from unreadable memory at virtual address 0000000000000024
Mem abort info:
ESR = 0x0000000096000005
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x05: level 1 translation fault
Data abort info:
ISV = 0, ISS = 0x00000005
CM = 0, WnR = 0
user pgtable: 4k pages, 39-bit VAs, pgdp=0000000042545000
[0000000000000024] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
Internal error: Oops: 0000000096000005 [#1] SMP
Modules linked in: ... mt7915e mt76_connac_lib mt76 mac80211 cfg80211 ...
CPU: 2 PID: 1631 Comm: hostapd Not tainted 5.15.150 #0
Hardware name: ZyXEL EX5700 (Telenor) (DT)
pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : mt76_wcid_cleanup+0x84/0x22c [mt76]
lr : mt76_wcid_cleanup+0x64/0x22c [mt76]
sp : ffffffc00a803700
x29: ffffffc00a803700 x28: ffffff80008f7300 x27: ffffff80003f3c00
x26: ffffff80000a7880 x25: ffffffc008c26e00 x24: 0000000000000001
x23: ffffffc000a68114 x22: 0000000000000000 x21: ffffff8004172cc8
x20: ffffffc00a803748 x19: ffffff8004152020 x18: 0000000000000000
x17: 00000000000017c0 x16: ffffffc008ef5000 x15: 0000000000000be0
x14: ffffff8004172e28 x13: ffffff8004172e28 x12: 0000000000000000
x11: 0000000000000000 x10: ffffff8004172e30 x9 : ffffff8004172e28
x8 : 0000000000000000 x7 : ffffff8004156020 x6 : 0000000000000000
x5 : 0000000000000031 x4 : 0000000000000000 x3 : 0000000000000001
x2 : 0000000000000000 x1 : ffffff80008f7300 x0 : 0000000000000024
Call trace:
mt76_wcid_cleanup+0x84/0x22c [mt76]
__mt76_sta_remove+0x70/0xbc [mt76]
mt76_sta_state+0x8c/0x1a4 [mt76]
mt7915_eeprom_get_power_delta+0x11e4/0x23a0 [mt7915e]
drv_sta_state+0x144/0x274 [mac80211]
sta_info_move_state+0x1cc/0x2a4 [mac80211]
sta_set_sinfo+0xaf8/0xc24 [mac80211]
sta_info_destroy_addr_bss+0x4c/0x6c [mac80211]
ieee80211_color_change_finish+0x1c08/0x1e70 [mac80211]
cfg80211_check_station_change+0x1360/0x4710 [cfg80211]
genl_family_rcv_msg_doit+0xb4/0x110
genl_rcv_msg+0xd0/0x1bc
netlink_rcv_skb+0x58/0x120
genl_rcv+0x34/0x50
netlink_unicast+0x1f0/0x2ec
netlink_sendmsg+0x198/0x3d0
____sys_sendmsg+0x1b0/0x210
___sys_sendmsg+0x80/0xf0
__sys_sendmsg+0x44/0xa0
__arm64_sys_sendmsg+0x20/0x30
invoke_syscall.constprop.0+0x4c/0xe0
do_el0_svc+0x40/0xd0
el0_svc+0x14/0x4c
el0t_64_sync_handler+0x100/0x110
el0t_64_sync+0x15c/0x160
Code: d2800002 910092c0 52800023 f9800011 (885f7c01)
---[ end trace 7e42dd9a39ed2281 ]---
Fix by using mt76_dev_phy() which will map band_idx to the correct phy
for all hardware combinations.
Fixes: 0335c034e726 ("wifi: mt76: fix race condition related to checking tx queue fill status")
Link: https://github.com/openwrt/openwrt/issues/14548
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Link: https://patch.msgid.link/20240713130010.516037-1-bjorn@mork.no
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
mac80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mac80211.c
+++ b/mac80211.c
@@ -1515,7 +1515,7 @@ EXPORT_SYMBOL_GPL(mt76_wcid_init);
void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
{
- struct mt76_phy *phy = dev->phys[wcid->phy_idx];
+ struct mt76_phy *phy = mt76_dev_phy(dev, wcid->phy_idx);
struct ieee80211_hw *hw;
struct sk_buff_head list;
struct sk_buff *skb;

23
package/kernel/mt76/patches-6.x/101-fixes-mt7925-build-error.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/mt7925/main.c
+++ b/mt7925/main.c
@@ -260,7 +260,8 @@ __mt7925_set_stream_he_eht_caps(struct m
n++;
}
- _ieee80211_set_sband_iftype_data(sband, data, n);
+ sband->iftype_data = data;
+ sband->n_iftype_data = n;
}
void mt7925_set_stream_he_eht_caps(struct mt792x_phy *phy)
--- a/mt7925/mcu.c
+++ b/mt7925/mcu.c
@@ -2209,7 +2209,7 @@ mt7925_mcu_bss_mld_tlv(struct sk_buff *s
struct ieee80211_sta *sta)
{
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
- bool is_mld = ieee80211_vif_is_mld(vif);
+ bool is_mld = (vif->valid_links != 0);
struct bss_mld_tlv *mld;
struct tlv *tlv;

BIN
package/kernel/mt76/src/firmware/mt7981_eeprom_mt7976_dbdc.bin
View File

Binary file not shown.