[openwrt/openwrt] mt76: update to the latest version

LEDE Commits lede-commits at lists.infradead.org
Sun Feb 14 13:55:57 EST 2021 

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bc3963764d5a3bc2371a890dbe76d3b6dc131d10

commit bc3963764d5a3bc2371a890dbe76d3b6dc131d10
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Dec 18 19:03:55 2020 +0100

    mt76: update to the latest version
    
    261d184cebdc mt76: introduce mt76_vif data structure
    50349a8664ef mt76: mt76_connac: create mcu library
    c88859180c51 mt76: mt76_connac: move hw_scan and sched_scan routine in mt76_connac_mcu module
    9856236ab4f9 mt76: mt76_connac: move WoW and suspend code in mt76_connac_mcu module
    2da59aacdd50 mt76: mt76_connac: move pm data struct in mt76_connac.h
    16be142e40fe mt76: mt76_connac: move pm utility routines in mt76_connac_lib module
    c4ccfc66347d mt76: mt7921: add MAC support
    8ecf3a50e7ad mt76: mt7921: add MCU support
    92c1717f9a55 mt76: mt7921: add DMA support
    1cecf9c3da8b mt76: mt7921: add EEPROM support
    a9e68410b9ba mt76: mt7921: add ieee80211_ops
    39d6f4851b06 mt76: mt7921: introduce mt7921e support
    9f37baecf5d6 mt76: mt7921: add debugfs support
    b16cf6e26998 mt76: mt7921: introduce schedule scan support
    5aa798ee56c7 mt76: mt7921: introduce 802.11 PS support in sta mode
    e67d5216f16d mt76: mt7921: introduce support for hardware beacon filter
    cb99bf4655f9 mt76: mt7921: introduce beacon_loss mcu event
    71f9f09ee987 mt76: mt7921: introduce PM support
    2beb9c9530d4 mt76: mt7921: rely on mt76_connac_mcu common library
    59e682497d12 mt76: mt7921: rely on mt76_connac_mcu module for sched_scan and hw_scan
    1ccf6a9c60cd mt76: mt7921: rely on mt76_connac_mcu module for suspend and WoW support
    f8d1ec5e6e11 mt76: mt7921: introduce Runtime PM support
    633a1cbd8f4e mt76: mt7921: introduce regdomain notifier support
    0d95c6ad1745 mt76: mt7921: enable MSI interrupts
    5f4f6792fb37 mt76: mt7921: add coredump support
    47eb00e13450 mt76: mt7663: introduce coredump support
    26658849a465 mt76: mt7615: fix key set/delete issues
    b0ba039bc2ef mt76: mt7615: fix tx skb dma unmap
    892f74d37e88 mt76: mt7915: fix tx skb dma unmap
    2659f6c6ea23 mt76: mt7615: support loading EEPROM for MT7613BE
    b09cc8644529 mt76: dma: do not report truncated frames to mac80211
    ae6473f1d2af mt76: mt7921: enable random mac addr during scanning
    b59e3677476d mt76: mt7921: remove unnecessary variable
    781911f167aa mt76: mt7921: removed unused definitions in mcu.h
    994893d38d51 mt76: always use WTBL_MAX_SIZE for tlv allocation
    e6c0948ada07 mt76: mt76x0: disable GTK offloading
    a75302bcbfe1 mt76: connac: always check return value from mt76_connac_mcu_alloc_wtbl_req
    8da10d6f9251 mt76: mt7915: always check return value from mt7915_mcu_alloc_wtbl_req
    80a87412e9e9 mt76: mt7915: fix uninitialized variable in mt7915_tm_set_tx_cont()
    c7d98fc35865 mt76: use PCI_VENDOR_ID_MEDIATEK to avoid open coded
    b5228e75e422 mt76: mt7921: switch to new api for hardware beacon filter
    73fce2cbfa41 mt76: connac: fix up the setting for ht40 mode in mt76_connac_mcu_uni_add_bss
    2e2cb71901e8 mt76: mt7921: fixup rx bitrate statistics
    2d7b1d72b43b mt76: mt7921: add flush operation
    96b4c9874e16 mt76: mt7921: fix uninitialized pointer access in mt7921_get_wtbl_info
    4492d801cbb5 mt76: connac: update sched_scan cmd usage
    200c1b1c234b mac80211: rename csa counters to countdown counters
    0d7564d0d899 mt76: add support for 802.3 rx frames
    4c0811c647b9 mt76: mt7915: enable hw rx-amsdu de-aggregation
    4b7a68634ff6 mt76: mt7915: add rx checksum offload support
    289cd7804587 mt76: mt7915: add support for rx decapsulation offload
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/kernel/mt76/Makefile                       | 32 +++++++--
 .../kernel/mt76/patches/100-mac80211-5.10.patch    | 82 ----------------------
 2 files changed, 28 insertions(+), 86 deletions(-)

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 05d710387c..810ee4c3d4 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-01-27
-PKG_SOURCE_VERSION:=8696919d9aae9b673f916bca41c5e1671eec5b0e
-PKG_MIRROR_HASH:=82675e11f537eaa2fe2c1029880f7993ed4401d0d59b12faf6dbe96ac3eb8308
+PKG_SOURCE_DATE:=2021-02-14
+PKG_SOURCE_VERSION:=289cd7804587dc48f776d450db9cd3762692a370
+PKG_MIRROR_HASH:=91885feca9d935586c6e33a8e3734bfa61991d869bf42ac0d1c8c3b19bfa9653
 
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -143,11 +143,19 @@ define KernelPackage/mt7603
   AUTOLOAD:=$(call AutoProbe,mt7603e)
 endef
 
