Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-focal/new-upstream-release-8286 into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/focal

[You-Sheng Yang]

backport-iwlwifi-dkms (8286-0ubuntu1) focal; urgency=low

  * New release
    - upstream version 8286 commit 26271a73a63d24.

  * debian/patches:
    - Update 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
    - Drop 0003-backport-apply-__copy-to-init_module-cleanup_module.patch
    - Drop 0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
  * Update debian/backport-iwlwifi-dkms.modaliases

 -- You-Sheng Yang <email address hidden> Wed, 18 Dec 2019 19:43:25 +0800

[You-Sheng Yang (vicamo)]

https://launchpad.net/ubuntu/+source/backport-iwlwifi-dkms/8286-0ubuntu1

review: Approve

diff --git a/.gitignore b/.gitignore
index 0718a18..6a16fa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ Kconfig.versions
 *.cmd
 *.tmp
 *.ver
+*.mod
 modules.order
 backport-include/backport/autoconf.h
 modules
@@ -25,3 +26,5 @@ __pycache__
 # cscope files
 cscope.*
 ncscope.*
+# gcc profile objects
+*.gcno
diff --git a/Kconfig.local b/Kconfig.local
index c195c4e..2ea5613 100644
--- a/Kconfig.local
+++ b/Kconfig.local
@@ -79,6 +79,12 @@ config BACKPORTED_BPAUTO_ASN1_DECODER
 config BACKPORTED_BPAUTO_PKCS7
 	tristate
 	default BPAUTO_PKCS7
+config BACKPORTED_BPAUTO_CRYPTO_LIB_ARC4
+	tristate
+	default BPAUTO_CRYPTO_LIB_ARC4
+config BACKPORTED_BPAUTO_BUILD_CRYPTO_LIB_ARC4
+	tristate
+	default BPAUTO_BUILD_CRYPTO_LIB_ARC4
 config BACKPORTED_CFG80211
 	tristate
 	default CFG80211
diff --git a/MAINTAINERS b/MAINTAINERS
index 677ef41..d3b9b4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4251,6 +4251,7 @@ F:	crypto/
 F:	drivers/crypto/
 F:	include/crypto/
 F:	include/linux/crypto*
+F:	lib/crypto/
 
 CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 M:	Neil Horman <[e-mail]>
diff --git a/Makefile.build b/Makefile.build
index a848b37..9c272b2 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -1,4 +1,11 @@
+# detect if make supports --eval
+_EVAL := $(shell make --eval "test:" -f /dev/null test >/dev/null 2>&1 && echo YES || echo NO)
+ifeq ($(_EVAL),YES)
+MAKE=$(BACKPORT_DIR)/scripts/make
+else
 -include .config
+endif
+
 export
 
 .PHONY: modules
diff --git a/backport-include/linux/mm.h b/backport-include/linux/mm.h
index 0806f4d..5253e1d 100644
--- a/backport-include/linux/mm.h
+++ b/backport-include/linux/mm.h
@@ -103,6 +103,13 @@ static inline void *kvzalloc(size_t size, gfp_t flags)
 {
 	return kvmalloc(size, flags | __GFP_ZERO);
 }
-#endif
+#endif /* < 4.12 */
+
+#if LINUX_VERSION_IS_LESS(4,18,0)
+static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
+{
+	return kvmalloc_array(n, size, flags | __GFP_ZERO);
+}
+#endif /* < 4.18 */
 
 #endif /* __BACKPORT_MM_H */
diff --git a/backport-include/linux/module.h b/backport-include/linux/module.h
index 1a2c82f..675d8d7 100644
--- a/backport-include/linux/module.h
+++ b/backport-include/linux/module.h
@@ -33,7 +33,7 @@ extern void backport_dependency_symbol(void);
 		backport_dependency_symbol();				\
 		return initfn();					\
 	}								\
-	int init_module(void) __attribute__((alias("__init_backport")));\
+	int init_module(void) __attribute__((cold,alias("__init_backport")));\
 	BACKPORT_MOD_VERSIONS
 
 /*
@@ -58,7 +58,7 @@ extern void backport_dependency_symbol(void);
 		exitfn();						\
 		rcu_barrier();						\
 	}								\
-	void cleanup_module(void) __attribute__((alias("__exit_compat")));
+	void cleanup_module(void) __attribute__((cold,alias("__exit_compat")));
 #endif
 
 #if LINUX_VERSION_IS_LESS(3,3,0)
diff --git a/backport-include/linux/pci.h b/backport-include/linux/pci.h
index 341660b..a0f79fa 100644
--- a/backport-include/linux/pci.h
+++ b/backport-include/linux/pci.h
@@ -3,6 +3,17 @@
 #include_next <linux/pci.h>
 #include <linux/version.h>
 
+#if LINUX_VERSION_IS_LESS(5,4,0)
+#include <linux/pci-aspm.h>
+#endif
+
+#ifndef CONFIG_PCI
+struct msix_entry {
+	u32 vector;
+	u16 entry;
+};
+#endif
+
 #ifndef module_pci_driver
 /**
  * module_pci_driver() - Helper macro for registering a PCI driver
diff --git a/backport-include/linux/skbuff.h b/backport-include/linux/skbuff.h
index c60cbcc..f633ae3 100644
--- a/backport-include/linux/skbuff.h
+++ b/backport-include/linux/skbuff.h
@@ -391,4 +391,12 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_)
 }
 #endif
 
+#if LINUX_VERSION_IS_LESS(5,4,0)
+#define nf_reset_ct LINUX_BACKPORT(nf_reset_ct)
+static inline void nf_reset_ct(struct sk_buff *skb)
+{
+	nf_reset(skb);
+}
+#endif
+
 #endif /* __BACKPORT_SKBUFF_H */
diff --git a/backport-include/net/genetlink.h b/backport-include/net/genetlink.h
index f270ffa..e6b78e0 100644
--- a/backport-include/net/genetlink.h
+++ b/backport-include/net/genetlink.h
@@ -35,6 +35,16 @@ static inline struct netlink_ext_ack *genl_info_extack(struct genl_info *info)
 #endif
 }
 
+/* this is for patches we apply */
+static inline struct netlink_ext_ack *genl_callback_extack(struct netlink_callback *cb)
+{
+#if LINUX_VERSION_IS_GEQ(4,20,0)
+	return cb->extack;
+#else
+	return NULL;
+#endif
+}
+
 /* this gets put in place of info->userhdr, since we use that above */
 static inline void *genl_info_userhdr(struct genl_info *info)
 {
diff --git a/backport-include/net/netlink.h b/backport-include/net/netlink.h
index 996a4d3..9a5c270 100644
--- a/backport-include/net/netlink.h
+++ b/backport-include/net/netlink.h
@@ -266,6 +266,18 @@ nla_validate_nested_deprecated(const struct nlattr *start, int maxtype,
 }
 #endif /* < 5.2 */
 
+#if LINUX_VERSION_IS_LESS(5,3,0)
+#define nl80211_validate_nested LINUX_BACKPORT(nl80211_validate_nested)
+static inline int
+nl80211_validate_nested(const struct nlattr *start, int maxtype,
+			const struct nla_policy *policy,
+			struct netlink_ext_ack *extack)
+{
+	return __nla_validate_nested(start, maxtype, policy,
+				     NL_VALIDATE_STRICT, extack);
+}
+#endif /* < 5.3 */
+
 #if LINUX_VERSION_IS_LESS(5,1,0)
 #undef NLA_POLICY_NESTED
 #undef NLA_POLICY_NESTED_ARRAY
diff --git a/backport-include/net/xfrm.h b/backport-include/net/xfrm.h
new file mode 100644
index 0000000..7e55984
--- /dev/null
+++ b/backport-include/net/xfrm.h
@@ -0,0 +1,14 @@
+#ifndef __BACKPORT_NET_XFRM_H
+#define __BACKPORT_NET_XFRM_H
+#include_next <net/xfrm.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_IS_LESS(5,4,0)
+#define skb_ext_reset LINUX_BACKPORT(skb_ext_reset)
+static inline void skb_ext_reset(struct sk_buff *skb)
+{
+	secpath_reset(skb);
+}
+#endif
+
+#endif /* __BACKPORT_NET_XFRM_H */
diff --git a/compat/Kconfig b/compat/Kconfig
index 297041b..b097fac 100644
--- a/compat/Kconfig
+++ b/compat/Kconfig
@@ -170,3 +170,13 @@ config BPAUTO_ASN1_DECODER
 config BPAUTO_PKCS7
 	bool
 	#h-file crypto/pkcs7.h
+
+config BPAUTO_CRYPTO_LIB_ARC4
+	bool
+
+config BPAUTO_BUILD_CRYPTO_LIB_ARC4
+	bool
+	default y if BPAUTO_CRYPTO_LIB_ARC4
+	depends on !(CRYPTO_LIB_ARC4=y || CRYPTO_LIB_ARC4=m)
+	#h-file crypto/arc4.h
+	#c-file lib/crypto/arc4.c
diff --git a/compat/Makefile b/compat/Makefile
index 5456858..972459f 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -75,3 +75,4 @@ compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
 compat-$(CPTCFG_BPAUTO_PUBLIC_KEY) += 
 compat-$(CPTCFG_BPAUTO_BUCKET_LOCKS) += lib-bucket_locks.o
 compat-$(CPTCFG_BPAUTO_PKCS7) += 
+compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_LIB_ARC4) += lib-crypto-arc4.o
diff --git a/compat/lib-crypto-arc4.c b/compat/lib-crypto-arc4.c
new file mode 100644
index 0000000..c2020f1
--- /dev/null
+++ b/compat/lib-crypto-arc4.c
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Cryptographic API
+ *
+ * ARC4 Cipher Algorithm
+ *
+ * Jon Oberheide <[e-mail]>
+ */
+
+#include <crypto/arc4.h>
+#include <linux/module.h>
+
+int arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
+{
+	int i, j = 0, k = 0;
+
+	ctx->x = 1;
+	ctx->y = 0;
+
+	for (i = 0; i < 256; i++)
+		ctx->S[i] = i;
+
+	for (i = 0; i < 256; i++) {
+		u32 a = ctx->S[i];
+
+		j = (j + in_key[k] + a) & 0xff;
+		ctx->S[i] = ctx->S[j];
+		ctx->S[j] = a;
+		if (++k >= key_len)
+			k = 0;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL(arc4_setkey);
+
+void arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, unsigned int len)
+{
+	u32 *const S = ctx->S;
+	u32 x, y, a, b;
+	u32 ty, ta, tb;
+
+	if (len == 0)
+		return;
+
+	x = ctx->x;
+	y = ctx->y;
+
+	a = S[x];
+	y = (y + a) & 0xff;
+	b = S[y];
+
+	do {
+		S[y] = a;
+		a = (a + b) & 0xff;
+		S[x] = b;
+		x = (x + 1) & 0xff;
+		ta = S[x];
+		ty = (y + ta) & 0xff;
+		tb = S[ty];
+		*out++ = *in++ ^ S[a];
+		if (--len == 0)
+			break;
+		y = ty;
+		a = ta;
+		b = tb;
+	} while (true);
+
+	ctx->x = x;
+	ctx->y = y;
+}
+EXPORT_SYMBOL(arc4_crypt);
+
+MODULE_LICENSE("GPL");
diff --git a/debian/backport-iwlwifi-dkms.modaliases b/debian/backport-iwlwifi-dkms.modaliases
index 28dbb46..3f4e9d7 100644
--- a/debian/backport-iwlwifi-dkms.modaliases
+++ b/debian/backport-iwlwifi-dkms.modaliases
@@ -1,701 +1,259 @@
 alias net-pf-16-proto-16-family-nl80211 cfg80211
-alias pci:v00008086d00007AF0sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d00007AF0sv*sd00000510bc*sc*i* iwlwifi
-alias pci:v00008086d00007AF0sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d00007AF0sv*sd00000090bc*sc*i* iwlwifi
-alias pci:v00008086d00007A70sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d00007A70sv*sd00000510bc*sc*i* iwlwifi
-alias pci:v00008086d00007A70sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d00007A70sv*sd00000090bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd000000B0bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000510bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000020bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000090bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00004088bc*sc*i* iwlwifi
-alias pci:v00008086d00002725sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00004080bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00002080bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00001654bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00001653bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd0000008Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00000088bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00000084bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00000080bc*sc*i* iwlwifi
-alias pci:v00008086d00002723sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001080bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000090bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000040bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00004244bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00004070bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00002074bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00001652bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00001651bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd0000007Cbc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000078bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000074bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d00000000sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A370sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d0000A0F0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00002A10bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00002010bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000A10bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000710bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000610bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000510bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000410bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000310bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000210bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d00009DF0sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000043F0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d00003DF0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000034F0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000031DCsv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000030DCsv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000244bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d00002720sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d0000271Csv*sd00000214bc*sc*i* iwlwifi
-alias pci:v00008086d0000271Bsv*sd00000214bc*sc*i* iwlwifi
-alias pci:v00008086d0000271Bsv*sd00000210bc*sc*i* iwlwifi
-alias pci:v00008086d0000271Bsv*sd00000014bc*sc*i* iwlwifi
-alias pci:v00008086d0000271Bsv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000E014bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000E010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000A014bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00008010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00008014bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00006014bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00006010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000401Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00004018bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00004010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001610bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001550bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001420bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001410bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001210bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001030bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000214bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000210bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd0000001Cbc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000018bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000014bc*sc*i* iwlwifi
-alias pci:v00008086d00002526sv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000006F0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000042A4bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00004234bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000040A4bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00004034bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00004030bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00002034bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00002030bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00001552bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00001551bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000002A4bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000002A0bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000264bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000260bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd0000023Cbc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000238bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000234bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000230bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000000A4bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd000000A0bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000064bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd0000003Cbc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000038bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000034bc*sc*i* iwlwifi
-alias pci:v00008086d000002F0sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00009074bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000014bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000012bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00001012bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00003E01bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00003E02bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00001014bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000850bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000950bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000930bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000910bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00008130bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00009110bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000810bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00008010bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00008050bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00008110bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00009010bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000150bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000050bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd000010D0bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000130bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00001130bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00001110bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000110bc*sc*i* iwlwifi
-alias pci:v00008086d000024FDsv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00004010bc*sc*i* iwlwifi
+alias pci:v00008086d000002F0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d000006F0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004020bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000402Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004060bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004062bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000406Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004072bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004160bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004162bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004420bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004460bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004462bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000446Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004470bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004472bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004560bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004570bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000486Ebc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004870bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004A6Cbc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004A6Ebc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004A70bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004C60bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00004C70bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00005070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00005072bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00005170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd00005770bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C020bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C02Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C060bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C062bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C06Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C072bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C160bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C162bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C360bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C420bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C460bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C462bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C470bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C472bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C560bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C570bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C760bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000C770bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000CC60bc*sc*i* iwlwifi
+alias pci:v00008086d000008B1sv*sd0000CC70bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004220bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004260bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004262bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000426Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004270bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004272bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004360bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd00004370bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C220bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C260bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C262bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C26Abc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C270bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C272bc*sc*i* iwlwifi
+alias pci:v00008086d000008B2sv*sd0000C370bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000060bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000062bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000072bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000172bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000470bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00000472bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00001070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00001170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008060bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008062bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008070bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008072bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008170bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008172bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008470bc*sc*i* iwlwifi
+alias pci:v00008086d000008B3sv*sd00008570bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00000270bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00000272bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00000370bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00008270bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00008272bc*sc*i* iwlwifi
+alias pci:v00008086d000008B4sv*sd00008370bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00001010bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005000bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005002bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd0000500Abc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005010bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005012bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005020bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd0000502Abc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005090bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005100bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005102bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005110bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005190bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005400bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005410bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005412bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005420bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005490bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005510bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005590bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005C10bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00005F10bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009000bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd0000900Abc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009010bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009012bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009110bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009112bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009400bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009410bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009510bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Asv*sd00009E10bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005200bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005202bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd0000520Abc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005210bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005212bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005290bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005302bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00005310bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00009200bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00009210bc*sc*i* iwlwifi
+alias pci:v00008086d0000095Bsv*sd00009310bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000930bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000950bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000004bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000012bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000044bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000050bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000110bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000130bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000132bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000150bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd000001F0bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000250bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000810bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00000850bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00000910bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000810bc*sc*i* iwlwifi
-alias pci:v00008086d000024F6sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F5sv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000044bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000004bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00009150bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00009050bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00008150bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000930bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00000950bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001012bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001050bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd000010B0bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001110bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001130bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001132bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00001150bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00004010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00008010bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00008050bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00009132bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00008132bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00009130bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00008110bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00008130bc*sc*i* iwlwifi
-alias pci:v00008086d000024F4sv*sd0000D030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F4sv*sd0000C030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F4sv*sd00009030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F4sv*sd00008030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00009110bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00008132bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00008150bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd00009010bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00008110bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00008010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00009050bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00009110bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00009130bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00009132bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd00009150bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd0000B0B0bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd0000D0B0bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd0000D050bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd0000C010bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd0000C050bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd0000D010bc*sc*i* iwlwifi
 alias pci:v00008086d000024F3sv*sd0000C110bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd0000C010bc*sc*i* iwlwifi
-alias pci:v00008086d000024F4sv*sd00001030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd0000D010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd0000D050bc*sc*i* iwlwifi
+alias pci:v00008086d000024F3sv*sd0000D0B0bc*sc*i* iwlwifi
 alias pci:v00008086d000024F4sv*sd00000030bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001150bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000150bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001050bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000250bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000050bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001110bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001012bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000012bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd000001F0bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000110bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001132bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000132bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001130bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000130bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd000010B0bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d000024F3sv*sd00000010bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009E10bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009400bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009000bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd0000520Abc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005212bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005F10bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005490bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005290bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005590bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005190bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005090bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005420bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd0000502Abc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005020bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009410bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00009310bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009510bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00009200bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00009210bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009112bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009110bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd0000900Abc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009012bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00009010bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005202bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005102bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005002bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005200bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd0000500Abc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005000bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00001010bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005400bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005510bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005410bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005412bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005012bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005C10bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005210bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005302bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Bsv*sd00005310bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005100bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005110bc*sc*i* iwlwifi
-alias pci:v00008086d0000095Asv*sd00005010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F4sv*sd00001030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F4sv*sd00008030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F4sv*sd00009030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F4sv*sd0000C030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F4sv*sd0000D030bc*sc*i* iwlwifi
+alias pci:v00008086d000024F5sv*sd00000010bc*sc*i* iwlwifi
+alias pci:v00008086d000024F6sv*sd00000030bc*sc*i* iwlwifi
 alias pci:v00008086d000024FBsv*sd00000000bc*sc*i* iwlwifi
-alias pci:v00008086d000024FBsv*sd00002150bc*sc*i* iwlwifi
+alias pci:v00008086d000024FBsv*sd00002010bc*sc*i* iwlwifi
 alias pci:v00008086d000024FBsv*sd00002050bc*sc*i* iwlwifi
 alias pci:v00008086d000024FBsv*sd00002110bc*sc*i* iwlwifi
-alias pci:v00008086d000024FBsv*sd00002010bc*sc*i* iwlwifi
-alias pci:v00008086d00003165sv*sd00008110bc*sc*i* iwlwifi
-alias pci:v00008086d00003165sv*sd00008010bc*sc*i* iwlwifi
-alias pci:v00008086d00003166sv*sd00004210bc*sc*i* iwlwifi
-alias pci:v00008086d00003166sv*sd00004310bc*sc*i* iwlwifi
+alias pci:v00008086d000024FBsv*sd00002150bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000010bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000012bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000014bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000050bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000110bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000130bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000150bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000810bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000850bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000910bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000930bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00000950bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00001010bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00001012bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00001014bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd000010D0bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00001110bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00001130bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00003E01bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00003E02bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00008010bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00008050bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00008110bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00008130bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00009010bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00009074bc*sc*i* iwlwifi
+alias pci:v00008086d000024FDsv*sd00009110bc*sc*i* iwlwifi
+alias pci:v00008086d00002526sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d0000271Bsv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d0000271Csv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00002720sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00002723sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000000bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000020bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000090bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd000000B0bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000310bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000510bc*sc*i* iwlwifi
+alias pci:v00008086d00002725sv*sd00000A10bc*sc*i* iwlwifi
+alias pci:v00008086d000030DCsv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00003165sv*sd00004010bc*sc*i* iwlwifi
+alias pci:v00008086d00003165sv*sd00004012bc*sc*i* iwlwifi
 alias pci:v00008086d00003165sv*sd00004110bc*sc*i* iwlwifi
-alias pci:v00008086d00003165sv*sd00004510bc*sc*i* iwlwifi
 alias pci:v00008086d00003165sv*sd00004410bc*sc*i* iwlwifi
+alias pci:v00008086d00003165sv*sd00004510bc*sc*i* iwlwifi
+alias pci:v00008086d00003165sv*sd00008010bc*sc*i* iwlwifi
+alias pci:v00008086d00003165sv*sd00008110bc*sc*i* iwlwifi
+alias pci:v00008086d00003166sv*sd00004210bc*sc*i* iwlwifi
 alias pci:v00008086d00003166sv*sd00004212bc*sc*i* iwlwifi
-alias pci:v00008086d00003165sv*sd00004012bc*sc*i* iwlwifi
-alias pci:v00008086d00003165sv*sd00004010bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00001170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00001070bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008570bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008470bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00008272bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00008370bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00008270bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008062bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008060bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008172bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008072bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00008070bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00000370bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000472bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000470bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00000272bc*sc*i* iwlwifi
-alias pci:v00008086d000008B4sv*sd00000270bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000062bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000060bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000172bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000072bc*sc*i* iwlwifi
-alias pci:v00008086d000008B3sv*sd00000070bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C420bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C220bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C02Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C020bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C360bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C370bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C560bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C570bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C462bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C460bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C472bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C470bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C262bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C26Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C260bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C272bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000CC60bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000CC70bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000C270bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C760bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C770bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C162bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C062bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C160bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C06Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C060bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C072bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000C070bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004420bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004220bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000402Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004020bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00005770bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00005170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00005072bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00005070bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004360bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004370bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004560bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004570bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004A6Cbc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004A6Ebc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004A70bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000486Ebc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004870bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004462bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000446Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004460bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004472bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004470bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004262bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd0000426Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004260bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004272bc*sc*i* iwlwifi
-alias pci:v00008086d000008B2sv*sd00004270bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004162bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004062bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004160bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd0000406Abc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004060bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004C70bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004C60bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004170bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004072bc*sc*i* iwlwifi
-alias pci:v00008086d000008B1sv*sd00004070bc*sc*i* iwlwifi
+alias pci:v00008086d00003166sv*sd00004310bc*sc*i* iwlwifi
+alias pci:v00008086d000031DCsv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d000034F0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00003DF0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d000043F0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d00007A70sv*sd00000090bc*sc*i* iwlwifi
+alias pci:v00008086d00007A70sv*sd00000310bc*sc*i* iwlwifi
+alias pci:v00008086d00007A70sv*sd00000510bc*sc*i* iwlwifi
+alias pci:v00008086d00007A70sv*sd00000A10bc*sc*i* iwlwifi
+alias pci:v00008086d00007AF0sv*sd00000090bc*sc*i* iwlwifi
+alias pci:v00008086d00007AF0sv*sd00000310bc*sc*i* iwlwifi
+alias pci:v00008086d00007AF0sv*sd00000510bc*sc*i* iwlwifi
+alias pci:v00008086d00007AF0sv*sd00000A10bc*sc*i* iwlwifi
+alias pci:v00008086d00009DF0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d0000A0F0sv*sd*bc*sc*i* iwlwifi
+alias pci:v00008086d0000A370sv*sd*bc*sc*i* iwlwifi
diff --git a/debian/changelog b/debian/changelog
index d4fd01b..e6f67b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+backport-iwlwifi-dkms (8286-0ubuntu1) focal; urgency=low
+
+  * New release
+    - upstream version 8286 commit 26271a73a63d24.
+
+  * debian/patches:
+    - Update 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+    - Drop 0003-backport-apply-__copy-to-init_module-cleanup_module.patch
+    - Drop 0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
+  * Update debian/backport-iwlwifi-dkms.modaliases
+
+ -- You-Sheng Yang <[e-mail]>  Wed, 18 Dec 2019 19:43:25 +0800
+
 backport-iwlwifi-dkms (8042-0ubuntu3) focal; urgency=medium
 
   * debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
diff --git a/debian/patches/0003-backport-apply-__copy-to-init_module-cleanup_module.patch b/debian/patches/0003-backport-apply-__copy-to-init_module-cleanup_module.patch
deleted file mode 100644
index d7c145c..0000000
--- a/debian/patches/0003-backport-apply-__copy-to-init_module-cleanup_module.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: You-Sheng Yang <[e-mail]>
-Date: Mon, 15 Jul 2019 18:56:31 +0800
-Subject: backport: apply __copy to init_module/cleanup_module
-
----
- backport-include/linux/compiler.h | 4 ++++
- backport-include/linux/module.h   | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/backport-include/linux/compiler.h b/backport-include/linux/compiler.h
-index 53c069d..adc5a24 100644
---- a/backport-include/linux/compiler.h
-+++ b/backport-include/linux/compiler.h
-@@ -92,4 +92,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
- #define OPTIMIZER_HIDE_VAR(var) barrier()
- #endif
- 
-+#ifndef __copy
-+#define __copy(x)
-+#endif
-+
- #endif /* __BACKPORT_LINUX_COMPILER_H */
-diff --git a/backport-include/linux/module.h b/backport-include/linux/module.h
-index 1a2c82f..877491e 100644
---- a/backport-include/linux/module.h
-+++ b/backport-include/linux/module.h
-@@ -33,7 +33,7 @@ extern void backport_dependency_symbol(void);
- 		backport_dependency_symbol();				\
- 		return initfn();					\
- 	}								\
--	int init_module(void) __attribute__((alias("__init_backport")));\
-+	int init_module(void) __copy(__init_backport) __attribute__((alias("__init_backport")));\
- 	BACKPORT_MOD_VERSIONS
- 
- /*
-@@ -58,7 +58,7 @@ extern void backport_dependency_symbol(void);
- 		exitfn();						\
- 		rcu_barrier();						\
- 	}								\
--	void cleanup_module(void) __attribute__((alias("__exit_compat")));
-+	void cleanup_module(void) __copy(__exit_compat) __attribute__((alias("__exit_compat")));
- #endif
- 
- #if LINUX_VERSION_IS_LESS(3,3,0)
diff --git a/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch b/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
index 6151f1e..6ce71cd 100644
--- a/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+++ b/debian/patches/0006-backport-address-interface-change-in-linux-skbuff.h-.patch
@@ -1,6 +1,6 @@
-From 0ed9684f769f127c466599292fd750b07a9b36de Mon Sep 17 00:00:00 2001
+From 436871ec96c59dd238d7a603b1e140e90a232b88 Mon Sep 17 00:00:00 2001
 From: You-Sheng Yang <[e-mail]>
-Date: Tue, 10 Dec 2019 17:35:29 +0800
+Date: Wed, 18 Dec 2019 22:28:08 +0800
 Subject: [PATCH] backport: address interface change in linux/skbuff.h since
  5.3.10
 
@@ -17,87 +17,50 @@ compatibility to previous releases.
 Closes: vicamo/backport-iwlwifi-dkms#7
 Signed-off-by: You-Sheng Yang <[e-mail]>
 ---
- include/net/fq.h      | 15 +++++++++++++++
- include/net/fq_impl.h | 30 ++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+)
+ include/net/fq.h      | 9 ++++++++-
+ include/net/fq_impl.h | 9 ++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/include/net/fq.h b/include/net/fq.h
-index d126b5d20..e0de891d6 100644
+index f142ee96b..ec04ae9bc 100644
 --- a/include/net/fq.h
 +++ b/include/net/fq.h
-@@ -69,7 +69,22 @@ struct fq {
- 	struct list_head backlogs;
- 	spinlock_t lock;
- 	u32 flows_cnt;
-+#if LINUX_VERSION_IS_GEQ(5,3,10) || \
-+	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
-+	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
-+	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
-+	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
-+	(UTS_UBUNTU_RELEASE_ABI && \
-+		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
-+		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
-+	siphash_key_t perturbation;
-+#else
+@@ -73,7 +73,14 @@ struct fq {
+     LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \
+     LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \
+     LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \
+-    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0)
++    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0) || \
++    (UTS_UBUNTU_RELEASE_ABI && \
++     (((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
++       (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++        (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
++      ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
++       (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++        (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
+ 	siphash_key_t   perturbation;
+ #else
  	u32 perturbation;
-+#endif
- 	u32 limit;
- 	u32 memory_limit;
- 	u32 memory_usage;
 diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
-index be40a4b32..57effd687 100644
+index 86d5c56b2..20a1d271b 100644
 --- a/include/net/fq_impl.h
 +++ b/include/net/fq_impl.h
-@@ -108,7 +108,22 @@ begin:
- 
- static u32 fq_flow_idx(struct fq *fq, struct sk_buff *skb)
- {
-+#if LINUX_VERSION_IS_GEQ(5,3,10) || \
-+	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
-+	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
-+	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
-+	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
-+	(UTS_UBUNTU_RELEASE_ABI && \
-+		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
-+		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
-+	u32 hash = skb_get_hash_perturb(skb, &fq->perturbation);
-+#else
+@@ -112,7 +112,14 @@ static u32 fq_flow_idx(struct fq *fq, struct sk_buff *skb)
+     LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \
+     LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \
+     LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \
+-    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0)
++    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0) || \
++    (UTS_UBUNTU_RELEASE_ABI && \
++     (((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
++       (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++        (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
++      ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
++       (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
++        (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
+ 	u32 hash = skb_get_hash_perturb(skb, &fq->perturbation);
+ #else
  	u32 hash = skb_get_hash_perturb(skb, fq->perturbation);
-+#endif
- 
- 	return reciprocal_scale(hash, fq->flows_cnt);
- }
-@@ -308,7 +323,22 @@ static int fq_init(struct fq *fq, int flows_cnt)
- 	INIT_LIST_HEAD(&fq->backlogs);
- 	spin_lock_init(&fq->lock);
- 	fq->flows_cnt = max_t(u32, flows_cnt, 1);
-+#if LINUX_VERSION_IS_GEQ(5,3,10) || \
-+	LINUX_VERSION_IN_RANGE(4,19,83,5,0,0) || \
-+	LINUX_VERSION_IN_RANGE(4,14,153,4,15,0) || \
-+	LINUX_VERSION_IN_RANGE(4,9,200,4,10,0) || \
-+	LINUX_VERSION_IN_RANGE(4,4,200,4,5,0) || \
-+	(UTS_UBUNTU_RELEASE_ABI && \
-+		(((LINUX_VERSION_CODE == KERNEL_VERSION(5,0,21)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 38) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1032))) || \
-+		 ((LINUX_VERSION_CODE == KERNEL_VERSION(4,15,18)) && \
-+		  (((UTS_UBUNTU_RELEASE_ABI >= 73) && (UTS_UBUNTU_RELEASE_ABI < 1000)) || \
-+		   (UTS_UBUNTU_RELEASE_ABI >= 1066)))))
-+	get_random_bytes(&fq->perturbation, sizeof(fq->perturbation));
-+#else
- 	fq->perturbation = prandom_u32();
-+#endif
- 	fq->quantum = 300;
- 	fq->limit = 8192;
- 	fq->memory_limit = 16 << 20; /* 16 MBytes */
 -- 
 2.24.0
 
