PKGBUILD: Upgrading to 5.2.10_rt4. Dropping (now included) iwlwifi related patches again.

5 files changed, 15 insertions, 404 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b52375fbc8d..21722d2c3c9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-rt
-	pkgver = 5.2.9_rt3
+	pkgver = 5.2.10_rt4
 	pkgrel = 1
 	url = https://git.archlinux.org/linux.git/log/?h=v
 	arch = x86_64
@@ -11,36 +11,32 @@ pkgbase = linux-rt
 	makedepends = libelf
 	makedepends = xmlto
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patch-5.2.9-rt3.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patch-5.2.9-rt3.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patch-5.2.10-rt4.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patch-5.2.10-rt4.patch.sign
 	source = config
 	source = 60-linux-rt.hook
 	source = 90-linux-rt.hook
 	source = linux-rt.preset
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 	source = 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
-	source = 0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-	source = 0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
 	validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73
 	validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
-	sha256sums = b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6
+	sha256sums = 6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49
 	sha256sums = SKIP
-	sha256sums = bcac9b78dc4bd0a399b68248bcfb16e89d36a13e0e0f4255b89d66bd607ce546
+	sha256sums = 2f00aa1463069dab042e72ff454c1f5317841fee0d841f4619644b4f40b4ed0d
 	sha256sums = SKIP
-	sha256sums = 20fe9b75deddc48578ab1b5ce8bb7c82f73c11b6a610fcce9f704f2cda36a11d
+	sha256sums = cf4ef9d0b61efb7a27215fc4ec77a8a07ef67d9cf53a1ab14a07882a6c7613f9
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 75aa8dd708ca5a0137fbf7cddc9cafefe6aac6b8e0638c06c156d412d05af4bc
 	sha256sums = 187fa8d9a6c5777a8930dcecfafdd9d6e9095d4bf96ec060e756fb7c6a88b74d
-	sha256sums = fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020
-	sha256sums = ba36bb1acb9e20578ec67e6f84a75fd928b71745533fb445248fe4b9a65c046b
 
 pkgname = linux-rt
 	pkgdesc = The Linux-rt kernel and modules
