Merge pull request #110 from openwrtdiy/openwrt-23.05

Synchronize official source code updates

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .155
-LINUX_KERNEL_HASH-5.15.155 = c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4
+LINUX_VERSION-5.15 = .158
+LINUX_KERNEL_HASH-5.15.158 = f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6

package/firmware/wireless-regdb/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wireless-regdb
-PKG_VERSION:=2024.01.23
+PKG_VERSION:=2024.05.08
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/network/wireless-regdb/
-PKG_HASH:=c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55
+PKG_HASH:=9aee1d86ebebb363b714bec941b2820f31e3b7f1a485ddc9fcbd9985c7d3e7c4
 
 PKG_MAINTAINER:=Felix Fietkau <[email protected]>
 

package/kernel/mt76/Makefile

@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_RELEASE=1
+PKG_RELEASE=3
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-12-08
-PKG_SOURCE_VERSION:=f559adf1849c8af91f5a5eb670f4ed2c24988898
-PKG_MIRROR_HASH:=74dde4478442d5f0edbae918636b40767b0e49181b732d4184feeccd8a8cc328
+PKG_SOURCE_DATE:=2024-02-03
+PKG_SOURCE_VERSION:=6124ea9135ed512671933f5520c46842906c78bc
+PKG_MIRROR_HASH:=acc326d7b15c9c72b494ed601300be329553f896e65c7f045e6a09327304c34a
 
 PKG_MAINTAINER:=Felix Fietkau <[email protected]>
 PKG_USE_NINJA:=0
@@ -323,6 +323,12 @@ define KernelPackage/mt7996e
   AUTOLOAD:=$(call AutoProbe,mt7996e)
 endef
 
+define KernelPackage/mt7996-firmware
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7996 firmware
+  DEPENDS+=+kmod-mt7996e
+endef
+
 define KernelPackage/mt7925-common
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7925 wireless driver common code
@@ -610,6 +616,17 @@ define KernelPackage/mt7922-firmware/install
 		$(1)/lib/firmware/mediatek
 endef
 
+define KernelPackage/mt7996-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7996
+	cp \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_dsp.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm.bin \
+		$(1)/lib/firmware/mediatek/mt7996
+endef
+
 define Package/mt76-test/install
 	mkdir -p $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
@@ -654,5 +671,6 @@ $(eval $(call KernelPackage,mt7921e))
 $(eval $(call KernelPackage,mt7925u))
 $(eval $(call KernelPackage,mt7925e))
 $(eval $(call KernelPackage,mt7996e))
+$(eval $(call KernelPackage,mt7996-firmware))
 $(eval $(call KernelPackage,mt76))
 $(eval $(call BuildPackage,mt76-test))

package/kernel/mt76/patches/0007-wifi-mt76-fix-the-issue-of-missing-txpwr-settings-fr.patch → package/kernel/mt76/patches/0001-wifi-mt76-fix-the-issue-of-missing-txpwr-settings-fr.patch

