summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--libre/linux-libre-pae/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch4
-rw-r--r--libre/linux-libre-pae/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch (renamed from libre/linux-libre-pae/0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch)6
-rw-r--r--libre/linux-libre-pae/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch40
-rw-r--r--libre/linux-libre-pae/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch (renamed from libre/linux-libre-pae/0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch)6
-rw-r--r--libre/linux-libre-pae/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch (renamed from libre/linux-libre-pae/0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch)6
-rw-r--r--libre/linux-libre-pae/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch (renamed from libre/linux-libre-pae/0007-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch)6
-rw-r--r--libre/linux-libre-pae/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch (renamed from libre/linux-libre-pae/0008-drm-i915-gem-Try-to-flush-pending-unbind-events.patch)6
-rw-r--r--libre/linux-libre-pae/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch (renamed from libre/linux-libre-pae/0009-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch)6
-rw-r--r--libre/linux-libre-pae/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch (renamed from libre/linux-libre-pae/0010-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch)6
-rw-r--r--libre/linux-libre-pae/0010-drm-i915-Introduce-a-vma.kref.patch (renamed from libre/linux-libre-pae/0011-drm-i915-Introduce-a-vma.kref.patch)8
-rw-r--r--libre/linux-libre-pae/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch152
-rw-r--r--libre/linux-libre-pae/PKGBUILD44
13 files changed, 203 insertions, 91 deletions
diff --git a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 474946443..6cd286bec 100644
--- a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,4 +1,4 @@
-From c09059dc286ec8396ff6d235d6fcb509a3c9ad58 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
@@ -128,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/libre/linux-libre-pae/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 6eead55b5..27ab937e7 100644
--- a/libre/linux-libre-pae/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/libre/linux-libre-pae/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,4 +1,4 @@
-From 5ab82a437113456735093bcfe709a71a9a5c7ea6 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
@@ -38,5 +38,5 @@ index b0b7eca1754e..de62a6dc4e73 100644
/* same thing for QuZ... */
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch b/libre/linux-libre-pae/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
index 99b3142b0..4229fa5d5 100644
--- a/libre/linux-libre-pae/0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
+++ b/libre/linux-libre-pae/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
@@ -1,7 +1,7 @@
-From 33083113cc94448919443871567cb9bfd61e76df 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 04/11] drm: Remove PageReserved manipulation from
+Subject: [PATCH 03/11] drm: Remove PageReserved manipulation from
drm_pci_alloc
drm_pci_alloc/drm_pci_free are very thin wrappers around the core dma
@@ -88,5 +88,5 @@ index a86a3ab2771c..235729f4aadb 100644
/**
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch b/libre/linux-libre-pae/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
deleted file mode 100644
index 5af211fc2..000000000
--- a/libre/linux-libre-pae/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6ba9e64f96ff87b42e77e6deacaa793f5f0e0ce3 Mon Sep 17 00:00:00 2001
-From: Dan Moulding <dmoulding@me.com>
-Date: Tue, 28 Jan 2020 02:31:07 -0700
-Subject: [PATCH 03/11] iwlwifi: mvm: Do not require PHY_SKU NVM section for
- 3168 devices
-
-The logic for checking required NVM sections was recently fixed in
-commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168
-devices"). However, with that fixed the else is now taken for 3168
-devices and within the else clause there is a mandatory check for the
-PHY_SKU section. This causes the parsing to fail for 3168 devices.
-
-The PHY_SKU section is really only mandatory for the IWL_NVM_EXT
-layout (the phy_sku parameter of iwl_parse_nvm_data is only used when
-the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section
-check so that it's only mandatory for IWL_NVM_EXT.
-
-Fixes: b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices")
-Signed-off-by: Dan Moulding <dmoulding@me.com>
----
- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-index 46128a2a9c6e..e98ce380c7b9 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-@@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
- }
-
- /* PHY_SKU section is mandatory in B0 */
-- if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
-+ if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT &&
-+ !mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
- IWL_ERR(mvm,
- "Can't parse phy_sku in B0, empty sections\n");
- return NULL;
---
-2.25.1
-
diff --git a/libre/linux-libre-pae/0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch b/libre/linux-libre-pae/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
index 29ab99fe8..aba7922fa 100644
--- a/libre/linux-libre-pae/0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch
+++ b/libre/linux-libre-pae/0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
@@ -1,7 +1,7 @@
-From dff3c906fd230a07369d85d501bb11f8b840f4e6 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 05/11] drm/i915: Serialise i915_active_acquire() with
+Subject: [PATCH 04/11] drm/i915: Serialise i915_active_acquire() with
__active_retire()
As __active_retire() does it's final atomic_dec() under the
@@ -75,5 +75,5 @@ index a19e7d89bc8a..378b52d1ab74 100644
mutex_unlock(&ref->mutex);
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch b/libre/linux-libre-pae/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
index c51edfc5d..cc39701b3 100644
--- a/libre/linux-libre-pae/0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
+++ b/libre/linux-libre-pae/0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
@@ -1,7 +1,7 @@
-From 92294ec84e60045e4ab3613a2b6a597b35eb48e7 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 06/11] drm/i915/gem: Take runtime-pm wakeref prior to
+Subject: [PATCH 05/11] drm/i915/gem: Take runtime-pm wakeref prior to
unbinding
Some machines require ACPI for runtime resume, and ACPI is quite kmalloc
@@ -126,5 +126,5 @@ index 3f07948ea4da..ed2436db5dd2 100644
}
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0007-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch b/libre/linux-libre-pae/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
index fe79b6953..41131a09f 100644
--- a/libre/linux-libre-pae/0007-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+++ b/libre/linux-libre-pae/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
@@ -1,7 +1,7 @@
-From d9f4e03a3469b8c1fce1fd5ef59708a504e5ba02 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 07/11] drm/i915/gem: Avoid parking the vma as we unbind
+Subject: [PATCH 06/11] 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
@@ -59,5 +59,5 @@ index ed2436db5dd2..739543812422 100644
spin_lock(&obj->vma.lock);
}
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0008-drm-i915-gem-Try-to-flush-pending-unbind-events.patch b/libre/linux-libre-pae/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
index 3768889ae..49df07f9e 100644
--- a/libre/linux-libre-pae/0008-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
+++ b/libre/linux-libre-pae/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
@@ -1,7 +1,7 @@
-From 73845f795c73b341d331ba4ea581745828b03232 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 08/11] drm/i915/gem: Try to flush pending unbind events
+Subject: [PATCH 07/11] 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
@@ -60,5 +60,5 @@ index 739543812422..85b12228c2cf 100644
return ret;
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0009-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch b/libre/linux-libre-pae/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
index c3913790d..8fdf4b1cd 100644
--- a/libre/linux-libre-pae/0009-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
+++ b/libre/linux-libre-pae/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
@@ -1,7 +1,7 @@
-From 6d98cb966611949e5c98b5a7cee4da0cab594d5f 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 09/11] drm/i915/gem: Reinitialise the local list before
+Subject: [PATCH 08/11] drm/i915/gem: Reinitialise the local list before
repeating
As we may start the loop again, we require our local list of i915_vma
@@ -30,5 +30,5 @@ index 85b12228c2cf..c2c025c4f4ad 100644
if (ret == -EAGAIN && flags & I915_GEM_OBJECT_UNBIND_ACTIVE) {
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0010-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch b/libre/linux-libre-pae/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
index 96e3d8810..024402d2b 100644
--- a/libre/linux-libre-pae/0010-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
+++ b/libre/linux-libre-pae/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
@@ -1,7 +1,7 @@
-From 291a8a531808a32b25a7649495e835f7b0257fd3 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 10/11] drm/i915: Add a simple is-bound check before unbinding
+Subject: [PATCH 09/11] 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.
@@ -37,5 +37,5 @@ index c2c025c4f4ad..83eed642cbcd 100644
ret = -EBUSY;
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0011-drm-i915-Introduce-a-vma.kref.patch b/libre/linux-libre-pae/0010-drm-i915-Introduce-a-vma.kref.patch
index ce0f800fb..0dfeff145 100644
--- a/libre/linux-libre-pae/0011-drm-i915-Introduce-a-vma.kref.patch
+++ b/libre/linux-libre-pae/0010-drm-i915-Introduce-a-vma.kref.patch
@@ -1,7 +1,7 @@
-From a3cef69920ccaab9833aeae47f03d2eaad841d96 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 11/11] drm/i915: Introduce a vma.kref
+Subject: [PATCH 10/11] 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).
@@ -50,7 +50,7 @@ index 688c49a24f32..bd1e2c12de63 100644
}
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
-index 29b2077b73d2..d226e55df8b2 100644
+index e81c2726f7fd..3d8f00d40d42 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -161,7 +161,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj,
@@ -248,5 +248,5 @@ index 465932813bc5..ce1db908ad69 100644
#define assert_vma_held(vma) dma_resv_assert_held((vma)->resv)
--
-2.25.1
+2.25.2
diff --git a/libre/linux-libre-pae/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch b/libre/linux-libre-pae/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch
new file mode 100644
index 000000000..dc24aeaf5
--- /dev/null
+++ b/libre/linux-libre-pae/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/11] 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/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD
index 1fb2bbfb4..8c28dd798 100644
--- a/libre/linux-libre-pae/PKGBUILD
+++ b/libre/linux-libre-pae/PKGBUILD
@@ -9,7 +9,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
_replacesoldmodules=() # '%' gets replaced with kernel suffix
pkgbase=linux-libre-pae
-pkgver=5.5.7
+pkgver=5.5.11
pkgrel=1
pkgdesc='Linux-libre PAE (physical address extension)'
url='https://linux-libre.fsfla.org/'
@@ -38,15 +38,15 @@ source=(
# extracted patches from Arch Linux kernel sources
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- 0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
- 0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
- 0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch
- 0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
- 0007-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
- 0008-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
- 0009-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
- 0010-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
- 0011-drm-i915-Introduce-a-vma.kref.patch
+ 0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
+ 0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
+ 0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
+ 0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+ 0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
+ 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=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -54,7 +54,7 @@ validpgpkeys=(
)
sha512sums=('187368a8fb4e04acfd7d18a024d6cdbc2841bcc06dcfbc3a053706e8512c3e3f573755228347c11bd791b296ec60eb2d67d5075ece2aef234a847e72f2b3e746'
'SKIP'
- '9e80c81ba21ce46422f6c9ee94772d5ea0152bb1176444a824c54c740fb58430ffaa1adadce8ecf1647d58fcadaabf6c67938999bf359b9ead4ed9141bc49ba7'
+ '4dc99404a8e993e844ae73b9149de7e4e7eda7d13b2acde897d2a03ab83bed3a94d13c8ced76bd1108998d24c9d72e2d67077414eef2df681783771d1ebcaac3'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -65,17 +65,17 @@ sha512sums=('187368a8fb4e04acfd7d18a024d6cdbc2841bcc06dcfbc3a053706e8512c3e3f573
'9b8298a195857108453042090bfebf7736b373b177077926bda7091bc490aeda1872fb51cf126e021eae97096973dfab6d6c858bebf5d565a9df4ffe28d2df2f'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
- 'c817bab02fa530560b9d3d968242e5491e315286a4a1dc9490299dc78806c516831da79422d6ab56df0652b216565a80f10d6dacdcbcbbbe258d31455cc98add'
- 'a9a7c0510d9b1c724f17d47e33925b7dadb529ed57cbdc80120af8884f43190b6bfc7698416d23651eae64c4fed393481715b3d87b528b71d8c03b4141fcca46'
- 'a26d886d6e3e394e7d6a247154120d4c2ba06e9e75385959bbf284c9577da07aee05b718ed06a56d56bec5a726c8013709c560cd280e78525d50dc95fb84bdad'
- '7395fc2202c76ffff815bb6f6f54a1dc57ffb46b0b25ecf89effe6787dd66bd273dee29dd8636b3160c31fd0bfef0a99bd55f4080e6e075e862640b422c15e2e'
- 'bd68f5d64a6bb502db8b5b96d2823493cda1a5b3c8bd0639b25ae3e47e999fc02dfd3bffa32e8fd710355d9ca0ec5bfe19421158cdc488c2b47b5177caf0f5c8'
- '3b71120a93c53eb6308bb55b76ec0c1ccd8b3b385d4ce4062cb4f657b84e6bfe28765eb8042f6f8f35860899ee66633a4f59999513bfdc2968b5317215e36347'
- 'd3fbbd202efd72ebac265b89fb8c9c3772fd49dcd6d43910555d55ec96ea5df8c0b03bfe00e2677787643cfc0f547eb49d638774742471ec650067751cecc5e2'
- '80928026ceeb29bf29a2b2909768ddced2f13c522f6496fa4717a490f087bdd45ae0131cbce37ec227d16071ce562477ca322305a68e8606fc28e3d35759af26'
- '855de25a3df963506d3cce588e422a4cf24b2cc04c950647b0002f796a921d17ebc49d95cb94c38713e70b6385a91278943df3c707091607a1fd118f519dae87'
- 'f31a943f9942427e79d646186611325e6dd9aa6b100eb869b531e04c2fe934503ff6cc7496ffa8644eeb3bb13ec82e1898def5311f29bb4d286f758dfd848b9a'
- '9dcde0dd16222ecb09c83025ecc13bb529c78289878c5abb38283a4b10ffe181abc9447423641a271c3f8db79d9bb540eea369cd0108e4948067cf4356bd329e')
+ '70858920f0ac56651347f979d5add5323b4ea5ff38e802ee43146b40d4b26ca61903d44b8763a0e9ba080017839ba3fb2f67ec15694c2fba0fd726411e8a96e9'
+ '420a201f16c6e293135dae81e645817e0e4d94fe885035226437c43cdce3db192e3ffebeb423a0304f7c909b2061e85af1299c7451d15d36106e319d9ddb4acf'
+ '33d558d4fdad651de93208d0e9a1c6d62f9c6b85791a24443d1b2ceb6c08da425507f3f025161d399c823b852880ef61761e71f39d22f30f03a66a8c23c36ad5'
+ '3fa77a47394d5e52e0b3c6c96a8c15e755f617aaa2b68758f211103489551b6fe1dfa7082ca32fc0fbc29a9d6c70cb2c419b9484d9e67839bed7182f862bd039'
+ 'e75f9062f9bf4c686ced979c4789ea82788aec14f56976ee4c6213ed2af4fd6a1ce1c01c26a71f7afff9a7bc2a2051e366be6c458e413e6fff154b580202e5a0'
+ '19b28696117425e13a94730c0f2edabe2d9ff741095af34c1aeee95f59f9efe9e7cb6124b61b1b31d0d0730f9431281c8d0040db0fc15a80d8028ebe29562cf4'
+ '5d802cc0843ee0d66aca4b57987db2cbeaa27939322244171313ca2d01cc3591ddbbf774edbb69a61830c28560f1af3b740e86495cec600118ee565bc5784536'
+ '5f7af141438bced1d0f3d858fd66d68356a979c5a3eefb1f0a21a00aabdf54d84b2b558c3e1002b6287529ccb760eebbdc9922df50e46154c807ee9e6da9e73a'
+ '8e61e45373fc72877a21caf2b980cdffe36c0086a55656352043ddb11c2394ab634dea0b111454758b67b515ab6070596e227f4ae02fd7c4475d412cfce5d30b'
+ '28abc78b9f63b4fe3c32779d5306a59c37ff4b8868060cb71ba4521aebcb6266509f51fb5dda17eeac4ab89d0f72e63cba1e9e5938d0fc9db00f202b9a1b845f'
+ '42efbf9f7502c9470042f31c9abed0f5590c837f31a4664554fa1829e51093390c1a97bdfb50d1f88ca6bba47e15df9fbb206817a9708ebc30ef469e16a851b4')
_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
_replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")