diff --git a/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch b/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
deleted file mode 100644
index 59d743deccaa..000000000000
--- a/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f6f6b798c7330d7851fee4bbe835c3954886fc3f Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Wed, 3 Jul 2019 11:10:49 +0300
-Subject: [PATCH 3/4] iwlwifi: mvm: disable TX-AMSDU on older NICs
-
-On older NICs, we occasionally see issues with A-MSDU support,
-where the commands in the FIFO get confused and then we see an
-assert EDC because the next command in the FIFO isn't TX.
-
-We've tried to isolate this issue and understand where it comes
-from, but haven't found any errors in building the A-MSDU in
-software.
-
-At least for now, disable A-MSDU support on older hardware so
-that users can use it again without fearing the assert.
-
-This fixes https://bugzilla.kernel.org/show_bug.cgi?id=203315.
-
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Acked-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-index fdbabca0280e..3a076e5e319f 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-@@ -468,7 +468,19 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
- 	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);
- 	ieee80211_hw_set(hw, BUFF_MMPDU_TXQ);
- 	ieee80211_hw_set(hw, STA_MMPDU_TXQ);
--	ieee80211_hw_set(hw, TX_AMSDU);
-+	/*
-+	 * On older devices, enabling TX A-MSDU occasionally leads to
-+	 * something getting messed up, the command read from the FIFO
-+	 * gets out of sync and isn't a TX command, so that we have an
-+	 * assert EDC.
-+	 *
-+	 * It's not clear where the bug is, but since we didn't used to
-+	 * support A-MSDU until moving the mac80211 iTXQs, just leave it
-+	 * for older devices. We also don't see this issue on any newer
-+	 * devices.
-+	 */
-+	if (mvm->cfg->device_family >= IWL_DEVICE_FAMILY_9000)
-+		ieee80211_hw_set(hw, TX_AMSDU);
- 	ieee80211_hw_set(hw, TX_FRAG_LIST);
- 
- 	if (iwl_mvm_has_tlc_offload(mvm)) {
--- 
-2.22.0
-
diff --git a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch b/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
deleted file mode 100644
index e1da9044ce33..000000000000
--- a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From 704d8031fcbac3407abbe242793476c1b243bd4c Mon Sep 17 00:00:00 2001
-From: Haim Dreyfuss <haim.dreyfuss@intel.com>
-Date: Wed, 27 Feb 2019 16:43:45 +0200
-Subject: [PATCH 4/5] iwlwifi: Add support for SAR South Korea limitation
-
-South Korea is adding a more strict SAR limit called "Limb SAR".
-Currently, WGDS SAR offset group 3 is not used (not mapped to any country).
-In order to be able to comply with South Korea new restriction:
-- OEM will use WGDS SAR offset group 3 to South Korea limitation.
-- OEM will change WGDS revision to 1 (currently latest revision is 0)
-	to notify that Korea Limb SAR applied.
-- Driver will read the WGDS table and pass the values to FW (as usual)
-- Driver will pass to FW an indication that Korea Limb SAR is applied
-	in case table revision is 1.
-
-Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
----
- drivers/net/wireless/intel/iwlwifi/fw/acpi.c  | 28 ++++++----
- drivers/net/wireless/intel/iwlwifi/fw/acpi.h  |  5 +-
- .../net/wireless/intel/iwlwifi/fw/api/power.h | 12 ++++
- drivers/net/wireless/intel/iwlwifi/fw/file.h  |  3 +
- drivers/net/wireless/intel/iwlwifi/mvm/fw.c   | 55 ++++++++++++++-----
- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h  |  1 +
- 6 files changed, 76 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-index 405038ce98d6..7573af2d88ce 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-@@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object);
- 
- union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 					 union acpi_object *data,
--					 int data_size)
-+					 int data_size, int *tbl_rev)
- {
- 	int i;
- 	union acpi_object *wifi_pkg;
-@@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 	/*
- 	 * We need at least two packages, one for the revision and one
- 	 * for the data itself.  Also check that the revision is valid
--	 * (i.e. it is an integer set to 0).
-+	 * (i.e. it is an integer smaller than 2, as we currently support only
-+	 * 2 revisions).
- 	 */
- 	if (data->type != ACPI_TYPE_PACKAGE ||
- 	    data->package.count < 2 ||
- 	    data->package.elements[0].type != ACPI_TYPE_INTEGER ||
--	    data->package.elements[0].integer.value != 0) {
-+	    data->package.elements[0].integer.value > 1) {
- 		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");
- 		return ERR_PTR(-EINVAL);
- 	}
- 
-+	*tbl_rev = data->package.elements[0].integer.value;
-+
- 	/* loop through all the packages to find the one for WiFi */
- 	for (i = 1; i < data->package.count; i++) {
- 		union acpi_object *domain;
-@@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc)
- {
- 	union acpi_object *wifi_pkg, *data;
- 	u32 mcc_val;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
--	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,
-+					 &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
- {
- 	union acpi_object *data, *wifi_pkg;
- 	u64 dflt_pwr_limit;
-+	int tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);
- 	if (IS_ERR(data)) {
-@@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
- 	}
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,
--					 ACPI_SPLC_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg) ||
-+					 ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0 ||
- 	    wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) {
- 		dflt_pwr_limit = 0;
- 		goto out_free;
-@@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);
- int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
- {
- 	union acpi_object *wifi_pkg, *data;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
--	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,
-+					 &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-index f5704e16643f..991a23450999 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-@@ -97,7 +97,7 @@
- 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 data_size, int *tbl_rev);
- 
- /**
-  * iwl_acpi_get_mcc - read MCC from ACPI, if available
-@@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
- 
- static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 						       union acpi_object *data,
--						       int data_size)
-+						       int data_size,
-+						       int *tbl_rev)
- {
- 	return ERR_PTR(-ENOENT);
- }
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-index 01f003c6cff9..f195db398bed 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-@@ -419,14 +419,26 @@ struct iwl_per_chain_offset_group {
- 	struct iwl_per_chain_offset hb;
- } __packed; /* PER_CHAIN_LIMIT_OFFSET_GROUP_S_VER_1 */
- 
-+/**
-+ * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd.
-+ * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
-+ * @table: offset profile per band.
-+ */
-+struct iwl_geo_tx_power_profiles_cmd_v1 {
-+	__le32 ops;
-+	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
-+} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */
-+
- /**
-  * struct iwl_geo_tx_power_profile_cmd - struct for GEO_TX_POWER_LIMIT cmd.
-  * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
-  * @table: offset profile per band.
-+ * @table_revision: BIOS table revision.
-  */
- struct iwl_geo_tx_power_profiles_cmd {
- 	__le32 ops;
- 	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
-+	__le32 table_revision;
- } __packed; /* GEO_TX_POWER_LIMIT */
- 
- /**
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
-index de9243d30135..a74f34a8dffb 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
-@@ -286,6 +286,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
-  *	SCAN_OFFLOAD_PROFILES_QUERY_RSP_S.
-  * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of
-  *	STA_CONTEXT_DOT11AX_API_S
-+ * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar
-+ *	version tables.
-  *
-  * @NUM_IWL_UCODE_TLV_API: number of bits used
-  */
-@@ -318,6 +320,7 @@ enum iwl_ucode_tlv_api {
- 	IWL_UCODE_TLV_API_MBSSID_HE		= (__force iwl_ucode_tlv_api_t)52,
- 	IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE	= (__force iwl_ucode_tlv_api_t)53,
- 	IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,
-+	IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
- 
- 	NUM_IWL_UCODE_TLV_API
- #ifdef __CHECKER__
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-index 5af9959d05e5..8892707050d5 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-@@ -682,15 +682,15 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *table, *data;
- 	bool enabled;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_WRDS_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_WRDS_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -719,15 +719,15 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *data;
- 	bool enabled;
--	int i, n_profiles, ret;
-+	int i, n_profiles, ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_EWRD_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_EWRD_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -778,7 +778,7 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
- static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *data;
--	int i, j, ret;
-+	int i, j, ret, tbl_rev;
- 	int idx = 1;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_WGDS_METHOD);
-@@ -786,12 +786,13 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_WGDS_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev > 1) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
- 
-+	mvm->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;
-@@ -894,15 +895,29 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
- {
- 	struct iwl_geo_tx_power_profiles_resp *resp;
- 	int ret;
-+	u16 len;
-+	void *data;
-+	struct iwl_geo_tx_power_profiles_cmd geo_cmd;
-+	struct iwl_geo_tx_power_profiles_cmd_v1 geo_cmd_v1;
-+	struct iwl_host_cmd cmd;
- 
--	struct iwl_geo_tx_power_profiles_cmd geo_cmd = {
--		.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE),
--	};
--	struct iwl_host_cmd cmd = {
-+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
-+		geo_cmd.ops =
-+			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
-+		len = sizeof(geo_cmd);
-+		data = &geo_cmd;
-+	} else {
-+		geo_cmd_v1.ops =
-+			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
-+		len = sizeof(geo_cmd_v1);
-+		data = &geo_cmd_v1;
-+	}
-+
-+	cmd = (struct iwl_host_cmd){
- 		.id =  WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT),
--		.len = { sizeof(geo_cmd), },
-+		.len = { len, },
- 		.flags = CMD_WANT_SKB,
--		.data = { &geo_cmd },
-+		.data = { data },
- 	};
- 
- 	if (!iwl_mvm_sar_geo_support(mvm))
-@@ -969,6 +984,16 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
- 					i, j, value[1], value[2], value[0]);
- 		}
- 	}
-+
-+	cmd.table_revision = cpu_to_le32(mvm->geo_rev);
-+
-+	if (!fw_has_api(&mvm->fw->ucode_capa,
-+		       IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
-+		return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0,
-+				sizeof(struct iwl_geo_tx_power_profiles_cmd_v1),
-+				&cmd);
-+	}
-+
- 	return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, sizeof(cmd), &cmd);
- }
- 
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-index 88af1f0ba3f0..ed8fc9a9204c 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-@@ -1184,6 +1184,7 @@ struct iwl_mvm {
- #ifdef CONFIG_ACPI
- 	struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
- 	struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];
-+	u32 geo_rev;
- #endif
- };
- 
--- 
-2.22.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 0619bb9ddcc2..739e9ab93689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 #pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-rt       # Build kernel with a different name
-_pkgver=5.2.9
-_rtpatchver=rt3
+_pkgver=5.2.10
+_rtpatchver=rt4
 pkgver="${_pkgver}_${_rtpatchver}"
 pkgrel=1
 arch=('x86_64')