@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
-@@ -2101,7 +2101,7 @@ mt76_connac_mcu_rate_txpower_band(struct
+@@ -2104,7 +2104,7 @@ mt76_connac_mcu_rate_txpower_band(struct
  		int j, msg_len, num_ch;
  		struct sk_buff *skb;
 

package/kernel/mt76/patches/0008-wifi-mt76-mt7996-fix-size-of-txpower-MCU-command.patch → package/kernel/mt76/patches/0002-wifi-mt76-mt7996-fix-size-of-txpower-MCU-command.patch

@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/mt7996/mcu.c
 +++ b/mt7996/mcu.c
-@@ -4456,7 +4456,7 @@ int mt7996_mcu_set_txpower_sku(struct mt
+@@ -4464,7 +4464,7 @@ int mt7996_mcu_set_txpower_sku(struct mt
  		u8 band_idx;
  	} __packed req = {
  		.tag = cpu_to_le16(UNI_TXPOWER_POWER_LIMIT_TABLE_CTRL),
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.power_ctrl_id = UNI_TXPOWER_POWER_LIMIT_TABLE_CTRL,
  		.power_limit_type = TX_POWER_LIMIT_TABLE_RATE,
  		.band_idx = phy->mt76->band_idx,
-@@ -4471,7 +4471,7 @@ int mt7996_mcu_set_txpower_sku(struct mt
+@@ -4479,7 +4479,7 @@ int mt7996_mcu_set_txpower_sku(struct mt
  	mphy->txpower_cur = tx_power;
 
  	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL,
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!skb)
  		return -ENOMEM;
 
-@@ -4495,6 +4495,9 @@ int mt7996_mcu_set_txpower_sku(struct mt
+@@ -4503,6 +4503,9 @@ int mt7996_mcu_set_txpower_sku(struct mt
  	/* eht */
  	skb_put_data(skb, &la.eht[0], sizeof(la.eht));
 

package/kernel/mt76/patches/0009-wifi-mt76-mt7996-fix-uninitialized-variable-in-mt799.patch → package/kernel/mt76/patches/0003-wifi-mt76-mt7996-fix-uninitialized-variable-in-mt799.patch

@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
-@@ -499,7 +499,7 @@ static void mt7996_irq_tasklet(struct ta
+@@ -519,7 +519,7 @@ static void mt7996_irq_tasklet(struct ta
  	struct mt7996_dev *dev = from_tasklet(dev, t, mt76.irq_tasklet);
  	struct mtk_wed_device *wed = &dev->mt76.mmio.wed;
  	struct mtk_wed_device *wed_hif2 = &dev->mt76.mmio.wed_hif2;

package/kernel/mt76/patches/0010-wifi-mt76-mt7996-fix-potential-memory-leakage-when-r.patch → package/kernel/mt76/patches/0004-wifi-mt76-mt7996-fix-potential-memory-leakage-when-r.patch

@@ -17,15 +17,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/mt7996/mcu.c
 +++ b/mt7996/mcu.c
-@@ -3721,6 +3721,7 @@ int mt7996_mcu_get_temperature(struct mt
+@@ -3729,6 +3729,7 @@ int mt7996_mcu_get_temperature(struct mt
  	} __packed * res;
  	struct sk_buff *skb;
  	int ret;
 +	u32 temp;
 
  	ret = mt76_mcu_send_and_get_msg(&phy->dev->mt76, MCU_WM_UNI_CMD(THERMAL),
  					&req, sizeof(req), true, &skb);
-@@ -3728,8 +3729,10 @@ int mt7996_mcu_get_temperature(struct mt
+@@ -3736,8 +3737,10 @@ int mt7996_mcu_get_temperature(struct mt
  		return ret;
 
  	res = (void *)skb->data;

package/kernel/mt76/patches/0005-wifi-mt76-connac-check-for-null-before-dereferencing.patch

@@ -0,0 +1,27 @@
+From 725f531c14597f20645321d8a900796f5a68e135 Mon Sep 17 00:00:00 2001
+From: Muhammad Usama Anjum <[email protected]>
+Date: Fri, 1 Mar 2024 19:44:06 +0500
+Subject: [PATCH] wifi: mt76: connac: check for null before dereferencing
+
+The wcid can be NULL. It should be checked for validity before
+dereferencing it to avoid crash.
+
+Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets")
+Signed-off-by: Muhammad Usama Anjum <[email protected]>
+Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
+Signed-off-by: Felix Fietkau <[email protected]>
+---
+ mt76_connac_mcu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mt76_connac_mcu.c
++++ b/mt76_connac_mcu.c
+@@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct m
+ 	};
+ 	struct sk_buff *skb;
+
+-	if (is_mt799x(dev) && !wcid->sta)
++	if (is_mt799x(dev) && wcid && !wcid->sta)
+ 		hdr.muar_idx = 0xe;
+
+ 	mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo,

package/kernel/mt76/patches/0006-wifi-mt76-connac-use-muar-idx-0xe-for-non-mt799x-as-.patch

@@ -0,0 +1,25 @@
+From 1e336a8582dce2ef32ddd440d423e9afef961e71 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <[email protected]>
+Date: Wed, 3 Apr 2024 13:01:01 +0200
+Subject: [PATCH] wifi: mt76: connac: use muar idx 0xe for non-mt799x as well
+
+This is expected by the firmware of older chipsets as well, though it may
+not have been as strongly required as on mt799x
+
+Fixes: 098428c400ff ("wifi: mt76: connac: set correct muar_idx for mt799x chipsets")
+Signed-off-by: Felix Fietkau <[email protected]>
+---
+ mt76_connac_mcu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mt76_connac_mcu.c
++++ b/mt76_connac_mcu.c
+@@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct m
+ 	};
+ 	struct sk_buff *skb;
+
+-	if (is_mt799x(dev) && wcid && !wcid->sta)
++	if (wcid && !wcid->sta)
+ 		hdr.muar_idx = 0xe;
+
+ 	mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo,