diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch | 152 | ||||
| -rw-r--r-- | 0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch | 58 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
4 files changed, 11 insertions, 229 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-rc - pkgver = 5.5.14rc1 + pkgver = 5.5.15rc1 pkgrel = 2 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.14-rc1.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.14-rc1.sign - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.13.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.13.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.15-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.15-rc1.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.14.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.14.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,13 +24,11 @@ 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 - source = 0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 3957619b036c50667d86775c039073d6005df188e34a0af2471b24751b2faed1 + sha256sums = 1edd03a9ba8e98ce3ba7463d6979f20bdba0ee5d75456208453eeb0ac738eef4 sha256sums = SKIP - sha256sums = 1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2 + sha256sums = 4c529e4e100df11887e0a789d0e46d7ffd053e68a0380b6173a3a2799192ef6a sha256sums = SKIP sha256sums = cefc4c5853c1df6595380fb7259289f5850662cd7aa9600dce114e4e525114e1 sha256sums = 62b087dd679e096a18611648308c05c896c587b488631fef4df51524dc4d2b6c @@ -43,8 +41,6 @@ pkgbase = linux-rc sha256sums = 70f0e78e7335cb713c06a1e0b886d4c8edebf2048c588f00d12e95c930483cd9 sha256sums = 6d305596dc9be86a65b9200bf69c001a8e4ddd41cad471289c3c769b5530c359 sha256sums = a4a10bcb55fc1991200c3835b359b81f5e3e858f5be77c6b9eaef033885c8bfc - sha256sums = a578a12239e39728c63038db6539abcee422bed4d04ee5bf99f6ba5be8884a9a - sha256sums = 4e59212ab1951d1064132cf54c6531d9245a987648de2cad3ca448ae183a53c7 pkgname = linux-rc pkgdesc = The release candidate kernel and modules 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 deleted file mode 100644 index 0f9611ca3c39..000000000000 --- a/0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch +++ /dev/null @@ -1,152 +0,0 @@ -From c596b143fad6e865f3f9de19c10c4b02998371f0 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/13] 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.26.0 - diff --git a/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch b/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch deleted file mode 100644 index dddd63697f8f..000000000000 --- a/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9ff88052dbb54cdb7b05d91561b3540056c96e83 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 30 Mar 2020 22:37:11 +0200 -Subject: [PATCH 12/13] Revert "bpf: Provide better register bounds after jmp32 - instructions" - -This reverts commit 581738a681b6faae5725c2555439189ca81c0f1f. ---- - kernel/bpf/verifier.c | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index 7d530ce8719d..79f38a281390 100644 ---- a/kernel/bpf/verifier.c -+++ b/kernel/bpf/verifier.c -@@ -1034,17 +1034,6 @@ static void __reg_bound_offset(struct bpf_reg_state *reg) - reg->umax_value)); - } - --static void __reg_bound_offset32(struct bpf_reg_state *reg) --{ -- u64 mask = 0xffffFFFF; -- struct tnum range = tnum_range(reg->umin_value & mask, -- reg->umax_value & mask); -- struct tnum lo32 = tnum_cast(reg->var_off, 4); -- struct tnum hi32 = tnum_lshift(tnum_rshift(reg->var_off, 32), 32); -- -- reg->var_off = tnum_or(hi32, tnum_intersect(lo32, range)); --} -- - /* Reset the min/max bounds of a register */ - static void __mark_reg_unbounded(struct bpf_reg_state *reg) - { -@@ -5677,10 +5666,6 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg, - /* We might have learned some bits from the bounds. */ - __reg_bound_offset(false_reg); - __reg_bound_offset(true_reg); -- if (is_jmp32) { -- __reg_bound_offset32(false_reg); -- __reg_bound_offset32(true_reg); -- } - /* Intersecting with the old var_off might have improved our bounds - * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), - * then new var_off is (0; 0x7f...fc) which improves our umax. -@@ -5790,10 +5775,6 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg, - /* We might have learned some bits from the bounds. */ - __reg_bound_offset(false_reg); - __reg_bound_offset(true_reg); -- if (is_jmp32) { -- __reg_bound_offset32(false_reg); -- __reg_bound_offset32(true_reg); -- } - /* Intersecting with the old var_off might have improved our bounds - * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), - * then new var_off is (0; 0x7f...fc) which improves our umax. --- -2.26.0 - @@ -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=13 +_minor=14 ### on initial release comment this out and set to =1 _minorc=$((_minor+1)) #_minorc=1 @@ -40,16 +40,14 @@ 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 -0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('3957619b036c50667d86775c039073d6005df188e34a0af2471b24751b2faed1' +sha256sums=('1edd03a9ba8e98ce3ba7463d6979f20bdba0ee5d75456208453eeb0ac738eef4' 'SKIP' - '1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2' + '4c529e4e100df11887e0a789d0e46d7ffd053e68a0380b6173a3a2799192ef6a' 'SKIP' 'cefc4c5853c1df6595380fb7259289f5850662cd7aa9600dce114e4e525114e1' '62b087dd679e096a18611648308c05c896c587b488631fef4df51524dc4d2b6c' @@ -61,9 +59,7 @@ sha256sums=('3957619b036c50667d86775c039073d6005df188e34a0af2471b24751b2faed1' '8da1046091242178219de63805bf08f2d8bfe72874ab5f2b616249d7b87227ea' '70f0e78e7335cb713c06a1e0b886d4c8edebf2048c588f00d12e95c930483cd9' '6d305596dc9be86a65b9200bf69c001a8e4ddd41cad471289c3c769b5530c359' - 'a4a10bcb55fc1991200c3835b359b81f5e3e858f5be77c6b9eaef033885c8bfc' - 'a578a12239e39728c63038db6539abcee422bed4d04ee5bf99f6ba5be8884a9a' - '4e59212ab1951d1064132cf54c6531d9245a987648de2cad3ca448ae183a53c7') + 'a4a10bcb55fc1991200c3835b359b81f5e3e858f5be77c6b9eaef033885c8bfc') _kernelname=${pkgbase#linux} |