@@ -29,8 +29,6 @@ source=(
   ${pkgbase}.preset   # standard config files for mkinitcpio ramdisk
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
   0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
-  0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-  0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -40,18 +38,16 @@ validpgpkeys=(
   '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73'  # Steven Rostedt
   'E644E2F1D45FA0B2EAA02F33109F098506FF0B14'  # Thomas Gleixner
 )
-sha256sums=('b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6'
+sha256sums=('6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49'
             'SKIP'
-            'bcac9b78dc4bd0a399b68248bcfb16e89d36a13e0e0f4255b89d66bd607ce546'
+            '2f00aa1463069dab042e72ff454c1f5317841fee0d841f4619644b4f40b4ed0d'
             'SKIP'
-            '20fe9b75deddc48578ab1b5ce8bb7c82f73c11b6a610fcce9f704f2cda36a11d'
+            'cf4ef9d0b61efb7a27215fc4ec77a8a07ef67d9cf53a1ab14a07882a6c7613f9'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '75aa8dd708ca5a0137fbf7cddc9cafefe6aac6b8e0638c06c156d412d05af4bc'
-            '187fa8d9a6c5777a8930dcecfafdd9d6e9095d4bf96ec060e756fb7c6a88b74d'
-            'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020'
-            'ba36bb1acb9e20578ec67e6f84a75fd928b71745533fb445248fe4b9a65c046b')
+            '187fa8d9a6c5777a8930dcecfafdd9d6e9095d4bf96ec060e756fb7c6a88b74d')
 
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-ARCH}
diff --git a/config b/config
index dea9735d54ce..ad1dcc06487a 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.2.9 Kernel Configuration
+# Linux/x86 5.2.10 Kernel Configuration
 #
 
 #