diff --git a/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch b/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
deleted file mode 100644
index ac6959a..0000000
--- a/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7295f5fb6cc8394104a8ec39de1217048ed7a6e6 Mon Sep 17 00:00:00 2001
-From: You-Sheng Yang <[e-mail]>
-Date: Fri, 13 Dec 2019 08:54:42 +0000
-Subject: [PATCH] backport: don't include linux/pci-aspm.h on kernel >= v5.4-rc1
-
-linux/pci-aspm.h has been merged into linux/pci.h in commit 7ce2e76a0420
-("PCI: Move ASPM declarations to linux/pci.h"), and mainline iwlwifi
-removed such inclusion in commit 2b2654b8922a ("iwlwifi: Remove
-unnecessary include of <linux/pci-aspm.h>").
-
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-index 495ff9418..0fa34a93a 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -62,7 +62,9 @@
-  *
-  *****************************************************************************/
- #include <linux/pci.h>
-+#if LINUX_VERSION_IS_LESS(5,4,0)
- #include <linux/pci-aspm.h>
-+#endif
- #include <linux/interrupt.h>
- #include <linux/debugfs.h>
- #include <linux/sched.h>
--- 
-2.24.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 9c971ba..f4462c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 0001-keep-zconf-in-make-clean.patch
 0002-fix-format-overflow-compile-error-in-kconf-confdata..patch
-0003-backport-apply-__copy-to-init_module-cleanup_module.patch
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
-0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
diff --git a/debian/tests/check-modaliases b/debian/tests/check-modaliases
deleted file mode 100755
index 351f5c0..0000000
--- a/debian/tests/check-modaliases
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Generate and check module aliases.
-# Author: You-Sheng Yang <[e-mail]>
-# Copyright: (C) 2019 Canonical Ltd.
-
-set -eu
-
-run_pkg() {
-    pkg="$1"
-
-    echo "I: Testing binary package $pkg"
-
-    if ! dkms_conf=$(dpkg -L $pkg | grep 'dkms.conf$'); then
-        echo "I: Package $pkg has no dkms.conf, skipping"
-        return
-    fi
-
-    modaliases=$(dpkg-query --show -f '${Modaliases}' $pkg)
-    if test -z "$modaliases"; then
-        echo "I: Package $pkg has no modaliases, skipping"
-        return
-    fi
-
-    expected=$(mktemp --suffix=.expected)
-    echo "$modaliases" | \
-        sed -e 's/\([^(]\+\)(\([^)]\+\))\(, \)\?/\1 \2\n/g' | \
-        sed -e '/,/bx' -e 's/\([^ ]\+\) \([^ ]\+\)/alias \2 \1/' -e 'bend' -e ':x' -e 's/\([^ ]\+\) \([^ ]\+\), \(.*\)/alias \2 \1\n\1 \3/' -e 'P;D' -e ':end' | \
-        grep -v '^$' | sort > $expected
-
-    name=$(bash -c ". $dkms_conf; echo \$PACKAGE_NAME" 2>/dev/null)
-    version=$(bash -c ". $dkms_conf; echo \$PACKAGE_VERSION" 2>/dev/null)
-    for build in $(find /var/lib/dkms/$name/$version -mindepth 3 -maxdepth 3 -type d -name module); do
-        tmpfile=$(mktemp --suffix=.generated)
-        for module in $(find $build -type f -name \*.ko | sort); do
-            /sbin/modinfo ${module} | perl -nae "print \"alias \$1 $(basename --suffix=.ko ${module})\\n\" if /^alias:\\s+(.*)\$/";
-        done | sort > $tmpfile;
-        diff -Nu "$expected" "$tmpfile";
-        rm -f $tmpfile
-    done
-
-    rm -f $expected
-}
-
-for pkg in $(awk '/^Package:/ { print $2 }' debian/control); do
-    # package might be arch: restriction or udeb etc.
-    if ! apt-cache show $pkg >/dev/null 2>&1; then
-        echo "I: Skipping unavailable package $pkg"
-        continue
-    fi
-    run_pkg $pkg
-done
diff --git a/debian/tests/control b/debian/tests/control
index 1dd23c0..a88cf5e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,11 +3,5 @@ Restrictions:
  needs-root,
  allow-stderr,
 Depends:
- backport-iwlwifi-dkms,
- linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers,
-
-Tests: check-modaliases
-Depends:
- backport-iwlwifi-dkms,
- kmod,
+ gcc,
  linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers,
diff --git a/debian/tests/dkms-autopkgtest b/debian/tests/dkms-autopkgtest
index c6b702b..f766e18 100755
--- a/debian/tests/dkms-autopkgtest
+++ b/debian/tests/dkms-autopkgtest
@@ -10,11 +10,11 @@ run_pkg() {
     echo "I: Installing binary package $pkg"
     export DEBIAN_FRONTEND=noninteractive
     RC=0
-    apt-get install -yq $pkg </dev/null || RC=$?
+    (set +e; apt-get install -yq $pkg </dev/null) || RC=$?
 
     # collect build logs as artifacts
     if [ -d /var/lib/dkms ]; then
-        (cd /var/lib/dkms; find -name "make.log" -print0 | xargs -0 tar c) > "$ADT_ARTIFACTS/$pkg-make-logs.tar"
+        (cd /var/lib/dkms; find -name "make.log" -print0 | xargs -0 tar c) > "$AUTOPKGTEST_ARTIFACTS/$pkg-make-logs.tar"
     fi
 
     if [ "$RC" -ne 0 ]; then
@@ -29,6 +29,7 @@ run_pkg() {
         return
     fi
     dkms_pkg=$(bash -c ". $dkms_conf; echo \$PACKAGE_NAME" 2>/dev/null)
+    dkms_version=$(bash -c ". $dkms_conf; echo \$PACKAGE_VERSION" 2>/dev/null)
 
     echo "I: Testing if $dkms_pkg modules are correctly installed"
     dkmsstatus="$(dkms status $dkms_pkg)"
@@ -43,6 +44,32 @@ run_pkg() {
         exit 1
     fi
 
+    modaliases=$(dpkg-query --show -f '${Modaliases}' $pkg)
+    if test -n "$modaliases"; then
+        echo "I: Checking modaliases in debian/control ..."
+
+        modaliases_dpkg=$AUTOPKGTEST_ARTIFACTS/$pkg.modaliases.dpkg
+        echo "$modaliases" | \
+            sed -e 's/\([^(]\+\)(\([^)]\+\))\(, \)\?/\1 \2\n/g' | \
+            sed -e '/,/bx' -e 's/\([^ ]\+\) \([^ ]\+\)/alias \2 \1/' \
+                -e 'bend' -e ':x' -e 's/\([^ ]\+\) \([^ ]\+\), \(.*\)/alias \2 \1\n\1 \3/' -e 'P;D' -e ':end' | \
+            grep -v '^$' | \
+            sort > "$modaliases_dpkg"
+
+        diff -Nu debian/$pkg.modaliases "$modaliases_dpkg";
+    fi
+
+    modaliases_modinfo=$AUTOPKGTEST_ARTIFACTS/$pkg.modaliases.modinfo
+    for build in $(find /var/lib/dkms/$dkms_pkg/$dkms_version -mindepth 3 -maxdepth 3 -type d -name module); do
+        echo "I: Checking modaliases for $build ..."
+
+        for module in $(find $build -type f -name \*.ko | sort); do
+            /sbin/modinfo ${module} | perl -nae "print \"alias \$1 $(basename --suffix=.ko ${module})\\n\" if /^alias:\\s+(.*)\$/";
+        done | sort > "$modaliases_modinfo";
+
+        diff -Nu debian/$pkg.modaliases "$modaliases_modinfo";
+    done
+
     # skip modprobing for now; this fails too often (needs particular
     # hardware/firmware/etc)
     # for mod in $(awk -F '"' '/^BUILT_MODULE_NAME/ {print $2}' $dkms_conf); do
@@ -56,9 +83,6 @@ run_pkg() {
     # done
 }
 
-# Try and remove dkms to spot packages which miss a dkms dependency
-dpkg --remove dkms || true
-
 for pkg in $(awk '/^Package:/ { print $2 }' debian/control); do
     # package might be arch: restriction or udeb etc.
     if ! apt-cache show $pkg >/dev/null 2>&1; then
@@ -67,3 +91,6 @@ for pkg in $(awk '/^Package:/ { print $2 }' debian/control); do
     fi
     run_pkg $pkg
 done
+
+# Try and remove dkms to spot packages which miss a dkms dependency
+dpkg --remove dkms || true
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 102a67a..ebf51fe 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -2,7 +2,7 @@
 config IWLWIFI
 	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "
 	depends on m
-	depends on PCI && HAS_IOMEM && CFG80211
+	depends on ((PCI && HAS_IOMEM) || VIRTIO) && CFG80211
 	depends on FW_LOADER
 	---help---
 	  Select to build the driver supporting the:
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
index 434c115..5413dbf 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
@@ -74,6 +74,19 @@ config IWLMVM_VENDOR_CMDS
 	  This option mostly exists for non-upstream tagging, so best
 	  leave it set to Y.
 
+config IWLMVM_VENDOR_TCM_EVENTS
+	bool "enable TCM vendor events"
+	depends on IWLMVM_VENDOR_CMDS
+	default y
+	help
+	  This option enables vendor TCM events to userspace that can
+	  be used to adjust certain parameters depending on the
+	  traffic conditions.  These events can become rather noisy
+	  with standard wpa_supplicant, since it prints out 3 debug
+	  messages every time the event is received (as an unknown
+	  event).  When used with standard wpa_supplicant, it is
+	  recommended to disable this option.
+
 config IWLMVM_TDLS_PEER_CACHE
 	bool "enable TDLS peer caching and traffic monitoring"
 	depends on IWLMVM_VENDOR_CMDS
diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile
index 5d56d23..d92641c 100644
--- a/drivers/net/wireless/intel/iwlwifi/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/Makefile
@@ -9,22 +9,26 @@ iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o
 iwlwifi-objs		+= iwl-dbg-tlv.o
 iwlwifi-objs		+= iwl-trans.o
 
-iwlwifi-objs		+= fw/notif-wait.o
-iwlwifi-$(CPTCFG_IWLMVM)	+= fw/paging.o fw/smem.o fw/init.o fw/dbg.o
+iwlwifi-objs		+= fw/img.o fw/notif-wait.o
+iwlwifi-objs		+= fw/dbg.o
+iwlwifi-$(CPTCFG_IWLMVM)	+= fw/paging.o fw/smem.o fw/init.o
 iwlwifi-$(CPTCFG_IWLXVT)	+= fw/init.o
 iwlwifi-$(CPTCFG_IWLWIFI_DEBUGFS) += fw/debugfs.o
 
 iwlwifi-$(CONFIG_ACPI)	+= fw/acpi.o
 
 # Bus
-iwlwifi-objs			+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
-iwlwifi-objs			+= pcie/ctxt-info.o pcie/ctxt-info-gen3.o pcie/trans-gen2.o pcie/tx-gen2.o
+iwlwifi-$(CONFIG_PCI) += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
+iwlwifi-$(CONFIG_PCI) += pcie/ctxt-info.o pcie/ctxt-info-gen3.o pcie/trans-gen2.o pcie/tx-gen2.o
+
 iwlwifi-$(CPTCFG_IWLMVM) += cfg/7000.o cfg/8000.o
 iwlwifi-$(CPTCFG_IWLMVM) += cfg/9000.o cfg/22000.o
 
 iwlwifi-$(CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES) += iwl-dbg-cfg.o
 
+
 iwlwifi-objs += $(iwlwifi-m)
+iwlwifi-objs += $(iwlwifi-y)
 
 iwlwifi-$(CPTCFG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 iwlwifi-$(CPTCFG_IWLWIFI_DEVICE_TESTMODE) += iwl-tm-gnl.o iwl-dnt-cfg.o iwl-dnt-dispatch.o
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 74e0429..3790c0e 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -57,7 +57,7 @@
 #include "iwl-prph.h"
 
 /* Highest firmware API version supported */
-#define IWL_22000_UCODE_API_MAX	52
+#define IWL_22000_UCODE_API_MAX	54
 
 /* Lowest firmware API version supported */
 #define IWL_22000_UCODE_API_MIN	39
@@ -76,10 +76,8 @@
 #define IWL_22000_JF_FW_PRE		"iwlwifi-Qu-a0-jf-b0-"
 #define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"
 #define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"
-#define IWL_22000_HR_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"
 #define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"
 #define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"
-#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"
 #define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0-"
 #define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"
 #define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0-"
@@ -93,19 +91,16 @@
 #define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"
 #define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"
 #define IWL_22000_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"
+#define IWL_22000_SOSNJ_A_GF4_A_FW_PRE  "iwlwifi-SoSnj-a0-gf4-a0-"
 
 #define IWL_22000_HR_MODULE_FIRMWARE(api) \
 	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_JF_MODULE_FIRMWARE(api) \
 	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"
-#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \
-	IWL_22000_HR_A_F0_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \
 	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\
 	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"
-#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \
-	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"
 #define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
 	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
@@ -139,7 +134,7 @@ static const struct iwl_base_params iwl_22000_base_params = {
 	.pcie_l1_allowed = true,
 };
 
-static const struct iwl_base_params iwl_22560_base_params = {
+static const struct iwl_base_params iwl_ax210_base_params = {
 	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
 	.num_of_queues = 512,
 	.max_tfd_queue_size = 65536,
@@ -200,7 +195,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
 	IWL_DEVICE_22000_COMMON,					\
 	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\
 	.trans.base_params = &iwl_22000_base_params,			\
-	.trans.csr = &iwl_csr_v1,					\
 	.gp2_reg_addr = 0xa02c68,					\
 	.mon_dram_regs = {						\
 		.write_ptr = {						\
@@ -213,28 +207,11 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
 		},							\
 	}
 
-#define IWL_DEVICE_22560						\
-	IWL_DEVICE_22000_COMMON,					\
-	.trans.device_family = IWL_DEVICE_FAMILY_22560,			\
-	.trans.base_params = &iwl_22560_base_params,			\
-	.trans.csr = &iwl_csr_v2,					\
-	.mon_dram_regs = {						\
-		.write_ptr = {						\
-			.addr = MON_BUFF_WRPTR_VER2,			\
-			.mask = 0xffffffff,				\
-		},							\
-		.cycle_cnt = {						\
-			.addr = MON_BUFF_CYCLE_CNT_VER2,		\
-			.mask = 0xffffffff,				\
-		},							\
-	}
-
 #define IWL_DEVICE_AX210						\
 	IWL_DEVICE_22000_COMMON,					\
 	.trans.umac_prph_offset = 0x300000,				\
 	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\
-	.trans.base_params = &iwl_22560_base_params,			\
-	.trans.csr = &iwl_csr_v1,					\
+	.trans.base_params = &iwl_ax210_base_params,			\
 	.min_txq_size = 128,						\
 	.gp2_reg_addr = 0xd02c68,					\
 	.min_256_ba_txq_size = 512,					\
@@ -253,65 +230,68 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
 		},							\
 	}
 
-const struct iwl_cfg iwl22000_2ac_cfg_hr = {
-	.name = "Intel(R) Dual Band Wireless AC 22000",
-	.fw_name_pre = IWL_22000_HR_FW_PRE,
-	IWL_DEVICE_22500,
+const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {
+	.mq_rx_supported = true,
+	.use_tfh = true,
+	.rf_id = true,
+	.gen2 = true,
+	.device_family = IWL_DEVICE_FAMILY_22000,
+	.base_params = &iwl_22000_base_params,
+	.integrated = true,
+	.xtal_latency = 5000,
 };
 
-const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb = {
-	.name = "Intel(R) Dual Band Wireless AC 22000",
-	.fw_name_pre = IWL_22000_HR_CDB_FW_PRE,
-	IWL_DEVICE_22500,
-	.cdb = true,
+const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {
+	.mq_rx_supported = true,
+	.use_tfh = true,
+	.rf_id = true,
+	.gen2 = true,
+	.device_family = IWL_DEVICE_FAMILY_22000,
+	.base_params = &iwl_22000_base_params,
 };
 
-const struct iwl_cfg iwl22000_2ac_cfg_jf = {
-	.name = "Intel(R) Dual Band Wireless AC 22000",
-	.fw_name_pre = IWL_22000_JF_FW_PRE,
-	IWL_DEVICE_22500,
+const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {
+	.mq_rx_supported = true,
+	.use_tfh = true,
+	.rf_id = true,
+	.gen2 = true,
+	.device_family = IWL_DEVICE_FAMILY_22000,
+	.base_params = &iwl_22000_base_params,
+	.integrated = true,
+	.xtal_latency = 12000,
+	.low_latency_xtal = true,
 };
 
-const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
-	.name = "Intel(R) Wi-Fi 6 AX101",
-	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.tx_with_siso_diversity = true,
-};
+/*
+ * If the device doesn't support HE, no need to have that many buffers.
+ * 22000 devices can split multiple frames into a single RB, so fewer are
+ * needed; AX210 cannot (but use smaller RBs by default) - these sizes
+ * were picked according to 8 MSDUs inside 256 A-MSDUs in an A-MPDU, with
+ * additional overhead to account for processing time.
+ */
+#define IWL_NUM_RBDS_NON_HE		512
+#define IWL_NUM_RBDS_22000_HE		2048
+#define IWL_NUM_RBDS_AX210_HE		4096
 
-const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
-	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
-	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
+/*
+ * All JF radio modules are part of the 9000 series, but the MAC part
+ * looks more like 22000.  That's why this device is here, but called
+ * 9560 nevertheless.
+ */
+const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = {
+	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
 	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
-const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = {
-	.name = "Intel(R) Wi-Fi 6 AX101",
-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg = {
+	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
 	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
-const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {
-	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
-	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = {
+	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -319,11 +299,11 @@ const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
-const struct iwl_cfg iwl_ax101_cfg_quz_hr = {
-	.name = "Intel(R) Wi-Fi 6 AX101",
-	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
+const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = {
+	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -331,60 +311,29 @@ const struct iwl_cfg iwl_ax101_cfg_quz_hr = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
-const struct iwl_cfg iwl_ax201_cfg_quz_hr = {
-		.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
-		.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
-		IWL_DEVICE_22500,
-		/*
-         * This device doesn't support receiving BlockAck with a large bitmap
-         * so we need to restrict the size of transmitted aggregation to the
-         * HT size; mac80211 would otherwise pick the HE max (256) by default.
-         */
-		.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {
+	.device_family = IWL_DEVICE_FAMILY_22000,
+	.base_params = &iwl_22000_base_params,
+	.mq_rx_supported = true,
+	.use_tfh = true,
+	.rf_id = true,
+	.gen2 = true,
+	.bisr_workaround = 1,
 };
 
-const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = {
-		.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",
-		.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
-		IWL_DEVICE_22500,
-		/*
-         * This device doesn't support receiving BlockAck with a large bitmap
-         * so we need to restrict the size of transmitted aggregation to the
-         * HT size; mac80211 would otherwise pick the HE max (256) by default.
-         */
-		.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
+const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";
 
-const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = {
-		.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",
-		.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
-		IWL_DEVICE_22500,
-		/*
-         * This device doesn't support receiving BlockAck with a large bitmap
-         * so we need to restrict the size of transmitted aggregation to the
-         * HT size; mac80211 would otherwise pick the HE max (256) by default.
-         */
-		.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
+const char iwl_ax200_killer_1650w_name[] =
+	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";
+const char iwl_ax200_killer_1650x_name[] =
+	"Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)";
 
-const struct iwl_cfg iwl_ax200_cfg_cc = {
-	.name = "Intel(R) Wi-Fi 6 AX200 160MHz",
-	.fw_name_pre = IWL_CC_A_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.trans.bisr_workaround = 1,
-};
-
-const struct iwl_cfg killer1650x_2ax_cfg = {
-	.name = "Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)",
-	.fw_name_pre = IWL_CC_A_FW_PRE,
+const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
+	.name = "Intel(R) Wi-Fi 6 AX101",
+	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -392,12 +341,13 @@ const struct iwl_cfg killer1650x_2ax_cfg = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.trans.bisr_workaround = 1,
+	.tx_with_siso_diversity = true,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg killer1650w_2ax_cfg = {
-	.name = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)",
-	.fw_name_pre = IWL_CC_A_FW_PRE,
+const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
+	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
+	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -405,65 +355,12 @@ const struct iwl_cfg killer1650w_2ax_cfg = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.trans.bisr_workaround = 1,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-/*
- * All JF radio modules are part of the 9000 series, but the MAC part
- * looks more like 22000.  That's why this device is here, but called
- * 9560 nevertheless.
- */
-const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9461",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9462",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9560",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9461",
-	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9462",
-	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9560",
-	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = {
+	.name = "Intel(R) Wi-Fi 6 AX101",
+	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -471,11 +368,12 @@ const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {
+	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
+	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -483,13 +381,12 @@ const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax101_cfg_quz_hr = {
+	.name = "Intel(R) Wi-Fi 6 AX101",
+	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -497,55 +394,50 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9461",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax201_cfg_quz_hr = {
+	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
+	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9462",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = {
+	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",
+	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = {
-	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = {
+	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",
+	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
-const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = {
-	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,
+const struct iwl_cfg iwl_ax200_cfg_cc = {
+	.fw_name_pre = IWL_CC_A_FW_PRE,
 	IWL_DEVICE_22500,
 	/*
 	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -553,20 +445,7 @@ const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {
-	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-};
-
-const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = {
-	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {
@@ -579,6 +458,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {
@@ -591,6 +471,7 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {
@@ -603,6 +484,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {
@@ -615,42 +497,7 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
-const struct iwl_cfg iwl22000_2ax_cfg_jf = {
-	.name = "Intel(R) Dual Band Wireless AX 22000",
-	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
-const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0 = {
-	.name = "Intel(R) Dual Band Wireless AX 22000",
-	.fw_name_pre = IWL_22000_HR_A_F0_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
-const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0 = {
-	.name = "Intel(R) Dual Band Wireless AX 22000",
-	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
@@ -663,43 +510,21 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
 	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
 	 */
 	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
-const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {
-	.name = "Intel(R) Dual Band Wireless AX 22000",
-	.fw_name_pre = IWL_22000_HR_A0_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-};
-
-const struct iwl_cfg iwl_ax201_cfg_qnj_b0_gftc_a0 = {
-	.name = "Intel(R) Wi-fi 6 AX201 GF TC",
-	.fw_name_pre = IWL_QNJ_B_GFTC_A_FW_PRE,
-	IWL_DEVICE_22500,
-	/*
-	 * This device doesn't support receiving BlockAck with a large bitmap
-	 * so we need to restrict the size of transmitted aggregation to the
-	 * HT size; mac80211 would otherwise pick the HE max (256) by default.
-	 */
-	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
-	.uhb_supported = true
+	.num_rbds = IWL_NUM_RBDS_22000_HE,
 };
 
 const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {
 	.name = "Intel(R) Wireless-AC 9560 160MHz",
 	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
 	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_NON_HE,
 };
 
 const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {
 	.name = "Intel(R) Wi-Fi 7 AX210 160MHz",
 	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,
 	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_AX210_HE,
 };
 
 const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {
@@ -707,6 +532,7 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {
 	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,
 	.uhb_supported = true,
 	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_AX210_HE,
 };
 
 const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
@@ -714,19 +540,28 @@ const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
 	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,
 	.uhb_supported = true,
 	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_AX210_HE,
 };
 
 const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = {
 	.name = "Intel(R) Wi-Fi 7 AX411 160MHz",
 	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,
+	.uhb_supported = true,
+	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_AX210_HE,
+};
+
+const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {
+	.name = "Intel(R) Wi-Fi 7 AX411 160MHz",
+	.fw_name_pre = IWL_22000_SOSNJ_A_GF4_A_FW_PRE,
+	.uhb_supported = true,
 	IWL_DEVICE_AX210,
+	.num_rbds = IWL_NUM_RBDS_AX210_HE,
 };
 
 MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
index deb520a..b72993e 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
@@ -154,8 +154,7 @@ static const struct iwl_ht_params iwl7000_ht_params = {
 	.nvm_hw_section_num = 0,				\
 	.non_shared_ant = ANT_A,				\
 	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
-	.dccm_offset = IWL7000_DCCM_OFFSET,			\
-	.trans.csr = &iwl_csr_v1
+	.dccm_offset = IWL7000_DCCM_OFFSET
 
 #define IWL_DEVICE_7000						\
 	IWL_DEVICE_7000_COMMON,					\
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
index b3cc477..280d84f 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
@@ -151,8 +151,7 @@ static const struct iwl_tt_params iwl8000_tt_params = {
 	.apmg_not_supported = true,					\
 	.nvm_type = IWL_NVM_EXT,					\
 	.dbgc_supported = true,						\
-	.min_umac_error_event_table = 0x800000,				\
-	.trans.csr = &iwl_csr_v1
+	.min_umac_error_event_table = 0x800000
 
 #define IWL_DEVICE_8000							\
 	IWL_DEVICE_8000_COMMON,						\
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index e9155b9..f84b8e5 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -123,8 +123,6 @@ static const struct iwl_tt_params iwl9000_tt_params = {
 #define IWL_DEVICE_9000							\
 	.ucode_api_max = IWL9000_UCODE_API_MAX,				\
 	.ucode_api_min = IWL9000_UCODE_API_MIN,				\
-	.trans.device_family = IWL_DEVICE_FAMILY_9000,			\
-	.trans.base_params = &iwl9000_base_params,			\
 	.led_mode = IWL_LED_RF_STATE,					\
 	.nvm_hw_section_num = 10,					\
 	.non_shared_ant = ANT_B,					\
@@ -137,14 +135,12 @@ static const struct iwl_tt_params iwl9000_tt_params = {
 	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\
 	.thermal_params = &iwl9000_tt_params,				\
 	.apmg_not_supported = true,					\
-	.trans.mq_rx_supported = true,					\
+	.num_rbds = 512,						\
 	.vht_mu_mimo_supported = true,					\
 	.mac_addr_from_csr = true,					\
-	.trans.rf_id = true,						\
 	.nvm_type = IWL_NVM_EXT,					\
 	.dbgc_supported = true,						\
 	.min_umac_error_event_table = 0x800000,				\
-	.trans.csr = &iwl_csr_v1,					\
 	.d3_debug_data_base_addr = 0x401000,				\
 	.d3_debug_data_length = 92 * 1024,				\
 	.ht_params = &iwl9000_ht_params,				\
@@ -171,172 +167,61 @@ static const struct iwl_tt_params iwl9000_tt_params = {
 		},							\
 	}
 
-
-const struct iwl_cfg iwl9160_2ac_cfg = {
-	.name = "Intel(R) Dual Band Wireless AC 9160",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9260_2ac_cfg = {
-	.name = "Intel(R) Dual Band Wireless AC 9260",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9260_2ac_160_cfg = {
-	.name = "Intel(R) Wireless-AC 9260 160MHz",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9260_killer_2ac_cfg = {
-	.name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9270_2ac_cfg = {
-	.name = "Intel(R) Dual Band Wireless AC 9270",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9460_2ac_cfg = {
-	.name = "Intel(R) Dual Band Wireless AC 9460",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
+const struct iwl_cfg_trans_params iwl9000_trans_cfg = {
+	.device_family = IWL_DEVICE_FAMILY_9000,
+	.base_params = &iwl9000_base_params,
+	.mq_rx_supported = true,
+	.rf_id = true,
 };
 
-const struct iwl_cfg iwl9460_2ac_cfg_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9460",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9461_2ac_cfg_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9461",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
+const struct iwl_cfg_trans_params iwl9560_trans_cfg = {
+	.device_family = IWL_DEVICE_FAMILY_9000,
+	.base_params = &iwl9000_base_params,
+	.mq_rx_supported = true,
+	.rf_id = true,
 	.integrated = true,
-	.soc_latency = 5000,
+	.xtal_latency = 5000,
 };
 
-const struct iwl_cfg iwl9462_2ac_cfg_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9462",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
+const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = {
+	.device_family = IWL_DEVICE_FAMILY_9000,
+	.base_params = &iwl9000_base_params,
+	.mq_rx_supported = true,
+	.rf_id = true,
 	.integrated = true,
-	.soc_latency = 5000,
+	.xtal_latency = 5000,
+	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
 };
 
-const struct iwl_cfg iwl9560_2ac_cfg = {
-	.name = "Intel(R) Dual Band Wireless AC 9560",
-	.fw_name_pre = IWL9260_FW_PRE,
-	IWL_DEVICE_9000,
-};
+const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";
+const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";
+const char iwl9260_1_name[] = "Intel(R) Wireless-AC 9260-1";
+const char iwl9270_name[] = "Intel(R) Wireless-AC 9270";
+const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";
+const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";
+const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";
+const char iwl9162_160_name[] = "Intel(R) Wireless-AC 9162 160MHz";
+const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";
+const char iwl9270_160_name[] = "Intel(R) Wireless-AC 9270 160MHz";
+const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";
+const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";
+const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";
+
+const char iwl9260_killer_1550_name[] =
+	"Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)";
+const char iwl9560_killer_1550i_name[] =
+	"Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)";
+const char iwl9560_killer_1550s_name[] =
+	"Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";
 
-const struct iwl_cfg iwl9560_2ac_160_cfg = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
+const struct iwl_cfg iwl9260_2ac_cfg = {
 	.fw_name_pre = IWL9260_FW_PRE,
 	IWL_DEVICE_9000,
 };
 
 const struct iwl_cfg iwl9560_2ac_cfg_soc = {
-	.name = "Intel(R) Dual Band Wireless AC 9560",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9560_2ac_160_cfg_soc = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {
-	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
 	.fw_name_pre = IWL9000_FW_PRE,
 	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = {
-	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {
-	.name = "Intel(R) Dual Band Wireless AC 9460",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {
-	.name = "Intel(R) Dual Band Wireless AC 9461",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9462_2ac_cfg_shared_clk = {
-	.name = "Intel(R) Dual Band Wireless AC 9462",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {
-	.name = "Intel(R) Dual Band Wireless AC 9560",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk = {
-	.name = "Intel(R) Wireless-AC 9560 160MHz",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {
-	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
-const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = {
-	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
-	.fw_name_pre = IWL9000_FW_PRE,
-	IWL_DEVICE_9000,
-	.integrated = true,
-	.soc_latency = 5000,
-	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
 };
 
 MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
index 7573af2..bdc382a 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
@@ -61,6 +61,7 @@
 #include "iwl-drv.h"
 #include "iwl-debug.h"
 #include "acpi.h"
+#include "fw/runtime.h"
 
 void *iwl_acpi_get_object(struct device *dev, acpi_string method)
 {
@@ -162,12 +163,13 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc)
 
 	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,
 					 &tbl_rev);
-	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+	if (IS_ERR(wifi_pkg)) {
 		ret = PTR_ERR(wifi_pkg);
 		goto out_free;
 	}
 
-	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {
+	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER ||
+	    tbl_rev != 0) {
 		ret = -EINVAL;
 		goto out_free;
 	}
@@ -224,12 +226,13 @@ int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
 
 	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,
 					 &tbl_rev);
-	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+	if (IS_ERR(wifi_pkg)) {
 		ret = PTR_ERR(wifi_pkg);
 		goto out_free;
 	}
 
-	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {
+	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER ||
+	    tbl_rev != 0) {
 		ret = -EINVAL;
 		goto out_free;
 	}
@@ -243,3 +246,293 @@ out_free:
 	return ret;
 }
 IWL_EXPORT_SYMBOL(iwl_acpi_get_eckv);
+
+int iwl_sar_set_profile(union acpi_object *table,
+			struct iwl_sar_profile *profile,
+			bool enabled)
+{
+	int i;
+
+	profile->enabled = enabled;
+
+	for (i = 0; i < ACPI_SAR_TABLE_SIZE; i++) {
+		if (table[i].type != ACPI_TYPE_INTEGER ||
+		    table[i].integer.value > U8_MAX)
+			return -EINVAL;
+
+		profile->table[i] = table[i].integer.value;
+	}
+
+	return 0;
+}
+IWL_EXPORT_SYMBOL(iwl_sar_set_profile);
+
+int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,
+			   __le16 per_chain_restriction[][IWL_NUM_SUB_BANDS],
+			   int prof_a, int prof_b)
+{
+	int i, j, idx;
+	int profs[ACPI_SAR_NUM_CHAIN_LIMITS] = { prof_a, prof_b };
+
+	BUILD_BUG_ON(ACPI_SAR_NUM_CHAIN_LIMITS < 2);
+	BUILD_BUG_ON(ACPI_SAR_NUM_CHAIN_LIMITS * ACPI_SAR_NUM_SUB_BANDS !=
+		     ACPI_SAR_TABLE_SIZE);
+
+	for (i = 0; i < ACPI_SAR_NUM_CHAIN_LIMITS; i++) {
+		struct iwl_sar_profile *prof;
+
+		/* don't allow SAR to be disabled (profile 0 means disable) */
+		if (profs[i] == 0)
+			return -EPERM;
+
+		/* we are off by one, so allow up to ACPI_SAR_PROFILE_NUM */
+		if (profs[i] > ACPI_SAR_PROFILE_NUM)
+			return -EINVAL;
+
+		/* profiles go from 1 to 4, so decrement to access the array */
+		prof = &fwrt->sar_profiles[profs[i] - 1];
+
+		/* if the profile is disabled, do nothing */
+		if (!prof->enabled) {
+			IWL_DEBUG_RADIO(fwrt, "SAR profile %d is disabled.\n",
+					profs[i]);
+			/* if one of the profiles is disabled, we fail all */
+			return -ENOENT;
+		}
+		IWL_DEBUG_INFO(fwrt,
+			       "SAR EWRD: chain %d profile index %d\n",
+			       i, profs[i]);
+		IWL_DEBUG_RADIO(fwrt, "  Chain[%d]:\n", i);
+		for (j = 0; j < ACPI_SAR_NUM_SUB_BANDS; j++) {
+			idx = (i * ACPI_SAR_NUM_SUB_BANDS) + j;
+			per_chain_restriction[i][j] =
+				cpu_to_le16(prof->table[idx]);
+			IWL_DEBUG_RADIO(fwrt, "    Band[%d] = %d * .125dBm\n",
+					j, prof->table[idx]);
+		}
+	}
+
+#ifdef CPTCFG_IWLMVM_VENDOR_CMDS
+	fwrt->sar_chain_a_profile = prof_a;
+	fwrt->sar_chain_b_profile = prof_b;
+#endif
+	return 0;
+}
+IWL_EXPORT_SYMBOL(iwl_sar_select_profile);
+
+int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt)
+{
+	union acpi_object *wifi_pkg, *table, *data;
+	bool enabled;
+	int ret, tbl_rev;
+
+	data = iwl_acpi_get_object(fwrt->dev, ACPI_WRDS_METHOD);
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,
+					 ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev);
+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+		ret = PTR_ERR(wifi_pkg);
+		goto out_free;
+	}
+
+	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {
+		ret = -EINVAL;
+		goto out_free;
+	}
+
+	enabled = !!(wifi_pkg->package.elements[1].integer.value);
+
+	/* position of the actual table */
+	table = &wifi_pkg->package.elements[2];
+
+	/* The profile from WRDS is officially profile 1, but goes
+	 * into sar_profiles[0] (because we don't have a profile 0).
+	 */
+	ret = iwl_sar_set_profile(table, &fwrt->sar_profiles[0], enabled);
+out_free:
+	kfree(data);
+	return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_sar_get_wrds_table);
+
+int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)
+{
+	union acpi_object *wifi_pkg, *data;
+	bool enabled;
+	int i, n_profiles, tbl_rev;
+	int  ret = 0;
+
+	data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD);
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,
+					 ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev);
+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+		ret = PTR_ERR(wifi_pkg);
+		goto out_free;
+	}
+
+	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER ||
+	    wifi_pkg->package.elements[2].type != ACPI_TYPE_INTEGER) {
+		ret = -EINVAL;
+		goto out_free;
+	}
+
+	enabled = !!(wifi_pkg->package.elements[1].integer.value);
+	n_profiles = wifi_pkg->package.elements[2].integer.value;
+
+	/*
+	 * Check the validity of n_profiles.  The EWRD profiles start
+	 * from index 1, so the maximum value allowed here is
+	 * ACPI_SAR_PROFILES_NUM - 1.
+	 */
+	if (n_profiles <= 0 || n_profiles >= ACPI_SAR_PROFILE_NUM) {
+		ret = -EINVAL;
+		goto out_free;
+	}
+
+	for (i = 0; i < n_profiles; i++) {
+		/* the tables start at element 3 */
+		int pos = 3;
+
+		/* The EWRD profiles officially go from 2 to 4, but we
+		 * save them in sar_profiles[1-3] (because we don't
+		 * have profile 0).  So in the array we start from 1.
+		 */
+		ret = iwl_sar_set_profile(&wifi_pkg->package.elements[pos],
+					  &fwrt->sar_profiles[i + 1],
+					  enabled);
+		if (ret < 0)
+			break;
+
+		/* go to the next table */
+		pos += ACPI_SAR_TABLE_SIZE;
+	}
+
+out_free:
+	kfree(data);
+	return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_sar_get_ewrd_table);
+
+int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt)
+{
+	union acpi_object *wifi_pkg, *data;
+	int i, j, ret, tbl_rev;
+	int idx = 1;
+
+	data = iwl_acpi_get_object(fwrt->dev, ACPI_WGDS_METHOD);
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,
+					 ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev);
+	if (IS_ERR(wifi_pkg) || tbl_rev > 1) {
+		ret = PTR_ERR(wifi_pkg);
+		goto out_free;
+	}
+
+	fwrt->geo_rev = tbl_rev;
+	for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) {
+		for (j = 0; j < ACPI_GEO_TABLE_SIZE; j++) {
+			union acpi_object *entry;
+
+			entry = &wifi_pkg->package.elements[idx++];
+			if (entry->type != ACPI_TYPE_INTEGER ||
+			    entry->integer.value > U8_MAX) {
+				ret = -EINVAL;
+				goto out_free;
+			}
+
+			fwrt->geo_profiles[i].values[j] = entry->integer.value;
+		}
+	}
+	ret = 0;
+out_free:
+	kfree(data);
+	return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_sar_get_wgds_table);
+
+bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)
+{
+	/*
+	 * The GEO_TX_POWER_LIMIT command is not supported on earlier
+	 * firmware versions.  Unfortunately, we don't have a TLV API
+	 * flag to rely on, so rely on the major version which is in
+	 * the first byte of ucode_ver.  This was implemented
+	 * initially on version 38 and then backported to 17.  It was
+	 * also backported to 29, but only for 7265D devices.  The
+	 * intention was to have it in 36 as well, but not all 8000
+	 * family got this feature enabled.  The 8000 family is the
+	 * only one using version 36, so skip this version entirely.
+	 */
+	return IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) >= 38 ||
+	       IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) == 17 ||
+	       (IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) == 29 &&
+		((fwrt->trans->hw_rev & CSR_HW_REV_TYPE_MSK) ==
+		 CSR_HW_REV_TYPE_7265D));
+}
+IWL_EXPORT_SYMBOL(iwl_sar_geo_support);
+
+int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt,
+				 struct iwl_host_cmd *cmd)
+{
+	struct iwl_geo_tx_power_profiles_resp *resp;
+	int ret;
+
+	resp = (void *)cmd->resp_pkt->data;
+	ret = le32_to_cpu(resp->profile_idx);
+	if (WARN_ON(ret > ACPI_NUM_GEO_PROFILES)) {
+		ret = -EIO;
+		IWL_WARN(fwrt, "Invalid geographic profile idx (%d)\n", ret);
+	}
+
+	return ret;
+}
+IWL_EXPORT_SYMBOL(iwl_validate_sar_geo_profile);
+
+void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+		      struct iwl_per_chain_offset_group *table)
+{
+	int ret, i, j;
+
+	if (!iwl_sar_geo_support(fwrt))
+		return;
+
+	ret = iwl_sar_get_wgds_table(fwrt);
+	if (ret < 0) {
+		IWL_DEBUG_RADIO(fwrt,
+				"Geo SAR BIOS table invalid or unavailable. (%d)\n",
+				ret);
+		/* we don't fail if the table is not available */
+		return;
+	}
+
+	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES * ACPI_WGDS_NUM_BANDS *
+		     ACPI_WGDS_TABLE_SIZE + 1 !=  ACPI_WGDS_WIFI_DATA_SIZE);
+
+	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES > IWL_NUM_GEO_PROFILES);
+
+	for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) {
+		struct iwl_per_chain_offset *chain =
+			(struct iwl_per_chain_offset *)&table[i];
+
+		for (j = 0; j < ACPI_WGDS_NUM_BANDS; j++) {
+			u8 *value;
+
+			value = &fwrt->geo_profiles[i].values[j *
+				ACPI_GEO_PER_CHAIN_SIZE];
+			chain[j].max_tx_power = cpu_to_le16(value[0]);
+			chain[j].chain_a = value[1];
+			chain[j].chain_b = value[2];
+			IWL_DEBUG_RADIO(fwrt,
+					"SAR geographic profile[%d] Band[%d]: chain A = %d chain B = %d max_tx_power = %d\n",
+					i, j, value[1], value[2], value[0]);
+		}
+	}
+}
+IWL_EXPORT_SYMBOL(iwl_sar_geo_init);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
index 6cb2d1f..4a6e826 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
@@ -61,6 +61,12 @@
 #define __iwl_fw_acpi__
 
 #include <linux/acpi.h>
+#include "fw/api/commands.h"
+#include "fw/api/power.h"
+#include "fw/api/phy.h"
+#include "fw/img.h"
+#include "iwl-trans.h"
+
 
 #define ACPI_WRDS_METHOD	"WRDS"
 #define ACPI_EWRD_METHOD	"EWRD"
@@ -104,9 +110,21 @@
 #define ACPI_PPAG_MIN_HB -16
 #define ACPI_PPAG_MAX_HB 40
 
+struct iwl_sar_profile {
+	bool enabled;
+	u8 table[ACPI_SAR_TABLE_SIZE];
+};
+
+struct iwl_geo_profile {
+	u8 values[ACPI_GEO_TABLE_SIZE];
+};
+
 #ifdef CONFIG_ACPI
 
+struct iwl_fw_runtime;
+
 void *iwl_acpi_get_object(struct device *dev, acpi_string method);
+
 union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
 					 union acpi_object *data,
 					 int data_size, int *tbl_rev);
@@ -134,6 +152,27 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev);
  */
 int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk);
 
+int iwl_sar_set_profile(union acpi_object *table,
+			struct iwl_sar_profile *profile,
+			bool enabled);
+
+int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,
+			   __le16 per_chain_restriction[][IWL_NUM_SUB_BANDS],
+			   int prof_a, int prof_b);
+
+int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt);
+
+int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt);
+
+int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt);
+
+bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt);
+
+int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt,
+				 struct iwl_host_cmd *cmd);
+
+void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+		      struct iwl_per_chain_offset_group *table);
 #else /* CONFIG_ACPI */
 
 static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
@@ -164,5 +203,50 @@ static inline int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
 	return -ENOENT;
 }
 
+static inline int iwl_sar_set_profile(union acpi_object *table,
+				      struct iwl_sar_profile *profile,
+				      bool enabled)
+{
+	return -ENOENT;
+}
+
+static inline int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,
+			   __le16 per_chain_restriction[][IWL_NUM_SUB_BANDS],
+			   int prof_a, int prof_b)
+{
+	return -ENOENT;
+}
+
+static inline int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt)
+{
+	return -ENOENT;
+}
+
+static inline int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)
+{
+	return -ENOENT;
+}
+
+static inline int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt)
+{
+	return -ENOENT;
+}
+
+static inline bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)
+{
+	return false;
+}
+
+static inline int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt,
+					       struct iwl_host_cmd *cmd)
+{
+	return -ENOENT;
+}
+
+static inline void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+				    struct iwl_per_chain_offset_group *table)
+{
+}
+
 #endif /* CONFIG_ACPI */
 #endif /* __iwl_fw_acpi__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 689ab0f..5c1b2e9 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -681,6 +681,13 @@ enum iwl_system_subcmd_ids {
  */
 enum iwl_xvt_subcmd_ids {
 	/**
+	 * @RUN_TIME_CALIB_DONE_NOTIF : Notification about
+	 * runtime calib finished
+	 * Handled by user space component
+	 */
+	RUN_TIME_CALIB_DONE_NOTIF = 0xFE,
+
+	/**
 	 * @IQ_CALIB_CONFIG_NOTIF : Notification about IQ calibration finished
 	 * Handled by user space component
 	 */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
index 3643b6b..c4562e1 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
@@ -618,7 +618,7 @@ struct iwl_wowlan_status_v6 {
  * @wake_packet_bufsize: wakeup packet buffer size
  * @wake_packet: wakeup packet
  */
-struct iwl_wowlan_status {
+struct iwl_wowlan_status_v7 {
 	struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM];
 	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];
 	__le64 replay_ctr;
@@ -634,6 +634,43 @@ struct iwl_wowlan_status {
 	u8 wake_packet[]; /* can be truncated from _length to _bufsize */
 } __packed; /* WOWLAN_STATUSES_API_S_VER_7 */
 
+/**
+ * struct iwl_wowlan_status - WoWLAN status
+ * @gtk: GTK data
+ * @igtk: IGTK data
+ * @replay_ctr: GTK rekey replay counter
+ * @pattern_number: number of the matched pattern
+ * @non_qos_seq_ctr: non-QoS sequence counter to use next
+ * @qos_seq_ctr: QoS sequence counters to use next
+ * @wakeup_reasons: wakeup reasons, see &enum iwl_wowlan_wakeup_reason
+ * @num_of_gtk_rekeys: number of GTK rekeys
+ * @transmitted_ndps: number of transmitted neighbor discovery packets
+ * @received_beacons: number of received beacons
+ * @wake_packet_length: wakeup packet length
+ * @wake_packet_bufsize: wakeup packet buffer size
+ * @tid_tear_down: bit mask of tids whose BA sessions were closed
+ *		   in suspend state
+ * @reserved: unused
+ * @wake_packet: wakeup packet
+ */
+struct iwl_wowlan_status {
+	struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM];
+	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];
+	__le64 replay_ctr;
+	__le16 pattern_number;
+	__le16 non_qos_seq_ctr;
+	__le16 qos_seq_ctr[8];
+	__le32 wakeup_reasons;
+	__le32 num_of_gtk_rekeys;
+	__le32 transmitted_ndps;
+	__le32 received_beacons;
+	__le32 wake_packet_length;
+	__le32 wake_packet_bufsize;
+	u8 tid_tear_down;
+	u8 reserved[3];
+	u8 wake_packet[]; /* can be truncated from _length to _bufsize */
+} __packed; /* WOWLAN_STATUSES_API_S_VER_9 */
+
 static inline u8 iwlmvm_wowlan_gtk_idx(struct iwl_wowlan_gtk_status *gtk)
 {
 	return gtk->key_flags & IWL_WOWLAN_GTK_IDX_MASK;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
index 7a0fe5a..0214e55 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
@@ -240,7 +240,7 @@ enum iwl_tof_responder_cfg_flags {
 };
 
 /**
- * struct iwl_tof_responder_config_cmd - ToF AP mode (for debug)
+ * struct iwl_tof_responder_config_cmd_v6 - ToF AP mode (for debug)
  * @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
  * @responder_cfg_flags: &iwl_tof_responder_cfg_flags
  * @bandwidth: current AP Bandwidth: &enum iwl_tof_bandwidth
@@ -258,7 +258,7 @@ enum iwl_tof_responder_cfg_flags {
  * @bssid: Current AP BSSID
  * @reserved2: reserved
  */
-struct iwl_tof_responder_config_cmd {
+struct iwl_tof_responder_config_cmd_v6 {
 	__le32 cmd_valid_fields;
 	__le32 responder_cfg_flags;
 	u8 bandwidth;
@@ -274,6 +274,42 @@ struct iwl_tof_responder_config_cmd {
 	__le16 reserved2;
 } __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */
 
+/**
+ * struct iwl_tof_responder_config_cmd - ToF AP mode (for debug)
+ * @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
+ * @responder_cfg_flags: &iwl_tof_responder_cfg_flags
+ * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
+ *             bits 4 - 7: &enum iwl_location_bw.
+ * @rate: current AP rate
+ * @channel_num: current AP Channel
+ * @ctrl_ch_position: coding of the control channel position relative to
+ *	the center frequency, see iwl_mvm_get_ctrl_pos()
+ * @sta_id: index of the AP STA when in AP mode
+ * @reserved1: reserved
+ * @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug
+ *	purposes, simulating station movement by adding various values
+ *	to this field
+ * @common_calib: XVT: common calibration value
+ * @specific_calib: XVT: specific calibration value
+ * @bssid: Current AP BSSID
+ * @reserved2: reserved
+ */
+struct iwl_tof_responder_config_cmd {
+	__le32 cmd_valid_fields;
+	__le32 responder_cfg_flags;
+	u8 format_bw;
+	u8 rate;
+	u8 channel_num;
+	u8 ctrl_ch_position;
+	u8 sta_id;
+	u8 reserved1;
+	__le16 toa_offset;
+	__le16 common_calib;
+	__le16 specific_calib;
+	u8 bssid[ETH_ALEN];
+	__le16 reserved2;
+} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */
+
 #define IWL_LCI_CIVIC_IE_MAX_SIZE	400
 
 /**
@@ -391,6 +427,9 @@ struct iwl_tof_range_req_ap_entry_v2 {
  *	Default algo type is ML.
  * @IWL_INITIATOR_AP_FLAGS_MCSI_REPORT: Send the MCSI for each FTM frame to the
  *	driver.
+ * @IWL_INITIATOR_AP_FLAGS_NON_TB: Use non trigger based flow
+ * @IWL_INITIATOR_AP_FLAGS_TB: Use trigger based flow
+ * @IWL_INITIATOR_AP_FLAGS_SECURED: request secured measurement
  */
 enum iwl_initiator_ap_flags {
 	IWL_INITIATOR_AP_FLAGS_ASAP = BIT(1),
@@ -400,10 +439,13 @@ enum iwl_initiator_ap_flags {
 	IWL_INITIATOR_AP_FLAGS_ALGO_LR = BIT(5),
 	IWL_INITIATOR_AP_FLAGS_ALGO_FFT = BIT(6),
 	IWL_INITIATOR_AP_FLAGS_MCSI_REPORT = BIT(8),
+	IWL_INITIATOR_AP_FLAGS_NON_TB = BIT(9),
+	IWL_INITIATOR_AP_FLAGS_TB = BIT(10),
+	IWL_INITIATOR_AP_FLAGS_SECURED = BIT(11),
 };
 
 /**
- * struct iwl_tof_range_req_ap_entry - AP configuration parameters
+ * struct iwl_tof_range_req_ap_entry_v3 - AP configuration parameters
  * @initiator_ap_flags: see &enum iwl_initiator_ap_flags.
  * @channel_num: AP Channel number
  * @bandwidth: AP bandwidth. One of iwl_tof_bandwidth.
@@ -420,7 +462,7 @@ enum iwl_initiator_ap_flags {
  * @reserved: For alignment and future use
  * @tsf_delta: not in use
  */
-struct iwl_tof_range_req_ap_entry {
+struct iwl_tof_range_req_ap_entry_v3 {
 	__le32 initiator_ap_flags;
 	u8 channel_num;
 	u8 bandwidth;
@@ -435,6 +477,72 @@ struct iwl_tof_range_req_ap_entry {
 } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_3 */
 
 /**
+ * enum iwl_location_frame_format - location frame formats
+ * @IWL_LOCATION_FRAME_FORMAT_LEGACY: legacy
+ * @IWL_LOCATION_FRAME_FORMAT_HT: HT
+ * @IWL_LOCATION_FRAME_FORMAT_VHT: VHT
+ * @IWL_LOCATION_FRAME_FORMAT_HE: HE
+ */
+enum iwl_location_frame_format {
+	IWL_LOCATION_FRAME_FORMAT_LEGACY,
+	IWL_LOCATION_FRAME_FORMAT_HT,
+	IWL_LOCATION_FRAME_FORMAT_VHT,
+	IWL_LOCATION_FRAME_FORMAT_HE,
+};
+
+/**
+ * enum iwl_location_bw - location bandwidth selection
+ * @IWL_LOCATION_BW_20MHZ: 20MHz
+ * @IWL_LOCATION_BW_40MHZ: 40MHz
+ * @IWL_LOCATION_BW_80MHZ: 80MHz
+ */
+enum iwl_location_bw {
+	IWL_LOCATION_BW_20MHZ,
+	IWL_LOCATION_BW_40MHZ,
+	IWL_LOCATION_BW_80MHZ,
+};
+
+#define HLTK_11AZ_LEN	32
+#define TK_11AZ_LEN	32
+
+#define LOCATION_BW_POS	4
+
+/**
+ * struct iwl_tof_range_req_ap_entry - AP configuration parameters
+ * @initiator_ap_flags: see &enum iwl_initiator_ap_flags.
+ * @channel_num: AP Channel number
+ * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
+ *             bits 4 - 7: &enum iwl_location_bw.
+ * @ctrl_ch_position: Coding of the control channel position relative to the
+ *	center frequency, see iwl_mvm_get_ctrl_pos().
+ * @ftmr_max_retries: Max number of retries to send the FTMR in case of no
+ *	reply from the AP.
+ * @bssid: AP's BSSID
+ * @burst_period: Recommended value to be sent to the AP. Measurement
+ *	periodicity In units of 100ms. ignored if num_of_bursts_exp = 0
+ * @samples_per_burst: the number of FTMs pairs in single Burst (1-31);
+ * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of
+ *	the number of measurement iterations (min 2^0 = 1, max 2^14)
+ * @reserved: For alignment and future use
+ * @hltk: HLTK to be used for secured 11az measurement
+ * @tk: TK to be used for secured 11az measurement
+ */
+struct iwl_tof_range_req_ap_entry {
+	__le32 initiator_ap_flags;
+	u8 channel_num;
+	u8 format_bw;
+	u8 ctrl_ch_position;
+	u8 ftmr_max_retries;
+	u8 bssid[ETH_ALEN];
+	__le16 burst_period;
+	u8 samples_per_burst;
+	u8 num_of_bursts;
+	__le16 reserved;
+	u8 hltk[HLTK_11AZ_LEN];
+	u8 tk[TK_11AZ_LEN];
+} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_4 */
+
+/**
  * enum iwl_tof_response_mode
  * @IWL_MVM_TOF_RESPONSE_ASAP: report each AP measurement separately as soon as
  *			       possible (not supported for this release)
@@ -536,6 +644,38 @@ struct iwl_tof_range_req_cmd_v5 {
 /* LOCATION_RANGE_REQ_CMD_API_S_VER_5 */
 
 /**
+ * struct iwl_tof_range_req_cmd_v7 - start measurement cmd
+ * @initiator_flags: see flags @ iwl_tof_initiator_flags
+ * @request_id: A Token incremented per request. The same Token will be
+ *		sent back in the range response
+ * @num_of_ap: Number of APs to measure (error if > IWL_MVM_TOF_MAX_APS)
+ * @range_req_bssid: ranging request BSSID
+ * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.
+ *		  Bits set to 1 shall be randomized by the UMAC
+ * @macaddr_template: MAC address template to use for non-randomized bits
+ * @req_timeout_ms: Requested timeout of the response in units of milliseconds.
+ *	This is the session time for completing the measurement.
+ * @tsf_mac_id: report the measurement start time for each ap in terms of the
+ *	TSF of this mac id. 0xff to disable TSF reporting.
+ * @common_calib: The common calib value to inject to this measurement calc
+ * @specific_calib: The specific calib value to inject to this measurement calc
+ * @ap: per-AP request data, see &struct iwl_tof_range_req_ap_entry_v2.
+ */
+struct iwl_tof_range_req_cmd_v7 {
+	__le32 initiator_flags;
+	u8 request_id;
+	u8 num_of_ap;
+	u8 range_req_bssid[ETH_ALEN];
+	u8 macaddr_mask[ETH_ALEN];
+	u8 macaddr_template[ETH_ALEN];
+	__le32 req_timeout_ms;
+	__le32 tsf_mac_id;
+	__le16 common_calib;
+	__le16 specific_calib;
+	struct iwl_tof_range_req_ap_entry_v3 ap[IWL_MVM_TOF_MAX_APS];
+} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_7 */
+
+/**
  * struct iwl_tof_range_req_cmd - start measurement cmd
  * @initiator_flags: see flags @ iwl_tof_initiator_flags
  * @request_id: A Token incremented per request. The same Token will be
@@ -565,7 +705,7 @@ struct iwl_tof_range_req_cmd {
 	__le16 common_calib;
 	__le16 specific_calib;
 	struct iwl_tof_range_req_ap_entry ap[IWL_MVM_TOF_MAX_APS];
-} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_7 */
+} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_8 */
 
 /*
  * enum iwl_tof_range_request_status - status of the sent request
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
index 08148bc..48c3d68 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
@@ -95,6 +95,7 @@ struct iwl_ssid_ie {
 #define IWL_SCAN_MAX_BLACKLIST_LEN	64
 #define IWL_SCAN_SHORT_BLACKLIST_LEN	16
 #define IWL_SCAN_MAX_PROFILES		11
+#define IWL_SCAN_MAX_PROFILES_V2	8
 #define SCAN_OFFLOAD_PROBE_REQ_SIZE	512
 #define SCAN_NUM_BAND_PROBE_DATA_V_1	2
 #define SCAN_NUM_BAND_PROBE_DATA_V_2	3
@@ -161,8 +162,7 @@ struct iwl_scan_offload_profile {
 } __packed;
 
 /**
- * struct iwl_scan_offload_profile_cfg - SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_1
- * @profiles:		profiles to search for match
+ * struct iwl_scan_offload_profile_cfg_data
  * @blacklist_len:	length of blacklist
  * @num_profiles:	num of profiles in the list
  * @match_notify:	clients waiting for match found notification
@@ -171,8 +171,7 @@ struct iwl_scan_offload_profile {
  * @any_beacon_notify:	clients waiting for match notification without match
  * @reserved:		reserved
  */
-struct iwl_scan_offload_profile_cfg {
-	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES];
+struct iwl_scan_offload_profile_cfg_data {
 	u8 blacklist_len;
 	u8 num_profiles;
 	u8 match_notify;
@@ -183,6 +182,26 @@ struct iwl_scan_offload_profile_cfg {
 } __packed;
 
 /**
+ * struct iwl_scan_offload_profile_cfg
+ * @profiles:	profiles to search for match
+ * @data:	the rest of the data for profile_cfg
+ */
+struct iwl_scan_offload_profile_cfg_v1 {
+	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES];
+	struct iwl_scan_offload_profile_cfg_data data;
+} __packed; /* SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_1-2*/
+
+/**
+ * struct iwl_scan_offload_profile_cfg
+ * @profiles:	profiles to search for match
+ * @data:	the rest of the data for profile_cfg
+ */
+struct iwl_scan_offload_profile_cfg {
+	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES_V2];
+	struct iwl_scan_offload_profile_cfg_data data;
+} __packed; /* SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_3*/
+
+/**
  * struct iwl_scan_schedule_lmac - schedule of scan offload
  * @delay:		delay between iterations, in seconds.
  * @iterations:		num of scan iterations
@@ -645,7 +664,10 @@ enum iwl_umac_scan_general_flags2 {
 };
 
 /**
- * enum iwl_umac_scan_general_flags_v22 - UMAC scan general flags ver 2
+ * enum iwl_umac_scan_general_flags_v2 - UMAC scan general flags version 2
+ *
+ * The FW flags were reordered and hence the driver introduce version 2
+ *
  * @IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC: periodic or scheduled
  * @IWL_UMAC_SCAN_GEN_FLAGS_V2_PASS_ALL: pass all probe responses and beacons
  *                                       during scan iterations
@@ -662,6 +684,9 @@ enum iwl_umac_scan_general_flags2 {
  * @IWL_UMAC_SCAN_GEN_FLAGS_V2_MULTI_SSID: matching on multiple SSIDs
  * @IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE: all the channels scanned
  *                                           as passive
+ * @IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN: at the end of 2.4GHz and
+ *		5.2Ghz bands scan, trigger scan on 6GHz band to discover
+ *		the reported collocated APs
  */
 enum iwl_umac_scan_general_flags_v2 {
 	IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC             = BIT(0),
@@ -676,6 +701,7 @@ enum iwl_umac_scan_general_flags_v2 {
 	IWL_UMAC_SCAN_GEN_FLAGS_V2_NTF_START            = BIT(9),
 	IWL_UMAC_SCAN_GEN_FLAGS_V2_MULTI_SSID           = BIT(10),
 	IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE        = BIT(11),
+	IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN     = BIT(12),
 };
 
 /**
@@ -696,13 +722,16 @@ struct  iwl_scan_channel_cfg_umac {
 			u8 channel_num;
 			u8 iter_count;
 			__le16 iter_interval;
-		} v1;  /* SCAN_CHANNEL_CFG_S_VER1 */
+		} v1;  /* SCAN_CHANNEL_CONFIG_API_S_VER_1 */
 		struct {
 			u8 channel_num;
 			u8 band;
 			u8 iter_count;
 			u8 iter_interval;
-		 } v2; /* SCAN_CHANNEL_CFG_S_VER2 */
+		 } v2; /* SCAN_CHANNEL_CONFIG_API_S_VER_2
+			* SCAN_CHANNEL_CONFIG_API_S_VER_3
+			* SCAN_CHANNEL_CONFIG_API_S_VER_4
+			*/
 	};
 } __packed;
 
@@ -872,7 +901,7 @@ struct iwl_scan_req_umac {
 #define IWL_SCAN_REQ_UMAC_SIZE_V1 36
 
 /**
- * struct iwl_scan_probe_params
+ * struct iwl_scan_probe_params_v3
  * @preq: scan probe request params
  * @ssid_num: number of valid SSIDs in direct scan array
  * @short_ssid_num: number of valid short SSIDs in short ssid array
@@ -881,8 +910,8 @@ struct iwl_scan_req_umac {
  * @direct_scan: list of ssids
  * @short_ssid: array of short ssids
  * @bssid_array: array of bssids
-*/
-struct iwl_scan_probe_params {
+ */
+struct iwl_scan_probe_params_v3 {
 	struct iwl_scan_probe_req preq;
 	u8 ssid_num;
 	u8 short_ssid_num;
@@ -891,49 +920,95 @@ struct iwl_scan_probe_params {
 	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
 	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];
 	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];
-} __packed;
+} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_3 */
+
+/**
+ * struct iwl_scan_probe_params_v4
+ * @preq: scan probe request params
+ * @short_ssid_num: number of valid short SSIDs in short ssid array
+ * @bssid_num: number of valid bssid in bssids array
+ * @reserved: reserved
+ * @direct_scan: list of ssids
+ * @short_ssid: array of short ssids
+ * @bssid_array: array of bssids
+ */
+struct iwl_scan_probe_params_v4 {
+	struct iwl_scan_probe_req preq;
+	u8 short_ssid_num;
+	u8 bssid_num;
+	__le16 reserved;
+	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
+	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];
+	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];
+} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_4 */
 
 #define SCAN_MAX_NUM_CHANS_V3 67
 
 /**
- * struct iwl_scan_channel_params
+ * struct iwl_scan_channel_params_v4
  * @flags: channel flags &enum iwl_scan_channel_flags
  * @count: num of channels in scan request
+ * @num_of_aps_override: override the number of APs the FW uses to calculate
+ *	dwell time when adaptive dwell is used
  * @reserved: for future use and alignment
  * @channel_config: array of explicit channel configurations
  *                  for 2.4Ghz and 5.2Ghz bands
+ * @adwell_ch_override_bitmap: when using adaptive dwell, override the number
+ *	of APs value with &num_of_aps_override for the channel.
+ *	To cast channel to index, use &iwl_mvm_scan_ch_and_band_to_idx
  */
-struct iwl_scan_channel_params {
+struct iwl_scan_channel_params_v4 {
 	u8 flags;
 	u8 count;
-	__le16 reserved;
+	u8 num_of_aps_override;
+	u8 reserved;
 	struct iwl_scan_channel_cfg_umac channel_config[SCAN_MAX_NUM_CHANS_V3];
-} __packed;
+	u8 adwell_ch_override_bitmap[16];
+} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_4 also
+	       SCAN_CHANNEL_PARAMS_API_S_VER_5 */
 
- /**
-  * struct iwl_scan_general_params
-  * @flags: &enum iwl_umac_scan_flags
-  * @reserved: reserved for future
-  * @scan_start_mac_id: report the scan start TSF time according to this mac TSF
-  * @active_dwell: dwell time for active scan per LMAC
-  * @adwell_default_2g: adaptive dwell default number of APs
-  *                        for 2.4GHz channel
-  * @ddwell_default_5g: adaptive dwell default number of APs
-  *                        for 5GHz channels
-  * @adwell_default_social_chn: adaptive dwell default number of
-  *                             APs per social channel
-  * @reserved1: reserved for future
-  * @adwell_max_budget: the maximal number of TUs that adaptive dwell
-  *                     can add to the total scan time
-  * @max_out_of_time: max out of serving channel time, per LMAC
-  * @suspend_time: max suspend time, per LMAC
-  * @scan_priority: priority of the request
-  * @passive_dwell: continues dwell time for passive channel
-  *                 (without adaptive dwell)
-  * @num_of_fragments: number of fragments needed for full fragmented
-  *                    scan coverage.
-  * */
-struct iwl_scan_general_params {
+/**
+ * struct iwl_scan_channel_params_v6
+ * @flags: channel flags &enum iwl_scan_channel_flags
+ * @count: num of channels in scan request
+ * @n_aps_override: override the number of APs the FW uses to calculate dwell
+ *	time when adaptive dwell is used.
+ *	Channel k will use n_aps_override[i] when BIT(20 + i) is set in
+ *	channel_config[k].flags
+ * @channel_config: array of explicit channel configurations
+ *                  for 2.4Ghz and 5.2Ghz bands
+ */
+struct iwl_scan_channel_params_v6 {
+	u8 flags;
+	u8 count;
+	u8 n_aps_override[2];
+	struct iwl_scan_channel_cfg_umac channel_config[SCAN_MAX_NUM_CHANS_V3];
+} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_6 */
+
+/**
+ * struct iwl_scan_general_params_v10
+ * @flags: &enum iwl_umac_scan_flags
+ * @reserved: reserved for future
+ * @scan_start_mac_id: report the scan start TSF time according to this mac TSF
+ * @active_dwell: dwell time for active scan per LMAC
+ * @adwell_default_2g: adaptive dwell default number of APs
+ *                        for 2.4GHz channel
+ * @adwell_default_5g: adaptive dwell default number of APs
+ *                        for 5GHz channels
+ * @adwell_default_social_chn: adaptive dwell default number of
+ *                             APs per social channel
+ * @reserved1: reserved for future
+ * @adwell_max_budget: the maximal number of TUs that adaptive dwell
+ *                     can add to the total scan time
+ * @max_out_of_time: max out of serving channel time, per LMAC
+ * @suspend_time: max suspend time, per LMAC
+ * @scan_priority: priority of the request
+ * @passive_dwell: continues dwell time for passive channel
+ *                 (without adaptive dwell)
+ * @num_of_fragments: number of fragments needed for full fragmented
+ *                    scan coverage.
+ */
+struct iwl_scan_general_params_v10 {
 	__le16 flags;
 	u8 reserved;
 	u8 scan_start_mac_id;
@@ -948,45 +1023,71 @@ struct iwl_scan_general_params {
 	__le32 scan_priority;
 	u8 passive_dwell[SCAN_TWO_LMACS];
 	u8 num_of_fragments[SCAN_TWO_LMACS];
-} __packed;
+} __packed; /* SCAN_GENERAL_PARAMS_API_S_VER_10 */
 
 /**
-  * struct iwl_scan_periodic_parms
-  * @schedule: can scheduling parameter
-  * @delay: initial delay of the periodic scan in seconds
-  * @reserved: reserved for future
-  * */
-struct iwl_scan_periodic_parms {
+ * struct iwl_scan_periodic_parms_v1
+ * @schedule: can scheduling parameter
+ * @delay: initial delay of the periodic scan in seconds
+ * @reserved: reserved for future
+ */
+struct iwl_scan_periodic_parms_v1 {
 	struct iwl_scan_umac_schedule schedule[IWL_MAX_SCHED_SCAN_PLANS];
 	__le16 delay;
 	__le16 reserved;
-} __packed;
+} __packed; /* SCAN_PERIODIC_PARAMS_API_S_VER_1 */
 
 /**
-  * struct iwl_scan_req_params
-  * @general_params: &struct iwl_scan_general_params
-  * @channel_params: &struct iwl_scan_channel_params
-  * @periodic_params: &struct iwl_scan_periodic_parms
-  * @probe_params: &struct iwl_scan_probe_params
-  * */
-struct iwl_scan_req_params {
-	struct iwl_scan_general_params general_params;
-	struct iwl_scan_channel_params channel_params;
-	struct iwl_scan_periodic_parms periodic_params;
-	struct iwl_scan_probe_params probe_params;
-} __packed;
+ * struct iwl_scan_req_params_v12
+ * @general_params: &struct iwl_scan_general_params_v10
+ * @channel_params: &struct iwl_scan_channel_params_v4
+ * @periodic_params: &struct iwl_scan_periodic_parms_v1
+ * @probe_params: &struct iwl_scan_probe_params_v3
+ */
+struct iwl_scan_req_params_v12 {
+	struct iwl_scan_general_params_v10 general_params;
+	struct iwl_scan_channel_params_v4 channel_params;
+	struct iwl_scan_periodic_parms_v1 periodic_params;
+	struct iwl_scan_probe_params_v3 probe_params;
+} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_12 */
 
 /**
- * struct iwl_scan_req_umac_v2
+ * struct iwl_scan_req_params_v14
+ * @general_params: &struct iwl_scan_general_params_v10
+ * @channel_params: &struct iwl_scan_channel_params_v6
+ * @periodic_params: &struct iwl_scan_periodic_parms_v1
+ * @probe_params: &struct iwl_scan_probe_params_v4
+ */
+struct iwl_scan_req_params_v14 {
+	struct iwl_scan_general_params_v10 general_params;
+	struct iwl_scan_channel_params_v6 channel_params;
+	struct iwl_scan_periodic_parms_v1 periodic_params;
+	struct iwl_scan_probe_params_v4 probe_params;
+} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_14 */
+
+/**
+ * struct iwl_scan_req_umac_v12
  * @uid: scan id, &enum iwl_umac_scan_uid_offsets
  * @ooc_priority: out of channel priority - &enum iwl_scan_priority
  * @scan_params: scan parameters
  */
-struct iwl_scan_umac_req_v2 {
+struct iwl_scan_req_umac_v12 {
 	__le32 uid;
 	__le32 ooc_priority;
-	struct iwl_scan_req_params scan_params;
-} __packed;
+	struct iwl_scan_req_params_v12 scan_params;
+} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_12 */
+
+/**
+ * struct iwl_scan_req_umac_v14
+ * @uid: scan id, &enum iwl_umac_scan_uid_offsets
+ * @ooc_priority: out of channel priority - &enum iwl_scan_priority
+ * @scan_params: scan parameters
+ */
+struct iwl_scan_req_umac_v14 {
+	__le32 uid;
+	__le32 ooc_priority;
+	struct iwl_scan_req_params_v14 scan_params;
+} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_14 */
 
 /**
  * struct iwl_umac_scan_abort
@@ -1062,7 +1163,7 @@ struct iwl_scan_offload_profiles_query_v1 {
 	u8 resume_while_scanning;
 	u8 self_recovery;
 	__le16 reserved;
-	struct iwl_scan_offload_profile_match_v1 matches[IWL_SCAN_MAX_PROFILES];
+	struct iwl_scan_offload_profile_match_v1 matches[0];
 } __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */
 
 /**
@@ -1106,7 +1207,7 @@ struct iwl_scan_offload_profiles_query {
 	u8 resume_while_scanning;
 	u8 self_recovery;
 	__le16 reserved;
-	struct iwl_scan_offload_profile_match matches[IWL_SCAN_MAX_PROFILES];
+	struct iwl_scan_offload_profile_match matches[0];
 } __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_3 */
 
 /**
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h b/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
index 5d1fb98..aadca78 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
@@ -8,6 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2019        Intel Deutschland GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,6 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
+ * Copyright(c) 2019        Intel Deutschland GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,21 +65,23 @@
 #ifndef __iwl_fw_api_soc_h__
 #define __iwl_fw_api_soc_h__
 
-/* type of devices for defining SOC latency */
-enum iwl_soc_device_types {
-	SOC_CONFIG_CMD_INTEGRATED   = 0x0,
-	SOC_CONFIG_CMD_DISCRETE     = 0x1,
-};
+#define SOC_CONFIG_CMD_FLAGS_DISCRETE		BIT(0)
+#define SOC_CONFIG_CMD_FLAGS_LOW_LATENCY	BIT(1)
 
 /**
  * struct iwl_soc_configuration_cmd - Set device stabilization latency
  *
- * @device_type: the device type as defined in &enum iwl_soc_device_types
- * @soc_latency: time for SOC to ensure stable power & XTAL
+ * @flags: soc settings flags.  In VER_1, we can only set the DISCRETE
+ *	flag, because the FW treats the whole value as an integer. In
+ *	VER_2, we can set the bits independently.
+ * @latency: time for SOC to ensure stable power & XTAL
  */
 struct iwl_soc_configuration_cmd {
-	__le32 device_type;
-	__le32 soc_latency;
-} __packed; /* SOC_CONFIGURATION_CMD_S_VER_1 */
+	__le32 flags;
+	__le32 latency;
+} __packed; /*
+	     * SOC_CONFIGURATION_CMD_S_VER_1 (see description above)
+	     * SOC_CONFIGURATION_CMD_S_VER_2
+	     */
 
 #endif /* __iwl_fw_api_soc_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h b/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h
