Merge branch 'qosmio-qualcommax-6.x-nss-wifi' into qosmio-nss-wifi-6.x

config/Config-kernel.in

@@ -173,16 +173,6 @@ config KERNEL_KASAN
 	  Currently CONFIG_KASAN doesn't work with CONFIG_DEBUG_SLAB
 	  (the resulting kernel does not boot).
 
-config KERNEL_KASAN_EXTRA
-	bool "KAsan: extra checks"
-	depends on KERNEL_KASAN && KERNEL_DEBUG_KERNEL
-	help
-	  This enables further checks in the kernel address sanitizer, for now
-	  it only includes the address-use-after-scope check that can lead
-	  to excessive kernel stack usage, frame size warnings and longer
-	  compile time.
-	  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 has more
-
 config KERNEL_KASAN_VMALLOC
 	bool "Back mappings in vmalloc space with real shadow memory"
 	depends on KERNEL_KASAN

package/base-files/files/lib/functions.sh

@@ -533,4 +533,4 @@ cmdline_get_var() {
 	done
 }
 
-[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh
+[ -z "$IPKG_INSTROOT" ] && ( [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh ) || true

package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch

@@ -203,7 +203,7 @@
 +		button-wps {
 +			label = "wps";
 +			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
++			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 +		};
 +	};
 +

package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch

@@ -1,11 +1,10 @@
 --- a/drivers/net/wireless/ath/ath11k/qmi.c
 +++ b/drivers/net/wireless/ath/ath11k/qmi.c
-@@ -2100,6 +2100,9 @@ static int ath11k_qmi_assign_target_mem_
+@@ -2100,6 +2100,8 @@ static int ath11k_qmi_assign_target_mem_
  			ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type;
  			idx++;
  			break;
 +		case M3_DUMP_REGION_TYPE:
-+			idx++;
 +			break;
  		default:
  			ath11k_warn(ab, "qmi ignore invalid mem req type %d\n",

package/kernel/mac80211/patches/subsys/333-wifi-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMI.patch

@@ -0,0 +1,70 @@
+From: Michael-CY Lee <[email protected]>
+Date: Tue, 26 Mar 2024 08:30:36 +0800
+Subject: [PATCH] wifi: mac80211: extend IEEE80211_KEY_FLAG_GENERATE_MMIE to
+ other ciphers
+
+Extend the flag IEEE80211_KEY_FLAG_GENERATE_MMIE to BIP-CMAC-256,
+BIP-GMAC-128 and BIP-GMAC-256 for the same reason and in the same
+way that the flag was added originally in commit a0b4496a4368
+("mac80211: add IEEE80211_KEY_FLAG_GENERATE_MMIE to ieee80211_key_flags").
+
+Signed-off-by: Michael-CY Lee <[email protected]>
+Link: https://msgid.link/[email protected]
+Signed-off-by: Johannes Berg <[email protected]>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -2032,8 +2032,8 @@ static inline bool lockdep_vif_mutex_hel
+  *	@IEEE80211_KEY_FLAG_GENERATE_MMIC on the same key.
+  * @IEEE80211_KEY_FLAG_NO_AUTO_TX: Key needs explicit Tx activation.
+  * @IEEE80211_KEY_FLAG_GENERATE_MMIE: This flag should be set by the driver
+- *	for a AES_CMAC key to indicate that it requires sequence number
+- *	generation only
++ *	for a AES_CMAC or a AES_GMAC key to indicate that it requires sequence
++ *	number generation only
+  */
+ enum ieee80211_key_flags {
+ 	IEEE80211_KEY_FLAG_GENERATE_IV_MGMT	= BIT(0),
+--- a/net/mac80211/wpa.c
++++ b/net/mac80211/wpa.c
+@@ -882,7 +882,8 @@ ieee80211_crypto_aes_cmac_256_encrypt(st
+
+ 	info = IEEE80211_SKB_CB(skb);
+
+-	if (info->control.hw_key)
++	if (info->control.hw_key &&
++	    !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
+ 		return TX_CONTINUE;
+
+ 	if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
+@@ -898,6 +899,9 @@ ieee80211_crypto_aes_cmac_256_encrypt(st
+
+ 	bip_ipn_set64(mmie->sequence_number, pn64);
+
++	if (info->control.hw_key)
++		return TX_CONTINUE;
++
+ 	bip_aad(skb, aad);
+
+ 	/* MIC = AES-256-CMAC(IGTK, AAD || Management Frame Body || MMIE, 128)
+@@ -1027,7 +1031,8 @@ ieee80211_crypto_aes_gmac_encrypt(struct
+
+ 	info = IEEE80211_SKB_CB(skb);
+
+-	if (info->control.hw_key)
++	if (info->control.hw_key &&
++	    !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
+ 		return TX_CONTINUE;
+
+ 	if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
+@@ -1043,6 +1048,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
+
+ 	bip_ipn_set64(mmie->sequence_number, pn64);
+
++	if (info->control.hw_key)
++		return TX_CONTINUE;
++
+ 	bip_aad(skb, aad);
+
+ 	hdr = (struct ieee80211_hdr *)skb->data;

scripts/package-metadata.pl

@@ -655,7 +655,7 @@ sub dump_cyclonedxsbom_json {
 		serialNumber => "urn:uuid:$uuid",
 		version => 1,
 		metadata => {
-			timestamp => gmtime->datetime,
+			timestamp => gmtime->datetime . 'Z',
 		},
 		"components" => [@components],
 	};

target/linux/kirkwood/image/Makefile

@@ -186,7 +186,7 @@ define Device/dlink_dns320l
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DNS-320L
   DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-fs-ext4 kmod-gpio-button-hotplug \
-	kmod-usb-storage kmod-usb-ledtrig-usbport dns320l-mcu
+	kmod-usb-storage kmod-usb-ledtrig-usbport dns320l-mcu kmod-rtc-mv
 endef
 TARGET_DEVICES += dlink_dns320l
 
@@ -386,7 +386,8 @@ TARGET_DEVICES += zyxel_nsa310b
 define Device/zyxel_nsa310s
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := NSA310S
-  DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-fs-ext4 kmod-gpio-button-hotplug
+  DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-fs-ext4 \
+	kmod-gpio-button-hotplug kmod-rtc-mv
 endef
 TARGET_DEVICES += zyxel_nsa310s
 

target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts

@@ -40,7 +40,7 @@
 		button-wps {
 			label = "wps";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
 		};
 	};