summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-03-24 14:13:15 -0400
committergraysky2020-03-24 14:13:43 -0400
commit8eee70e7616936856cd0c3c3232dcc14d5419471 (patch)
tree634fe02c1ed39ca51e79df92a97b97f46739f990
parent15b889bcdede5c6eacc7bb43ede7f51126a89860 (diff)
downloadaur-8eee70e7616936856cd0c3c3232dcc14d5419471.tar.gz
Update to 5.5.12rc1-1
-rw-r--r--.SRCINFO36
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch4
-rw-r--r--0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch4
-rw-r--r--0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch4
-rw-r--r--0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch4
-rw-r--r--0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch4
-rw-r--r--0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch4
-rw-r--r--0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch4
-rw-r--r--0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch4
-rw-r--r--0010-drm-i915-Introduce-a-vma.kref.patch4
-rw-r--r--0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch152
-rw-r--r--PKGBUILD29
13 files changed, 206 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b00ef85e6f3..37d8666208c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.5.11rc1
+ pkgver = 5.5.12rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -9,10 +9,10 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.11-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.11-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.10.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.10.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.12-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.12-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.11.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.11.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -24,23 +24,25 @@ pkgbase = linux-rc
source = 0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
source = 0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
source = 0010-drm-i915-Introduce-a-vma.kref.patch
+ source = 0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 63a2c8796eb796c1c69db041a75af86aa8748964939dab442d9d79be9a81dbc8
+ sha256sums = c59a7777c86d74e3a23aef455aeada20196c1a118cb23ef2c0237d519cebd4fa
sha256sums = SKIP
- sha256sums = e31d8e35d7d9766fa912b8cebcfaaa8fc6dd07413a467641d264fd13cf20fc23
+ sha256sums = a547afcfd14d9253b27230ed88b4f8a9569bcf85ad6bad8c299deab1e4d2f42e
sha256sums = SKIP
sha256sums = a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868
- sha256sums = 66a5998393dbadc770866164910f7cf5a6ea3581fc186e600eba4a38df6a6e56
- sha256sums = f84da7259bbbd4037dd64eaad65f52c00359c1f788cd74c9967a28256a766fa1
- sha256sums = 0805b20d65e7837ae144ce6d480155ed46d94b9258e4ccc52214e339e24dd533
- sha256sums = 5f3f711df751e903dfc79941529163adb631bd44012f30c11235e0efac5f69c9
- sha256sums = 4e130e45adac5add735dd06790ec9a49a3ab3cc246e7e70415e2c6f3b82a8cd0
- sha256sums = 1d3752cacb94b4e6e98842deb52bdb4ce8aaab93996ab63c9a2ee17b931d8780
- sha256sums = 0fbf9372a817cb6792c71c304948d79f17f08f9e4eb8393f5d69ba399ef0343e
- sha256sums = 8d82f3e5940bc2dc93b1978a3825777a078af46c391a860393ef0d01e1a16f37
- sha256sums = a3e3e9cb97c81067d5b6290e4a61514ec7f09aa7d39070a3b4f2088371459fe6
- sha256sums = 82bb562401324ee57807a573ebb9a30b8e14e74f6a82298c69fdedf9e07859e1
+ sha256sums = 566bc20e90afbac7d3836e5ccf32eca927858dda45b18431c6c91d46ae494c70
+ sha256sums = e40d89048087c139359cf12798d5cbab3b5077e903d7b1cb78e6a5269d92013f
+ sha256sums = 00496b895c63f6fd73e292ead6634de4e7a8187fa0bd11eb5700ec6ef1a3c259
+ sha256sums = 1a92cefbc60cd3bbc404267f6a42329e25ca0265bbff92b84f42ef668edef85f
+ sha256sums = 8e171645648ce9c853663751da4163e53e052763a8a90a6a127118b2b50d613c
+ sha256sums = 29ab130f003665ba4a9f0051e4b28ded7c58ecc642f6f2fc937b74c20bafb00a
+ sha256sums = fb5f39f4cb9f1f356d078d909c479774d717174aa07c94eb98c66f0889ddf719
+ sha256sums = 5121de6344e3c44b5bd37ba6ac22f2c2d42632abf5d2d678f2e1a74a5cdfe5ca
+ sha256sums = 1b8896c1944b549dd32e27439faef82dc2366f26916c445e6950ea3a764cc8a9
+ sha256sums = 220800dfa73834230ee0c321120ab18cf14a304a437c7f985f582758c5853e67
+ sha256sums = c00c5b6f45cb92512eaead6ae01d5b8c07b91cc8a83ae6ef961d6a6ce3ea90be
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index f9813b7eb95..5e4e01500f7 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From cd55bb3d8ee4c2b64d67da7cbe7116754cf6012e Mon Sep 17 00:00:00 2001
+From ad5b7493cad06d923901a363940f4b6b1014bd7c Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 01/11] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/12] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 198c7163859..dd3ae14054e 100644
--- a/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From 4ba9f5444ba21a670066cf25fae5ece241094a24 Mon Sep 17 00:00:00 2001
+From 4c617291d0cbe8b6ec15d645a28d915ac03e4b86 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 24 Dec 2019 06:16:39 +0100
-Subject: [PATCH 02/11] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+Subject: [PATCH 02/12] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Commit 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from
trans_pcie_alloc to probe") refactored the cfg mangling. Unfortunately,
diff --git a/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch b/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
index 1355513c329..dcfa4e2e3bb 100644
--- a/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
+++ b/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
@@ -1,7 +1,7 @@
-From 686cb427b261df01cefbd4fadfdde442fd136052 Mon Sep 17 00:00:00 2001
+From a157f668e6ec89b9c34238e09c7b30839b9d9ffe Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 2 Feb 2020 17:16:31 +0000
-Subject: [PATCH 03/11] drm: Remove PageReserved manipulation from
+Subject: [PATCH 03/12] drm: Remove PageReserved manipulation from
drm_pci_alloc
drm_pci_alloc/drm_pci_free are very thin wrappers around the core dma
diff --git a/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch b/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
index 7e977848257..404eeabdb3a 100644
--- a/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
+++ b/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
@@ -1,7 +1,7 @@
-From 2e70052bc15b93a2984d7a3e463e55ca3f18b569 Mon Sep 17 00:00:00 2001
+From 82e980a8fda88e473e2038e729603fb55e8750ea Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 5 Dec 2019 18:33:32 +0000
-Subject: [PATCH 04/11] drm/i915: Serialise i915_active_acquire() with
+Subject: [PATCH 04/12] drm/i915: Serialise i915_active_acquire() with
__active_retire()
As __active_retire() does it's final atomic_dec() under the
diff --git a/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch b/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
index 1432c4022ce..417e41709fe 100644
--- a/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
+++ b/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
@@ -1,7 +1,7 @@
-From e4c42bd073db08db2f3a01382aa5073dfb871f02 Mon Sep 17 00:00:00 2001
+From 649b995d6f87e0ddd5c36fbf869ea7a258c46380 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 3 Dec 2019 10:13:46 +0000
-Subject: [PATCH 05/11] drm/i915/gem: Take runtime-pm wakeref prior to
+Subject: [PATCH 05/12] drm/i915/gem: Take runtime-pm wakeref prior to
unbinding
Some machines require ACPI for runtime resume, and ACPI is quite kmalloc
diff --git a/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch b/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
index 0a99419fade..85870db17dc 100644
--- a/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+++ b/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
@@ -1,7 +1,7 @@
-From 79e0b89416f08594e4de623bd7abb344c73a4eb7 Mon Sep 17 00:00:00 2001
+From 4e14c86bb1575e16cfa0da8e7b670497b8c95657 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 3 Dec 2019 15:50:32 +0000
-Subject: [PATCH 06/11] drm/i915/gem: Avoid parking the vma as we unbind
+Subject: [PATCH 06/12] drm/i915/gem: Avoid parking the vma as we unbind
In order to avoid keeping a reference on the i915_vma (which is long
overdue!) we have to coordinate all the possible lifetimes and only use
diff --git a/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch b/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
index 2dc3ed48e34..14bb38c1b18 100644
--- a/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
+++ b/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
@@ -1,7 +1,7 @@
-From a9aa912dce23628748d441177032ff9a5b96d949 Mon Sep 17 00:00:00 2001
+From 846865567a7570b072f881618335035aef030098 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 4 Dec 2019 12:35:56 +0000
-Subject: [PATCH 07/11] drm/i915/gem: Try to flush pending unbind events
+Subject: [PATCH 07/12] drm/i915/gem: Try to flush pending unbind events
If we cannot handle a vma within the unbind loop, try to flush the
pending events (i915_vma_parked, i915_vm_release) and try again. This
diff --git a/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch b/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
index 74b68c442bf..8a8a4d53a2a 100644
--- a/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
+++ b/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
@@ -1,7 +1,7 @@
-From 9109f28c248016fc52b976fb96b2adc7e9cc790d Mon Sep 17 00:00:00 2001
+From 595c07526855cabbbc0bc82a3a28c1ac0eceae0e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 5 Dec 2019 13:29:12 +0000
-Subject: [PATCH 08/11] drm/i915/gem: Reinitialise the local list before
+Subject: [PATCH 08/12] drm/i915/gem: Reinitialise the local list before
repeating
As we may start the loop again, we require our local list of i915_vma
diff --git a/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch b/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
index 2520782598c..4f606b8bf30 100644
--- a/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
+++ b/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
@@ -1,7 +1,7 @@
-From ae537a08bb3931e6087e95ecb59043bb13ce76bb Mon Sep 17 00:00:00 2001
+From bb1cfe5bf25e128d6f8df0bd9ecc999cb58164a7 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 22 Dec 2019 21:02:54 +0000
-Subject: [PATCH 09/11] drm/i915: Add a simple is-bound check before unbinding
+Subject: [PATCH 09/12] drm/i915: Add a simple is-bound check before unbinding
Only acquire the various atomic references required to unbind the vma if
we do need to unbind the vma.
diff --git a/0010-drm-i915-Introduce-a-vma.kref.patch b/0010-drm-i915-Introduce-a-vma.kref.patch
index 8baba93d677..2f4349e89e5 100644
--- a/0010-drm-i915-Introduce-a-vma.kref.patch
+++ b/0010-drm-i915-Introduce-a-vma.kref.patch
@@ -1,7 +1,7 @@
-From 3b13f04a0be3eafa7b3a3be2ab068f2636c44be2 Mon Sep 17 00:00:00 2001
+From f9263854415cb857cef239b6d6ae5f05066e4731 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 22 Dec 2019 21:02:55 +0000
-Subject: [PATCH 10/11] drm/i915: Introduce a vma.kref
+Subject: [PATCH 10/12] drm/i915: Introduce a vma.kref
Start introducing a kref on i915_vma in order to protect the vma unbind
(i915_gem_object_unbind) from a parallel destruction (i915_vma_parked).
diff --git a/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch b/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch
new file mode 100644
index 00000000000..b76ac5790f2
--- /dev/null
+++ b/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch
@@ -0,0 +1,152 @@
+From ec701fa986108fae10bee7cfe269e12210521c5f Mon Sep 17 00:00:00 2001
+From: Golan Ben Ami <golan.ben.ami@intel.com>
+Date: Wed, 18 Mar 2020 08:12:54 +0200
+Subject: [PATCH 11/12] iwlwifi: don't send GEO_TX_POWER_LIMIT if no wgds table
+
+The GEO_TX_POWER_LIMIT command was sent although
+there is no wgds table, so the fw got wrong SAR values
+from the driver.
+
+Fix this by avoiding sending the command if no wgds
+tables are available.
+
+Signed-off-by: Golan Ben Ami <golan.ben.ami@intel.com>
+Fixes: 39c1a9728f93 ("iwlwifi: refactor the SAR tables from mvm to acpi")
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Tested-By: Jonathan McDowell <noodles@earth.li>
+Tested-by: Len Brown <len.brown@intel.com>
+---
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 14 ++++++++------
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 14 ++++++++------
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 9 ++++++++-
+ 3 files changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+index 48d375a86d86..ba2aff3af0fe 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
++++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+@@ -6,7 +6,7 @@
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2017 Intel Deutschland GmbH
+- * Copyright (C) 2019 Intel Corporation
++ * Copyright (C) 2019 - 2020 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
+@@ -27,7 +27,7 @@
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Intel Deutschland GmbH
+- * Copyright (C) 2019 Intel Corporation
++ * Copyright (C) 2019 - 2020 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+@@ -491,13 +491,13 @@ int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt,
+ }
+ 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 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;
++ return -EOPNOTSUPP;
+
+ ret = iwl_sar_get_wgds_table(fwrt);
+ if (ret < 0) {
+@@ -505,7 +505,7 @@ void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+ "Geo SAR BIOS table invalid or unavailable. (%d)\n",
+ ret);
+ /* we don't fail if the table is not available */
+- return;
++ return -ENOENT;
+ }
+
+ BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES * ACPI_WGDS_NUM_BANDS *
+@@ -530,5 +530,7 @@ void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+ i, j, value[1], value[2], value[0]);
+ }
+ }
++
++ return 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 4a6e8262974b..5590e5cc8fbb 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
++++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+@@ -6,7 +6,7 @@
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2017 Intel Deutschland GmbH
+- * Copyright(c) 2018 - 2019 Intel Corporation
++ * Copyright(c) 2018 - 2020 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
+@@ -27,7 +27,7 @@
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Intel Deutschland GmbH
+- * Copyright(c) 2018 - 2019 Intel Corporation
++ * Copyright(c) 2018 - 2020 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+@@ -171,8 +171,9 @@ 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);
++int 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)
+@@ -243,9 +244,10 @@ static inline int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt,
+ return -ENOENT;
+ }
+
+-static inline void iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
+- struct iwl_per_chain_offset_group *table)
++static inline int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,
++ struct iwl_per_chain_offset_group *table)
+ {
++ return -ENOENT;
+ }
+
+ #endif /* CONFIG_ACPI */
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+index c09624d8d7ee..81b7da5815eb 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+@@ -749,10 +749,17 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
+ u16 cmd_wide_id = WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT);
+ union geo_tx_power_profiles_cmd cmd;
+ u16 len;
++ int ret;
+
+ cmd.geo_cmd.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_SET_TABLES);
+
+- iwl_sar_geo_init(&mvm->fwrt, cmd.geo_cmd.table);
++ ret = iwl_sar_geo_init(&mvm->fwrt, cmd.geo_cmd.table);
++ /*
++ * It is a valid scenario to not support SAR, or miss wgds table,
++ * but in that case there is no need to send the command.
++ */
++ if (ret)
++ return 0;
+
+ cmd.geo_cmd.table_revision = cpu_to_le32(mvm->fwrt.geo_rev);
+
+--
+2.25.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 8c6ad8da25b..b0c99a87b2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.5
_major=5.5
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=10
+_minor=11
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -40,27 +40,28 @@ source=(
0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
0010-drm-i915-Introduce-a-vma.kref.patch
-
+0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('63a2c8796eb796c1c69db041a75af86aa8748964939dab442d9d79be9a81dbc8'
+sha256sums=('c59a7777c86d74e3a23aef455aeada20196c1a118cb23ef2c0237d519cebd4fa'
'SKIP'
- 'e31d8e35d7d9766fa912b8cebcfaaa8fc6dd07413a467641d264fd13cf20fc23'
+ 'a547afcfd14d9253b27230ed88b4f8a9569bcf85ad6bad8c299deab1e4d2f42e'
'SKIP'
'a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868'
- '66a5998393dbadc770866164910f7cf5a6ea3581fc186e600eba4a38df6a6e56'
- 'f84da7259bbbd4037dd64eaad65f52c00359c1f788cd74c9967a28256a766fa1'
- '0805b20d65e7837ae144ce6d480155ed46d94b9258e4ccc52214e339e24dd533'
- '5f3f711df751e903dfc79941529163adb631bd44012f30c11235e0efac5f69c9'
- '4e130e45adac5add735dd06790ec9a49a3ab3cc246e7e70415e2c6f3b82a8cd0'
- '1d3752cacb94b4e6e98842deb52bdb4ce8aaab93996ab63c9a2ee17b931d8780'
- '0fbf9372a817cb6792c71c304948d79f17f08f9e4eb8393f5d69ba399ef0343e'
- '8d82f3e5940bc2dc93b1978a3825777a078af46c391a860393ef0d01e1a16f37'
- 'a3e3e9cb97c81067d5b6290e4a61514ec7f09aa7d39070a3b4f2088371459fe6'
- '82bb562401324ee57807a573ebb9a30b8e14e74f6a82298c69fdedf9e07859e1')
+ '566bc20e90afbac7d3836e5ccf32eca927858dda45b18431c6c91d46ae494c70'
+ 'e40d89048087c139359cf12798d5cbab3b5077e903d7b1cb78e6a5269d92013f'
+ '00496b895c63f6fd73e292ead6634de4e7a8187fa0bd11eb5700ec6ef1a3c259'
+ '1a92cefbc60cd3bbc404267f6a42329e25ca0265bbff92b84f42ef668edef85f'
+ '8e171645648ce9c853663751da4163e53e052763a8a90a6a127118b2b50d613c'
+ '29ab130f003665ba4a9f0051e4b28ded7c58ecc642f6f2fc937b74c20bafb00a'
+ 'fb5f39f4cb9f1f356d078d909c479774d717174aa07c94eb98c66f0889ddf719'
+ '5121de6344e3c44b5bd37ba6ac22f2c2d42632abf5d2d678f2e1a74a5cdfe5ca'
+ '1b8896c1944b549dd32e27439faef82dc2366f26916c445e6950ea3a764cc8a9'
+ '220800dfa73834230ee0c321120ab18cf14a304a437c7f985f582758c5853e67'
+ 'c00c5b6f45cb92512eaead6ae01d5b8c07b91cc8a83ae6ef961d6a6ce3ea90be')
_kernelname=${pkgbase#linux}