+define KernelPackage/mt76-connac
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7615/MT79xx wireless driver common code
+  HIDDEN:=1
+  DEPENDS+=+kmod-mt76-core
+  FILES:= $(PKG_BUILD_DIR)/mt76-connac-lib.ko
+endef
+
 define KernelPackage/mt7615-common
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7615 wireless driver common code
   HIDDEN:=1
-  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac
   FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko
 endef
 
@@ -210,6 +218,14 @@ define KernelPackage/mt7915e
   AUTOLOAD:=$(call AutoProbe,mt7915e)
 endef
 
+define KernelPackage/mt7921e
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7921e wireless driver
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac
+  FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921e.ko
+  AUTOLOAD:=$(call AutoProbe,mt7921e)
+endef
+
 define Package/mt76-test
   SECTION:=devel
   CATEGORY:=Development
@@ -267,6 +283,9 @@ endif
 ifdef CONFIG_PACKAGE_kmod-mt7603
   PKG_MAKE_FLAGS += CONFIG_MT7603E=m
 endif
+ifdef CONFIG_PACKAGE_kmod-mt76-connac
+  PKG_MAKE_FLAGS += CONFIG_MT76_CONNAC_LIB=m
+endif
 ifdef CONFIG_PACKAGE_kmod-mt7615-common
   PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m
 endif
@@ -290,6 +309,9 @@ endif
 ifdef CONFIG_PACKAGE_kmod-mt7915e
   PKG_MAKE_FLAGS += CONFIG_MT7915E=m
 endif
+ifdef CONFIG_PACKAGE_kmod-mt7921e
+  PKG_MAKE_FLAGS += CONFIG_MT7921E=m
+endif
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
@@ -400,6 +422,7 @@ $(eval $(call KernelPackage,mt76x2-common))
 $(eval $(call KernelPackage,mt76x2u))
 $(eval $(call KernelPackage,mt76x2))
 $(eval $(call KernelPackage,mt7603))
+$(eval $(call KernelPackage,mt76-connac))
 $(eval $(call KernelPackage,mt7615-common))
 $(eval $(call KernelPackage,mt7615-firmware))
 $(eval $(call KernelPackage,mt7615e))
@@ -409,5 +432,6 @@ $(eval $(call KernelPackage,mt7663-usb-sdio))
 $(eval $(call KernelPackage,mt7663u))
 $(eval $(call KernelPackage,mt7663s))
 $(eval $(call KernelPackage,mt7915e))
+$(eval $(call KernelPackage,mt7921e))
 $(eval $(call KernelPackage,mt76))
 $(eval $(call BuildPackage,mt76-test))
diff --git a/package/kernel/mt76/patches/100-mac80211-5.10.patch b/package/kernel/mt76/patches/100-mac80211-5.10.patch
deleted file mode 100644
index b7b5a5691c..0000000000
--- a/package/kernel/mt76/patches/100-mac80211-5.10.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/mt7615/mcu.c
-+++ b/mt7615/mcu.c
-@@ -730,12 +730,12 @@ mt7615_mcu_add_beacon_offload(struct mt7
- 	memcpy(req.pkt + MT_TXD_SIZE, skb->data, skb->len);
- 	req.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
- 	req.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);
--	if (offs.csa_counter_offs[0]) {
-+	if (offs.cntdwn_counter_offs[0]) {
- 		u16 csa_offs;
- 
--		csa_offs = MT_TXD_SIZE + offs.csa_counter_offs[0] - 4;
-+		csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4;
- 		req.csa_ie_pos = cpu_to_le16(csa_offs);
--		req.csa_cnt = skb->data[offs.csa_counter_offs[0]];
-+		req.csa_cnt = skb->data[offs.cntdwn_counter_offs[0]];
- 	}
- 	dev_kfree_skb(skb);
- 
-@@ -1801,10 +1801,10 @@ mt7615_mcu_uni_add_beacon_offload(struct
- 	req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
- 	req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);
- 
--	if (offs.csa_counter_offs[0]) {
-+	if (offs.cntdwn_counter_offs[0]) {
- 		u16 csa_offs;
- 
--		csa_offs = MT_TXD_SIZE + offs.csa_counter_offs[0] - 4;
-+		csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4;
- 		req.beacon_tlv.csa_ie_pos = cpu_to_le16(csa_offs);
- 	}
- 	dev_kfree_skb(skb);
---- a/mt7915/mcu.c
-+++ b/mt7915/mcu.c
-@@ -2358,7 +2358,7 @@ mt7915_mcu_beacon_csa(struct sk_buff *rs
- 		      struct bss_info_bcn *bcn,
- 		      struct ieee80211_mutable_offsets *offs)
- {
--	if (offs->csa_counter_offs[0]) {
-+	if (offs->cntdwn_counter_offs[0]) {
- 		struct tlv *tlv;
- 		struct bss_info_bcn_csa *csa;
- 
-@@ -2366,7 +2366,7 @@ mt7915_mcu_beacon_csa(struct sk_buff *rs
- 						   sizeof(*csa), &bcn->sub_ntlv,
- 						   &bcn->len);
- 		csa = (struct bss_info_bcn_csa *)tlv;
--		csa->cnt = skb->data[offs->csa_counter_offs[0]];
-+		csa->cnt = skb->data[offs->cntdwn_counter_offs[0]];
- 	}
- }
- 
-@@ -2388,8 +2388,8 @@ mt7915_mcu_beacon_cont(struct mt7915_dev
- 	cont->pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
- 	cont->tim_ofs = cpu_to_le16(offs->tim_offset);
- 
--	if (offs->csa_counter_offs[0])
--		cont->csa_ofs = cpu_to_le16(offs->csa_counter_offs[0] - 4);
-+	if (offs->cntdwn_counter_offs[0])
-+		cont->csa_ofs = cpu_to_le16(offs->cntdwn_counter_offs[0] - 4);
- 
- 	buf = (u8 *)tlv + sizeof(*cont);
- 	mt7915_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, NULL,
---- a/mac80211.c
-+++ b/mac80211.c
-@@ -1082,7 +1082,7 @@ EXPORT_SYMBOL_GPL(mt76_get_txpower);
- static void
- __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- {
--	if (vif->csa_active && ieee80211_csa_is_complete(vif))
-+	if (vif->csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
- 		ieee80211_csa_finish(vif);
- }
- 
-@@ -1107,7 +1107,7 @@ __mt76_csa_check(void *priv, u8 *mac, st
- 	if (!vif->csa_active)
- 		return;
- 
--	dev->csa_complete |= ieee80211_csa_is_complete(vif);
-+	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
- }
- 
- void mt76_csa_check(struct mt76_dev *dev)

More information about the lede-commits mailing list