index 450227f..970e9e5 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -288,8 +288,7 @@ struct iwl_mvm_keyinfo {
  * @addr: station's MAC address
  * @reserved2: reserved
  * @sta_id: index of station in uCode's station table
- * @modify_mask: STA_MODIFY_*, selects which parameters to modify vs. leave
- *	alone. 1 - modify, 0 - don't change.
+ * @modify_mask: from &enum iwl_sta_modify_flag, selects what to change
  * @reserved3: reserved
  * @station_flags: look at &enum iwl_sta_flags
  * @station_flags_msk: what of %station_flags have changed,
@@ -369,8 +368,7 @@ enum iwl_sta_type {
  * @addr: station's MAC address
  * @reserved2: reserved
  * @sta_id: index of station in uCode's station table
- * @modify_mask: STA_MODIFY_*, selects which parameters to modify vs. leave
- *	alone. 1 - modify, 0 - don't change.
+ * @modify_mask: from &enum iwl_sta_modify_flag, selects what to change
  * @reserved3: reserved
  * @station_flags: look at &enum iwl_sta_flags
  * @station_flags_msk: what of %station_flags have changed,
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h b/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h
index 416e817..a731f28 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h
@@ -459,6 +459,7 @@ struct iwl_mvm_session_prot_cmd {
  * @mac_id: the mac id for which the session protection started / ended
  * @status: 1 means success, 0 means failure
  * @start: 1 means the session protection started, 0 means it ended
+ * @conf_id: the configuration id of the session that started / eneded
  *
  * Note that any session protection will always get two notifications: start
  * and end even the firmware could not schedule it.
@@ -467,6 +468,7 @@ struct iwl_mvm_session_prot_notif {
 	__le32 mac_id;
 	__le32 status;
 	__le32 start;
-} __packed; /* SESSION_PROTECTION_NOTIFICATION_API_S_VER_1 */
+	__le32 conf_id;
+} __packed; /* SESSION_PROTECTION_NOTIFICATION_API_S_VER_2 */
 
 #endif /* __iwl_fw_api_time_event_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
index 8511e73..f1d1fe9 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
@@ -7,7 +7,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -323,7 +323,7 @@ struct iwl_tx_cmd_gen2 {
 } __packed; /* TX_CMD_API_S_VER_7 */
 
 /**
- * struct iwl_tx_cmd_gen3 - TX command struct to FW for 22560 devices
+ * struct iwl_tx_cmd_gen3 - TX command struct to FW for AX210+ devices
  * ( TX_CMD = 0x1c )
  * @len: in bytes of the payload, see below for details
  * @flags: combination of &enum iwl_tx_cmd_flags
@@ -813,6 +813,7 @@ enum iwl_mac_beacon_flags {
 	IWL_MAC_BEACON_ANT_A	= BIT(9),
 	IWL_MAC_BEACON_ANT_B	= BIT(10),
 	IWL_MAC_BEACON_ANT_C	= BIT(11),
+	IWL_MAC_BEACON_FILS	= BIT(12),
 };
 
 /**
@@ -820,6 +821,7 @@ enum iwl_mac_beacon_flags {
  * @byte_cnt: byte count of the beacon frame.
  * @flags: least significant byte for rate code. The most significant byte
  *	is &enum iwl_mac_beacon_flags.
+ * @short_ssid: Short SSID
  * @reserved: reserved
  * @template_id: currently equal to the mac context id of the coresponding mac.
  * @tim_idx: the offset of the tim IE in the beacon
@@ -831,14 +833,15 @@ enum iwl_mac_beacon_flags {
 struct iwl_mac_beacon_cmd {
 	__le16 byte_cnt;
 	__le16 flags;
-	__le64 reserved;
+	__le32 short_ssid;
+	__le32 reserved;
 	__le32 template_id;
 	__le32 tim_idx;
 	__le32 tim_size;
 	__le32 ecsa_offset;
 	__le32 csa_offset;
 	struct ieee80211_hdr frame[0];
-} __packed; /* BEACON_TEMPLATE_CMD_API_S_VER_9 */
+} __packed; /* BEACON_TEMPLATE_CMD_API_S_VER_10 */
 
 struct iwl_beacon_notif {
 	struct iwl_mvm_tx_resp beacon_notify_hdr;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 440fca2..2e5d9d8 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -646,6 +646,7 @@ static struct scatterlist *alloc_sgtable(int size)
 				if (new_page)
 					__free_page(new_page);
 			}
+			kfree(table);
 			return NULL;
 		}
 		alloc_size = min_t(int, size, PAGE_SIZE);
@@ -817,7 +818,8 @@ static void iwl_dump_paging(struct iwl_fw_runtime *fwrt,
 
 static struct iwl_fw_error_dump_file *
 iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,
-		       struct iwl_fw_dump_ptrs *fw_error_dump)
+		       struct iwl_fw_dump_ptrs *fw_error_dump,
+		       struct iwl_fwrt_dump_data *data)
 {
 	struct iwl_fw_error_dump_file *dump_file;
 	struct iwl_fw_error_dump_data *dump_data;
@@ -899,15 +901,15 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,
 	}
 
 	/* If we only want a monitor dump, reset the file length */
-	if (fwrt->dump.monitor_only) {
+	if (data->monitor_only) {
 		file_len = sizeof(*dump_file) + sizeof(*dump_data) * 2 +
 			   sizeof(*dump_info) + sizeof(*dump_smem_cfg);
 	}
 
 	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_ERROR_INFO) &&
-	    fwrt->dump.desc)
+	    data->desc)
 		file_len += sizeof(*dump_data) + sizeof(*dump_trig) +
-			    fwrt->dump.desc->len;
+			data->desc->len;
 
 	dump_file = vzalloc(file_len);
 	if (!dump_file)
@@ -928,7 +930,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,
 			cpu_to_le32(CSR_HW_REV_STEP(fwrt->trans->hw_rev));
 		memcpy(dump_info->fw_human_readable, fwrt->fw->human_readable,
 		       sizeof(dump_info->fw_human_readable));
-		strncpy(dump_info->dev_human_readable, fwrt->trans->cfg->name,
+		strncpy(dump_info->dev_human_readable, fwrt->trans->name,
 			sizeof(dump_info->dev_human_readable) - 1);
 		strncpy(dump_info->bus_human_readable, fwrt->dev->bus->name,
 			sizeof(dump_info->bus_human_readable) - 1);
@@ -983,19 +985,19 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt,
 		iwl_read_radio_regs(fwrt, &dump_data);
 
 	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_ERROR_INFO) &&
-	    fwrt->dump.desc) {
+	    data->desc) {
 		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);
 		dump_data->len = cpu_to_le32(sizeof(*dump_trig) +
-					     fwrt->dump.desc->len);
+					     data->desc->len);
 		dump_trig = (void *)dump_data->data;
-		memcpy(dump_trig, &fwrt->dump.desc->trig_desc,
-		       sizeof(*dump_trig) + fwrt->dump.desc->len);
+		memcpy(dump_trig, &data->desc->trig_desc,
+		       sizeof(*dump_trig) + data->desc->len);
 
 		dump_data = iwl_fw_error_next_data(dump_data);
 	}
 
 	/* In case we only want monitor dump, skip to dump trasport data */
-	if (fwrt->dump.monitor_only)
+	if (data->monitor_only)
 		goto out;
 
 	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_MEM)) {
@@ -1107,6 +1109,38 @@ static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,
 	return sizeof(*range) + le32_to_cpu(range->range_data_size);
 }
 
+static int iwl_dump_ini_config_iter(struct iwl_fw_runtime *fwrt,
+				    struct iwl_dump_ini_region_data *reg_data,
+				    void *range_ptr, int idx)
+{
+	struct iwl_trans *trans = fwrt->trans;
+	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data->reg_tlv->data;
+	struct iwl_fw_ini_error_dump_range *range = range_ptr;
+	__le32 *val = range->data;
+	u32 addr = le32_to_cpu(reg->addrs[idx]) +
+		   le32_to_cpu(reg->dev_addr.offset);
+	int i;
+
+	/* we shouldn't get here if the trans doesn't have read_config32 */
+	if (WARN_ON_ONCE(!trans->ops->read_config32))
+		return -EOPNOTSUPP;
+
+	range->internal_base_addr = cpu_to_le32(addr);
+	range->range_data_size = reg->dev_addr.size;
+	for (i = 0; i < le32_to_cpu(reg->dev_addr.size); i += 4) {
+		int ret;
+		u32 tmp;
+
+		ret = trans->ops->read_config32(trans, addr + i, &tmp);
+		if (ret < 0)
+			return ret;
+
+		*val++ = cpu_to_le32(tmp);
+	}
+
+	return sizeof(*range) + le32_to_cpu(range->range_data_size);
+}
+
 static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt,
 				     struct iwl_dump_ini_region_data *reg_data,
 				     void *range_ptr, int idx)
@@ -1229,13 +1263,15 @@ static bool iwl_ini_txf_iter(struct iwl_fw_runtime *fwrt,
 			iter->lmac = 0;
 	}
 
-	if (!iter->internal_txf)
+	if (!iter->internal_txf) {
 		for (iter->fifo++; iter->fifo < txf_num; iter->fifo++) {
 			iter->fifo_size =
 				cfg->lmac[iter->lmac].txfifo_size[iter->fifo];
 			if (iter->fifo_size && (lmac_bitmap & BIT(iter->fifo)))
 				return true;
 		}
+		iter->fifo--;
+	}
 
 	iter->internal_txf = 1;
 
@@ -1702,13 +1738,7 @@ iwl_dump_ini_mon_smem_get_size(struct iwl_fw_runtime *fwrt,
 			       struct iwl_dump_ini_region_data *reg_data)
 {
 	struct iwl_fw_ini_region_tlv *reg = (void *)reg_data->reg_tlv->data;
-	struct iwl_fw_ini_allocation_tlv *fw_mon_cfg;
-	u32 alloc_id = le32_to_cpu(reg->internal_buffer.alloc_id), size;
-
-	fw_mon_cfg = &fwrt->trans->dbg.fw_mon_cfg[alloc_id];
-	if (le32_to_cpu(fw_mon_cfg->buf_location) !=
-	    IWL_FW_INI_LOCATION_SRAM_PATH)
-		return 0;
+	u32 size;
 
 	size = le32_to_cpu(reg->internal_buffer.size);
 	if (!size)
@@ -2049,7 +2079,12 @@ static const struct iwl_dump_ini_mem_ops iwl_dump_ini_region_ops[] = {
 		.fill_range = iwl_dump_ini_csr_iter,
 	},
 	[IWL_FW_INI_REGION_DRAM_IMR] = {},
-	[IWL_FW_INI_REGION_PCI_IOSF_CONFIG] = {},
+	[IWL_FW_INI_REGION_PCI_IOSF_CONFIG] = {
+		.get_num_of_ranges = iwl_dump_ini_mem_ranges,
+		.get_size = iwl_dump_ini_mem_get_size,
+		.fill_mem_hdr = iwl_dump_ini_mem_fill_header,
+		.fill_range = iwl_dump_ini_config_iter,
+	},
 };
 
 static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,
@@ -2142,7 +2177,21 @@ static u32 iwl_dump_ini_file_gen(struct iwl_fw_runtime *fwrt,
 	return le32_to_cpu(hdr->file_len);
 }
 
-static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
+static inline void iwl_fw_free_dump_desc(struct iwl_fw_runtime *fwrt,
+					 const struct iwl_fw_dump_desc **desc)
+{
+	if (desc && *desc != &iwl_dump_desc_assert)
+		kfree(*desc);
+
+	*desc = NULL;
+	fwrt->dump.lmac_err_id[0] = 0;
+	if (fwrt->smem_cfg.num_lmacs > 1)
+		fwrt->dump.lmac_err_id[1] = 0;
+	fwrt->dump.umac_err_id = 0;
+}
+
+static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,
+			      struct iwl_fwrt_dump_data *dump_data)
 {
 	struct iwl_fw_dump_ptrs fw_error_dump = {};
 	struct iwl_fw_error_dump_file *dump_file;
@@ -2150,11 +2199,11 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
 	u32 file_len;
 	u32 dump_mask = fwrt->fw->dbg.dump_mask;
 
-	dump_file = iwl_fw_error_dump_file(fwrt, &fw_error_dump);
+	dump_file = iwl_fw_error_dump_file(fwrt, &fw_error_dump, dump_data);
 	if (!dump_file)
-		goto out;
+		return;
 
-	if (fwrt->dump.monitor_only)
+	if (dump_data->monitor_only)
 		dump_mask &= IWL_FW_ERROR_DUMP_FW_MONITOR;
 
 	fw_error_dump.trans_ptr = iwl_trans_dump_data(fwrt->trans, dump_mask);
@@ -2183,9 +2232,6 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
 	}
 	vfree(fw_error_dump.fwrt_ptr);
 	vfree(fw_error_dump.trans_ptr);
-
-out:
-	iwl_fw_free_dump_desc(fwrt);
 }
 
 static void iwl_dump_ini_list_free(struct list_head *list)
@@ -2214,7 +2260,7 @@ static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
 	u32 file_len = iwl_dump_ini_file_gen(fwrt, dump_data, &dump_list);
 
 	if (!file_len)
-		goto out;
+		return;
 
 	sg_dump_data = alloc_sgtable(file_len);
 	if (sg_dump_data) {
@@ -2231,9 +2277,6 @@ static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
 			       GFP_KERNEL);
 	}
 	iwl_dump_ini_list_free(&dump_list);
-
-out:
-	iwl_fw_error_dump_data_free(dump_data);
 }
 
 const struct iwl_fw_dump_desc iwl_dump_desc_assert = {
@@ -2248,27 +2291,40 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,
 			    bool monitor_only,
 			    unsigned int delay)
 {
+	struct iwl_fwrt_wk_data *wk_data;
+	unsigned long idx;
+
 	if (iwl_trans_dbg_ini_valid(fwrt->trans)) {
-		iwl_fw_free_dump_desc(fwrt);
+		iwl_fw_free_dump_desc(fwrt, &desc);
 		return 0;
 	}
 
-	/* use wks[0] since dump flow prior to ini does not need to support
-	 * consecutive triggers collection
+	/*
+	 * Check there is an available worker.
+	 * ffz return value is undefined if no zero exists,
+	 * so check against ~0UL first.
 	 */
-	if (test_and_set_bit(fwrt->dump.wks[0].idx, &fwrt->dump.active_wks))
+	if (fwrt->dump.active_wks == ~0UL)
+		return -EBUSY;
+
+	idx = ffz(fwrt->dump.active_wks);
+
+	if (idx >= IWL_FW_RUNTIME_DUMP_WK_NUM ||
+	    test_and_set_bit(fwrt->dump.wks[idx].idx, &fwrt->dump.active_wks))
 		return -EBUSY;
 
-	if (WARN_ON(fwrt->dump.desc))
-		iwl_fw_free_dump_desc(fwrt);
+	wk_data = &fwrt->dump.wks[idx];
+
+	if (WARN_ON(wk_data->dump_data.desc))
+		iwl_fw_free_dump_desc(fwrt, &wk_data->dump_data.desc);
+
+	wk_data->dump_data.desc = desc;
+	wk_data->dump_data.monitor_only = monitor_only;
 
 	IWL_WARN(fwrt, "Collecting data: trigger %d fired.\n",
 		 le32_to_cpu(desc->trig_desc.type));
 
-	fwrt->dump.desc = desc;
-	fwrt->dump.monitor_only = monitor_only;
-
-	schedule_delayed_work(&fwrt->dump.wks[0].wk, usecs_to_jiffies(delay));
+	schedule_delayed_work(&wk_data->wk, usecs_to_jiffies(delay));
 
 	return 0;
 }
@@ -2350,9 +2406,6 @@ int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt,
 	u32 occur, delay;
 	unsigned long idx;
 
-	if (test_bit(STATUS_GEN_ACTIVE_TRIGS, &fwrt->status))
-		return -EBUSY;
-
 	if (!iwl_fw_ini_trigger_on(fwrt, trig)) {
 		IWL_WARN(fwrt, "WRT: Trigger %d is not active, aborting dump\n",
 			 tp_id);
@@ -2447,7 +2500,8 @@ int iwl_fw_start_dbg_conf(struct iwl_fw_runtime *fwrt, u8 conf_id)
 		IWL_WARN(fwrt, "FW already configured (%d) - re-configuring\n",
 			 fwrt->dump.conf);
 
-#ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
+#if IS_ENABLED(CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES) && \
+	(IS_ENABLED(CPTCFG_IWLMVM) || IS_ENABLED(CPTCFG_IWLFMAC))
 	/* start default config marker cmd for syncing logs */
 	if (fwrt->trans->dbg_cfg.enable_timestamp_marker_cmd)
 		iwl_fw_trigger_timestamp(fwrt, 1);
@@ -2482,13 +2536,14 @@ IWL_EXPORT_SYMBOL(iwl_fw_start_dbg_conf);
 static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
 {
 	struct iwl_fw_dbg_params params = {0};
+	struct iwl_fwrt_dump_data *dump_data =
+		&fwrt->dump.wks[wk_idx].dump_data;
 
 	if (!test_bit(wk_idx, &fwrt->dump.active_wks))
 		return;
 
 	if (!test_bit(STATUS_DEVICE_ENABLED, &fwrt->trans->status)) {
 		IWL_ERR(fwrt, "Device is not enabled - cannot dump error\n");
-		iwl_fw_free_dump_desc(fwrt);
 		goto out;
 	}
 
@@ -2497,6 +2552,12 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
 		IWL_ERR(fwrt, "Skip fw error dump since bus is dead\n");
 		goto out;
 	}
+#ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
+	if (fwrt->trans->dbg_cfg.disable_wrt_dump) {
+		IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection disabled\n");
+		goto out;
+	}
+#endif
 
 	if (iwl_fw_dbg_stop_restart_recording(fwrt, &params, true)) {
 		IWL_ERR(fwrt, "Failed to stop DBGC recording, aborting dump\n");
@@ -2507,12 +2568,17 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
 	if (iwl_trans_dbg_ini_valid(fwrt->trans))
 		iwl_fw_error_ini_dump(fwrt, &fwrt->dump.wks[wk_idx].dump_data);
 	else
-		iwl_fw_error_dump(fwrt);
+		iwl_fw_error_dump(fwrt, &fwrt->dump.wks[wk_idx].dump_data);
 	IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection done\n");
 
 	iwl_fw_dbg_stop_restart_recording(fwrt, &params, false);
 
 out:
+	if (iwl_trans_dbg_ini_valid(fwrt->trans))
+		iwl_fw_error_dump_data_free(dump_data);
+	else
+		iwl_fw_free_dump_desc(fwrt, &dump_data->desc);
+
 	clear_bit(wk_idx, &fwrt->dump.active_wks);
 }
 
@@ -2672,12 +2738,7 @@ int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,
 {
 	int ret = 0;
 
-	/* if the FW crashed or not debug monitor cfg was given, there is
-	 * no point in changing the recording state
-	 */
-	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status) ||
-	    (!fwrt->trans->dbg.dest_tlv &&
-	     fwrt->trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))
+	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))
 		return 0;
 
 	if (fw_has_capa(&fwrt->fw->ucode_capa,
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
index 27bf376..ac2bd4f 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
@@ -98,17 +98,6 @@ struct iwl_fw_dbg_params {
 
 extern const struct iwl_fw_dump_desc iwl_dump_desc_assert;
 
-static inline void iwl_fw_free_dump_desc(struct iwl_fw_runtime *fwrt)
-{
-	if (fwrt->dump.desc != &iwl_dump_desc_assert)
-		kfree(fwrt->dump.desc);
-	fwrt->dump.desc = NULL;
-	fwrt->dump.lmac_err_id[0] = 0;
-	if (fwrt->smem_cfg.num_lmacs > 1)
-		fwrt->dump.lmac_err_id[1] = 0;
-	fwrt->dump.umac_err_id = 0;
-}
-
 int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,
 			    const struct iwl_fw_dump_desc *desc,
 			    bool monitor_only, unsigned int delay);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
index 5fe9820..fb28d5e 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
@@ -320,33 +320,6 @@ out:
 
 FWRT_DEBUGFS_WRITE_FILE_OPS(send_hcmd, 512);
 
-static ssize_t iwl_dbgfs_fw_dbg_domain_write(struct iwl_fw_runtime *fwrt,
-					     char *buf, size_t count)
-{
-	u32 new_domain;
-	long val;
-	int ret;
-
-	if (!iwl_trans_fw_running(fwrt->trans))
-		return -EIO;
-
-	ret = kstrtol(buf, 0, &val);
-	if (ret)
-		return ret;
-
-	new_domain = (u32)val;
-	if (new_domain != fwrt->trans->dbg.domains_bitmap) {
-		ret = iwl_dbg_tlv_gen_active_trigs(fwrt, new_domain);
-		if (ret)
-			return ret;
-
-		iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_PERIODIC,
-				       NULL);
-	}
-
-	return count;
-}
-
 static ssize_t iwl_dbgfs_fw_dbg_domain_read(struct iwl_fw_runtime *fwrt,
 					    size_t size, char *buf)
 {
@@ -354,7 +327,7 @@ static ssize_t iwl_dbgfs_fw_dbg_domain_read(struct iwl_fw_runtime *fwrt,
 			 fwrt->trans->dbg.domains_bitmap);
 }
 
-FWRT_DEBUGFS_READ_WRITE_FILE_OPS(fw_dbg_domain, 20);
+FWRT_DEBUGFS_READ_FILE_OPS(fw_dbg_domain, 20);
 
 void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
 			    struct dentry *dbgfs_dir)
@@ -362,5 +335,5 @@ void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
 	INIT_DELAYED_WORK(&fwrt->timestamp.wk, iwl_fw_timestamp_marker_wk);
 	FWRT_DEBUGFS_ADD_FILE(timestamp_marker, dbgfs_dir, 0200);
 	FWRT_DEBUGFS_ADD_FILE(send_hcmd, dbgfs_dir, 0200);
-	FWRT_DEBUGFS_ADD_FILE(fw_dbg_domain, dbgfs_dir, 0600);
+	FWRT_DEBUGFS_ADD_FILE(fw_dbg_domain, dbgfs_dir, 0400);
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.c b/drivers/net/wireless/intel/iwlwifi/fw/img.c
new file mode 100644
index 0000000..dec95d0
--- /dev/null
+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.c
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-2.0
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2019 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <[e-mail]>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2019 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#include "img.h"
+
+u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd)
+{
+	const struct iwl_fw_cmd_version *entry;
+	unsigned int i;
+
+	if (!fw->ucode_capa.cmd_versions ||
+	    !fw->ucode_capa.n_cmd_versions)
+		return IWL_FW_CMD_VER_UNKNOWN;
+
+	entry = fw->ucode_capa.cmd_versions;
+	for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {
+		if (entry->group == grp && entry->cmd == cmd)
+			return entry->cmd_ver;
+	}
+
+	return IWL_FW_CMD_VER_UNKNOWN;
+}
+EXPORT_SYMBOL_GPL(iwl_fw_lookup_cmd_ver);
+
+u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def)
+{
+	const struct iwl_fw_cmd_version *entry;
+	unsigned int i;
+
+	if (!fw->ucode_capa.cmd_versions ||
+	    !fw->ucode_capa.n_cmd_versions)
+		return def;
+
+	entry = fw->ucode_capa.cmd_versions;
+	for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {
+		if (entry->group == grp && entry->cmd == cmd) {
+			if (entry->notif_ver == IWL_FW_CMD_VER_UNKNOWN)
+				return def;
+			return entry->notif_ver;
+		}
+	}
+
+	return def;
+}
+EXPORT_SYMBOL_GPL(iwl_fw_lookup_notif_ver);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h
index 994880a..a8630bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/img.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.h
@@ -251,7 +251,7 @@ struct iwl_fw_dbg {
 struct iwl_fw {
 	u32 ucode_ver;
 
-	char fw_version[ETHTOOL_FWVERS_LEN];
+	char fw_version[64];
 
 	/* ucode images */
 	struct fw_img img[IWL_UCODE_TYPE_MAX];
@@ -313,22 +313,7 @@ iwl_get_ucode_image(const struct iwl_fw *fw, enum iwl_ucode_type ucode_type)
 	return &fw->img[ucode_type];
 }
 
-static inline u8 iwl_mvm_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd)
-{
-	const struct iwl_fw_cmd_version *entry;
-	unsigned int i;
-
-	if (!fw->ucode_capa.cmd_versions ||
-	    !fw->ucode_capa.n_cmd_versions)
-		return IWL_FW_CMD_VER_UNKNOWN;
-
-	entry = fw->ucode_capa.cmd_versions;
-	for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {
-		if (entry->group == grp && entry->cmd == cmd)
-			return entry->cmd_ver;
-	}
-
-	return IWL_FW_CMD_VER_UNKNOWN;
-}
+u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd);
 
+u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def);
 #endif  /* __iwl_fw_img_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
index 069c16e..20c6d86 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
@@ -65,13 +65,9 @@
 #include "img.h"
 #include "fw/api/debug.h"
 #include "fw/api/paging.h"
+#include "fw/api/power.h"
 #include "iwl-eeprom-parse.h"
-
-#ifndef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
-#define IWL_FW_DBG_DOMAIN		IWL_FW_INI_DOMAIN_ALWAYS_ON
-#else
-#define IWL_FW_DBG_DOMAIN		(fwrt->trans->dbg_cfg.FW_DBG_DOMAIN)
-#endif
+#include "fw/acpi.h"
 
 struct iwl_fw_runtime_ops {
 	int (*dump_start)(void *ctx);
@@ -101,8 +97,16 @@ struct iwl_fwrt_shared_mem_cfg {
  * @fw_pkt: packet received from FW
  */
 struct iwl_fwrt_dump_data {
-	struct iwl_fw_ini_trigger_tlv *trig;
-	struct iwl_rx_packet *fw_pkt;
+	union {
+		struct {
+			struct iwl_fw_ini_trigger_tlv *trig;
+			struct iwl_rx_packet *fw_pkt;
+		};
+		struct {
+			const struct iwl_fw_dump_desc *desc;
+			bool monitor_only;
+		};
+	};
 };
 
 /**
@@ -131,14 +135,6 @@ struct iwl_txf_iter_data {
 };
 
 /**
- * enum iwl_fw_runtime_status - fw runtime status flags
- * @STATUS_GEN_ACTIVE_TRIGS: generating active trigger list
- */
-enum iwl_fw_runtime_status {
-	STATUS_GEN_ACTIVE_TRIGS,
-};
-
-/**
  * struct iwl_fw_runtime - runtime data for firmware
  * @fw: firmware image
  * @cfg: NIC configuration
@@ -151,7 +147,6 @@ enum iwl_fw_runtime_status {
  * @smem_cfg: saved firmware SMEM configuration
  * @cur_fw_img: current firmware image, must be maintained by
  *	the driver by calling &iwl_fw_set_current_image()
- * @status: &enum iwl_fw_runtime_status
  * @dump: debug dump data
  */
 struct iwl_fw_runtime {
@@ -172,12 +167,8 @@ struct iwl_fw_runtime {
 	/* memory configuration */
 	struct iwl_fwrt_shared_mem_cfg smem_cfg;
 
-	unsigned long status;
-
 	/* debug */
 	struct {
-		const struct iwl_fw_dump_desc *desc;
-		bool monitor_only;
 		struct iwl_fwrt_wk_data wks[IWL_FW_RUNTIME_DUMP_WK_NUM];
 		unsigned long active_wks;
 
@@ -208,6 +199,14 @@ struct iwl_fw_runtime {
 	} timestamp;
 	bool tpc_enabled;
 #endif /* CPTCFG_IWLWIFI_DEBUGFS */
+#ifdef CONFIG_ACPI
+	struct iwl_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
+	u8 sar_chain_a_profile;
+	u8 sar_chain_b_profile;
+	struct iwl_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];
+	u32 geo_rev;
+	struct iwl_ppag_table_cmd ppag_table;
+#endif
 };
 
 void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 2afe682..e3d6277 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -88,7 +88,6 @@ enum iwl_device_family {
 	IWL_DEVICE_FAMILY_8000,
 	IWL_DEVICE_FAMILY_9000,
 	IWL_DEVICE_FAMILY_22000,
-	IWL_DEVICE_FAMILY_22560,
 	IWL_DEVICE_FAMILY_AX210,
 };
 
@@ -286,76 +285,38 @@ struct iwl_pwr_tx_backoff {
 };
 
 /**
- * struct iwl_csr_params
- *
- * @flag_sw_reset: reset the device
- * @flag_mac_clock_ready:
- *	Indicates MAC (ucode processor, etc.) is powered up and can run.
- *	Internal resources are accessible.
- *	NOTE:  This does not indicate that the processor is actually running.
- *	NOTE:  This does not indicate that device has completed
- *	       init or post-power-down restore of internal SRAM memory.
- *	       Use CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP as indication that
- *	       SRAM is restored and uCode is in normal operation mode.
- *	       This note is relevant only for pre 5xxx devices.
- *	NOTE:  After device reset, this bit remains "0" until host sets
- *	       INIT_DONE
- * @flag_init_done: Host sets this to put device into fully operational
- *	D0 power mode. Host resets this after SW_RESET to put device into
- *	low power mode.
- * @flag_mac_access_req: Host sets this to request and maintain MAC wakeup,
- *	to allow host access to device-internal resources. Host must wait for
- *	mac_clock_ready (and !GOING_TO_SLEEP) before accessing non-CSR device
- *	registers.
- * @flag_val_mac_access_en: mac access is enabled
- * @flag_master_dis: disable master
- * @flag_stop_master: stop master
- * @addr_sw_reset: address for resetting the device
- * @mac_addr0_otp: first part of MAC address from OTP
- * @mac_addr1_otp: second part of MAC address from OTP
- * @mac_addr0_strap: first part of MAC address from strap
- * @mac_addr1_strap: second part of MAC address from strap
- */
-struct iwl_csr_params {
-	u8 flag_sw_reset;
-	u8 flag_mac_clock_ready;
-	u8 flag_init_done;
-	u8 flag_mac_access_req;
-	u8 flag_val_mac_access_en;
-	u8 flag_master_dis;
-	u8 flag_stop_master;
-	u8 addr_sw_reset;
-	u32 mac_addr0_otp;
-	u32 mac_addr1_otp;
-	u32 mac_addr0_strap;
-	u32 mac_addr1_strap;
-};
-
-/**
  * struct iwl_cfg_trans - information needed to start the trans
  *
- * These values cannot be changed when multiple configs are used for a
- * single PCI ID, because they are needed before the HW REV or RFID
- * can be read.
+ * These values are specific to the device ID and do not change when
+ * multiple configs are used for a single device ID.  They values are
+ * used, among other things, to boot the NIC so that the HW REV or
+ * RFID can be read before deciding the remaining parameters to use.
  *
  * @base_params: pointer to basic parameters
  * @csr: csr flags and addresses that are different across devices
  * @device_family: the device family
  * @umac_prph_offset: offset to add to UMAC periphery address
+ * @xtal_latency: power up latency to get the xtal stabilized
+ * @extra_phy_cfg_flags: extra configuration flags to pass to the PHY
  * @rf_id: need to read rf_id to determine the firmware image
  * @use_tfh: use TFH
  * @gen2: 22000 and on transport operation
  * @mq_rx_supported: multi-queue rx support
+ * @integrated: discrete or integrated
+ * @low_latency_xtal: use the low latency xtal if supported
  */
 struct iwl_cfg_trans_params {
 	const struct iwl_base_params *base_params;
-	const struct iwl_csr_params *csr;
 	enum iwl_device_family device_family;
 	u32 umac_prph_offset;
+	u32 xtal_latency;
+	u32 extra_phy_cfg_flags;
 	u32 rf_id:1,
 	    use_tfh:1,
 	    gen2:1,
 	    mq_rx_supported:1,
+	    integrated:1,
+	    low_latency_xtal:1,
 	    bisr_workaround:1;
 };
 
@@ -410,7 +371,6 @@ struct iwl_fw_mon_regs {
  * @mac_addr_from_csr: read HW address from CSR registers
  * @features: hw features, any combination of feature_whitelist
  * @pwr_tx_backoffs: translation table between power limits and backoffs
- * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response
  * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response
  * @max_ht_ampdu_factor: the exponent of the max length of A-MPDU that the
  *	station can receive in HT
@@ -423,7 +383,6 @@ struct iwl_fw_mon_regs {
  * @smem_offset: offset from which the SMEM begins
  * @smem_len: the length of SMEM
  * @vht_mu_mimo_supported: VHT MU-MIMO support
- * @integrated: discrete or integrated
  * @cdb: CDB support
  * @nvm_type: see &enum iwl_nvm_type
  * @d3_debug_data_base_addr: base address where D3 debug data is stored
@@ -433,6 +392,8 @@ struct iwl_fw_mon_regs {
  * @uhb_supported: ultra high band channels supported
  * @min_256_ba_txq_size: minimum number of slots required in a TX queue which
  *	supports 256 BA aggregation
+ * @num_rbds: number of receive buffer descriptors to use
+ *	(only used for multi-queue capable devices)
  *
  * We enable the driver to be backward compatible wrt. hardware features.
  * API differences in uCode shouldn't be handled here but through TLVs
@@ -460,7 +421,6 @@ struct iwl_cfg {
 	u32 dccm2_len;
 	u32 smem_offset;
 	u32 smem_len;
-	u32 soc_latency;
 	u16 nvm_ver;
 	u16 nvm_calib_ver;
 	u32 rx_with_siso_diversity:1,
@@ -474,7 +434,6 @@ struct iwl_cfg {
 	    disable_dummy_notification:1,
 	    apmg_not_supported:1,
 	    vht_mu_mimo_supported:1,
-	    integrated:1,
 	    cdb:1,
 	    dbgc_supported:1,
 	    uhb_supported:1;
@@ -482,14 +441,13 @@ struct iwl_cfg {
 	u8 valid_rx_ant;
 	u8 non_shared_ant;
 	u8 nvm_hw_section_num;
-	u8 max_rx_agg_size;
 	u8 max_tx_agg_size;
 	u8 max_ht_ampdu_exponent;
 	u8 max_vht_ampdu_exponent;
 	u8 ucode_api_max;
 	u8 ucode_api_min;
+	u16 num_rbds;
 	u32 min_umac_error_event_table;
-	u32 extra_phy_cfg_flags;
 	u32 d3_debug_data_base_addr;
 	u32 d3_debug_data_length;
 	u32 min_txq_size;
@@ -499,12 +457,79 @@ struct iwl_cfg {
 	const struct iwl_fw_mon_regs mon_smem_regs;
 };
 
-extern const struct iwl_csr_params iwl_csr_v1;
-extern const struct iwl_csr_params iwl_csr_v2;
+#define IWL_CFG_ANY (~0)
+
+#define IWL_CFG_MAC_TYPE_PU		0x31
+#define IWL_CFG_MAC_TYPE_PNJ		0x32
+#define IWL_CFG_MAC_TYPE_TH		0x32
+#define IWL_CFG_MAC_TYPE_QU		0x33
+#define IWL_CFG_MAC_TYPE_QUZ		0x35
+#define IWL_CFG_MAC_TYPE_QNJ		0x36
+
+#define IWL_CFG_RF_TYPE_TH		0x105
+#define IWL_CFG_RF_TYPE_TH1		0x108
+#define IWL_CFG_RF_TYPE_JF2		0x105
+#define IWL_CFG_RF_TYPE_JF1		0x108
+
+#define IWL_CFG_RF_ID_TH		0x1
+#define IWL_CFG_RF_ID_TH1		0x1
+#define IWL_CFG_RF_ID_JF		0x3
+#define IWL_CFG_RF_ID_JF1		0x6
+#define IWL_CFG_RF_ID_JF1_DIV		0xA
+
+#define IWL_CFG_NO_160			0x0
+#define IWL_CFG_160			0x1
+
+#define IWL_CFG_CORES_BT		0x0
+#define IWL_CFG_CORES_BT_GNSS		0x5
+
+#define IWL_SUBDEVICE_RF_ID(subdevice)	((u16)((subdevice) & 0x00F0) >> 4)
+#define IWL_SUBDEVICE_NO_160(subdevice)	((u16)((subdevice) & 0x0100) >> 9)
+#define IWL_SUBDEVICE_CORES(subdevice)	((u16)((subdevice) & 0x1C00) >> 10)
+
+struct iwl_dev_info {
+	u16 device;
+	u16 subdevice;
+	u16 mac_type;
+	u16 rf_type;
+	u8 mac_step;
+	u8 rf_id;
+	u8 no_160;
+	u8 cores;
+	const struct iwl_cfg *cfg;
+	const char *name;
+};
 
 /*
  * This list declares the config structures for all devices.
  */
+extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg;
+extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;
+extern const char iwl9162_name[];
+extern const char iwl9260_name[];
+extern const char iwl9260_1_name[];
+extern const char iwl9270_name[];
+extern const char iwl9461_name[];
+extern const char iwl9462_name[];
+extern const char iwl9560_name[];
+extern const char iwl9162_160_name[];
+extern const char iwl9260_160_name[];
+extern const char iwl9270_160_name[];
+extern const char iwl9461_160_name[];
+extern const char iwl9462_160_name[];
+extern const char iwl9560_160_name[];
+extern const char iwl9260_killer_1550_name[];
+extern const char iwl9560_killer_1550i_name[];
+extern const char iwl9560_killer_1550s_name[];
+extern const char iwl_ax200_name[];
+extern const char iwl_ax200_killer_1650w_name[];
+extern const char iwl_ax200_killer_1650x_name[];
+
 #if IS_ENABLED(CPTCFG_IWLMVM)
 extern const struct iwl_cfg iwl7260_2ac_cfg;
 extern const struct iwl_cfg iwl7260_2ac_cfg_high_temp;
@@ -528,41 +553,15 @@ extern const struct iwl_cfg iwl8275_2ac_cfg;
 extern const struct iwl_cfg iwl4165_2ac_cfg;
 #endif /* IS_ENABLED(CPTCFG_IWLMVM) */
 #if IS_ENABLED(CPTCFG_IWLMVM) || IS_ENABLED(CPTCFG_IWLFMAC)
-extern const struct iwl_cfg iwl9160_2ac_cfg;
 extern const struct iwl_cfg iwl9260_2ac_cfg;
-extern const struct iwl_cfg iwl9260_2ac_160_cfg;
-extern const struct iwl_cfg iwl9260_killer_2ac_cfg;
-extern const struct iwl_cfg iwl9270_2ac_cfg;
-extern const struct iwl_cfg iwl9460_2ac_cfg;
-extern const struct iwl_cfg iwl9560_2ac_cfg;
-extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
-extern const struct iwl_cfg iwl9460_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9461_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
-extern const struct iwl_cfg iwl9462_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
+extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;
+extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;
+extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;
+extern const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg;
 extern const struct iwl_cfg iwl9560_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg_soc;
-extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc;
-extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc;
-extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc;
-extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk;
-extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;
-extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
-extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
-extern const struct iwl_cfg iwl22000_2ac_cfg_jf;
 extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;
 extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;
-extern const struct iwl_cfg iwl22000_2ax_cfg_hr;
 extern const struct iwl_cfg iwl_ax200_cfg_cc;
 extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
 extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
@@ -576,28 +575,14 @@ extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg killer1650x_2ax_cfg;
 extern const struct iwl_cfg killer1650w_2ax_cfg;
-extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0;
-extern const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0;
-extern const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0;
-extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0;
-extern const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0;
-extern const struct iwl_cfg iwl22000_2ax_cfg_jf;
-extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;
-extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;
-extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;
 extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;
 extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;
 extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;
 extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;
 extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;
-extern const struct iwl_cfg iwl_ax201_cfg_qnj_b0_gftc_a0;
+extern const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0;
 #endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */
 
 #endif /* __IWL_CONFIG_H__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h b/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h
index 5ed07e3..eeaa8cb 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-context-info.h
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,12 +64,12 @@
  *	the init done for driver command that configures several system modes