summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2021-12-13 06:29:01 -0500
committergraysky2021-12-13 06:29:01 -0500
commit3b5cb391d3ceed9f31c89dcf178e6aba68e3125a (patch)
treef0fcbc028d9b86993863caa528539e76c4f911b3
parentbbe72d3052f8a57e16e1288eeef23f003c03c2c8 (diff)
downloadaur-3b5cb391d3ceed9f31c89dcf178e6aba68e3125a.tar.gz
Update to 5.15.8rc1-1
-rw-r--r--.SRCINFO36
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch6
-rw-r--r--0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch (renamed from 0005-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch)6
-rw-r--r--0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch47
-rw-r--r--0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch (renamed from 0007-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch)10
-rw-r--r--0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch55
-rw-r--r--0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch60
-rw-r--r--0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch108
-rw-r--r--0006-lg-laptop-Recognize-more-models.patch39
-rw-r--r--0008-Arch-Linux-kernel-v5.15.3-arch1.patch25
-rw-r--r--PKGBUILD28
-rw-r--r--config15
12 files changed, 210 insertions, 225 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22cc7a3438f4..13f721959b77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.15.4rc1
+ pkgver = 5.15.8rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -12,28 +12,30 @@ pkgbase = linux-rc
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.4-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.4-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.3.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.3.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.8-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.8-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.7.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.7.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
- source = 0005-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
- source = 0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch
- source = 0007-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ source = 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+ source = 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ source = 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+ source = 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+ source = 0006-lg-laptop-Recognize-more-models.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 50162f3ed36160ec1cf8616fcf29cc84922a5bc2679ad5426a514e5855d9d9d8183ad68c8f62f910cf9d949d4618e61e481a6ed044e1aa0f8ca343925b3adbf7
+ b2sums = c662ee0d1884d32836f734ddc7c035e9e1db400ecf66a7a4f4a7623b7cfc784d1618697408c5fac31c8b098f748d5c46ba35e761960568d8e31dcf0585ed728b
b2sums = SKIP
- b2sums = 93379b68cfe85a979a7a39179e2bf622702d5e4f7a1d5a5bace1e8d11583d77966bce5b0e61f047fcb40c6c2be401e7725b3aa01e602c6ef4ac045a24ebcc2cd
+ b2sums = 66894c8d2001bccfbfc9d31d2f68fef64826c088676df94136a4dcf158962c146cc668490d342c2e8bf914903be69f5b4fbc1cd264b844a8d966059bf34fac6f
b2sums = SKIP
- b2sums = 13e22007dfd81dcfcd9a159881ddc5f92a600d6ed5f581c0826c5e2b2823b6a7ba0628e09960b8146d3a9bb669ee5ba7b119bd7ecb6cad06a76e6511bf533a44
- b2sums = 90e2c56062fc6ab9f914d82ed3b5ff3cc9fef2293ffdedb51ab2776441b1d2ff46b69af8e6c97c80346449123f309fe4bcdeac2fe95a5f8e201f41b9d29943f3
- b2sums = 812f8ff0b7cdd21e6b1b9337b789619a992bd3053d3c47533d76ec4e84d5ca4c340252415cf4cc616ac4cf9887849c541d1e8e370fddcb7c5705532a6c8b1e78
- b2sums = 60699efcb88f8643dda1dad5a104c7b2780f8233c82d89bc1916c14fd808febdff4536b84e32d790137455d922d18d86d8d56c7671955b26c068a8f0272ed1a6
- b2sums = 47fe5e2eb9e2ceeabad141d2c631d22527f7068d81d673e0bdee2a7070986b3d1d75001a953a0e3501eb9b623c66700464af73153ad6f998f20587e58fc7820b
- b2sums = 7ac6e6886d578a46d22c089ccd4b99eca3515263c4f1aa92a2f85a1836c72b096560145ad4ee1c94c2c1c2b747afd299fc6b9c73d9076c364401d80413f69fe4
+ b2sums = 4b6759fae0abc440292b310aed12bd12bbfbc172f968572ee9b8a9164c844b3f2a12f81b1fdf5ed86d75403f0c5be5d57933292e22c2973ef14f481bf78a3f7e
+ b2sums = 4e8607f63c08ccb80e27de7af7eda49fb74212f2900d62d0b1dc67100c720ed6f4bd5423d71198a790e92bdc49998d78dd8bbb1cf25f449ada38c00ae1318467
+ b2sums = 6d52e045fef48f882d8a1dd96aff084e46f28b0bf719f664030f210a5f236b0d8ea3a4151597ccc7a7d404d39a5f965a4bdbe18c9cbaea7687355ec0515908f9
+ b2sums = 186cbcbe54d3135aadc704eeaba4453f30fbc495262c9f753c53ba25e895c71da25c432fe716795f1ca69199718d3920bda937889f84430c5db2795ae61440d9
+ b2sums = 716bce9038188e4f49f2ac9fcd399a1f8d1730af4442ff028977522e9d42994f25e22f4d41238d43ab73afc896e7b177a4d581b7f40af36a3e41e3a6ac2afa46
+ b2sums = c0f4b5f99c96a482c224043f0b901458dc9bbf5ae87f4456bc3553a608c8222b4ca7bb05bd9c71a674465ba6a09b27fa2762f4a458f6be49793a5a9952910a95
+ b2sums = 9a0763fee4e54076c721a0d0de53ed152f6ba24381e35d81ba023ce576ed89568be3b5afb56d489609a897971b9db6fa86646ae98be744dbff3b33b35b66cebb
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 98f1ffb4128c..c984dd0f5147 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 47d2645e7e3964621caea15feae6b806bd63ad92 Mon Sep 17 00:00:00 2001
+From 0948f6ce6d898c598f8fe88240954e578fdc8387 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 1/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -150,5 +150,5 @@ index 6b2e3ca7ee99..0253002184f1 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.34.0
+2.34.1
diff --git a/0005-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch b/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
index c4bbb9b06bd8..d7f5fc8e35b7 100644
--- a/0005-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+++ b/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
@@ -1,7 +1,7 @@
-From 6edac03ec96354bac75a0240ee1f848836a2fb19 Mon Sep 17 00:00:00 2001
+From 0bb6e4f104167b1e283269b46f3bbd30b2d979a7 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Thu, 18 Nov 2021 22:53:31 +0100
-Subject: [PATCH 5/8] PCI: Add more NVIDIA controllers to the MSI masking quirk
+Subject: [PATCH 2/7] PCI: Add more NVIDIA controllers to the MSI masking quirk
For: https://bugs.archlinux.org/task/72734
For: https://bugs.archlinux.org/task/72777
@@ -20,5 +20,5 @@ index 208fa03acdda..7fdb7e9c2e12 100644
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab9, nvidia_ion_ahci_fixup);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0d88, nvidia_ion_ahci_fixup);
--
-2.34.0
+2.34.1
diff --git a/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch b/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
deleted file mode 100644
index 17c0787f7956..000000000000
--- a/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 150424b14ca70f807b083aaae52db9eb072ba2e4 Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sun, 7 Nov 2021 11:35:43 -0600
-Subject: [PATCH 2/8] staging: r8188eu: Fix breakage introduced when 5G code
- was removed
-
-In commit 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions
-and code"), two entries were removed from RTW_ChannelPlanMap[], but not replaced
-with zeros. The position within this table is important, thus the patch broke
-systems operating in regulatory domains osted later than entry 0x13 in the table.
-Unfortunately, the FCC entry comes before that point and most testers did not see
-this problem.
-
-Reported-and-tested-by: Zameer Manji <zmanji@gmail.com>
-Reported-by: kernel test robot <lkp@intel.com>
-Fixes: 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions and code")
-Cc: Stable <stable@vger.kernel.org> # v5.5+
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-For: https://bugs.archlinux.org/task/72659
-For: https://bugs.archlinux.org/task/72760
----
- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-index 5a472a4954b0..e5c907ac10fc 100644
---- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-@@ -104,6 +104,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
- {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */
- {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */
- {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
-+ {0x00}, /* 0x13 */
- {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */
- {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */
- {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
-@@ -115,6 +116,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
- {0x00}, /* 0x1C, */
- {0x00}, /* 0x1D, */
- {0x00}, /* 0x1E, */
-+ {0x00}, /* 0x1F, */
- /* 0x20 ~ 0x7F , New Define ===== */
- {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */
- {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
---
-2.34.0
-
diff --git a/0007-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch b/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
index 8d667bb92604..38f3e917a30a 100644
--- a/0007-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+++ b/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
@@ -1,7 +1,7 @@
-From aba4d743dacede0c1a7f4ed56a9f949e3349c833 Mon Sep 17 00:00:00 2001
+From 32803dc7c2ffc29db15a46034d818f6e6c5775ef Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajaygargnsit@gmail.com>
Date: Tue, 12 Oct 2021 19:26:53 +0530
-Subject: [PATCH 7/8] iommu: intel: do deep dma-unmapping, to avoid
+Subject: [PATCH 3/7] iommu: intel: do deep dma-unmapping, to avoid
kernel-flooding.
Origins at :
@@ -71,10 +71,10 @@ Link: https://lore.kernel.org/linux-iommu/20211012135653.3852-1-ajaygargnsit@gma
1 file changed, 2 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index d75f59ae28e6..485a8ea71394 100644
+index 78f8c8e6803e..d8da48a91ba3 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
-@@ -5090,6 +5090,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
+@@ -5092,6 +5092,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
gather->freelist = domain_unmap(dmar_domain, start_pfn,
last_pfn, gather->freelist);
@@ -84,5 +84,5 @@ index d75f59ae28e6..485a8ea71394 100644
dmar_domain->max_addr = iova;
--
-2.34.0
+2.34.1
diff --git a/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch b/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
new file mode 100644
index 000000000000..830f505cbb8f
--- /dev/null
+++ b/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
@@ -0,0 +1,55 @@
+From aa7300919d0656a001fe0d526508b8c5958e7630 Mon Sep 17 00:00:00 2001
+From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+Date: Thu, 18 Nov 2021 21:18:01 -0800
+Subject: [PATCH 4/7] cpufreq: intel_pstate: ITMT support for overclocked
+ system
+
+On systems with overclocking enabled, CPPC Highest Performance can be
+hard coded to 0xff. In this case even if we have cores with different
+highest performance, ITMT can't be enabled as the current implementation
+depends on CPPC Highest Performance.
+
+On such systems we can use MSR_HWP_CAPABILITIES maximum performance field
+when CPPC.Highest Performance is 0xff.
+
+Due to legacy reasons, we can't solely depend on MSR_HWP_CAPABILITIES as
+in some older systems CPPC Highest Performance is the only way to identify
+different performing cores.
+
+Reported-by: Michael Larabel <Michael@MichaelLarabel.com>
+Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+---
+ drivers/cpufreq/intel_pstate.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index e15c3bc17a55..8a2c6b58b652 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -335,6 +335,8 @@ static void intel_pstste_sched_itmt_work_fn(struct work_struct *work)
+
+ static DECLARE_WORK(sched_itmt_work, intel_pstste_sched_itmt_work_fn);
+
++#define CPPC_MAX_PERF U8_MAX
++
+ static void intel_pstate_set_itmt_prio(int cpu)
+ {
+ struct cppc_perf_caps cppc_perf;
+@@ -345,6 +347,14 @@ static void intel_pstate_set_itmt_prio(int cpu)
+ if (ret)
+ return;
+
++ /*
++ * On some systems with overclocking enabled, CPPC.highest_perf is hardcoded to 0xff.
++ * In this case we can't use CPPC.highest_perf to enable ITMT.
++ * In this case we can look at MSR_HWP_CAPABILITIES bits [8:0] to decide.
++ */
++ if (cppc_perf.highest_perf == CPPC_MAX_PERF)
++ cppc_perf.highest_perf = HWP_HIGHEST_PERF(READ_ONCE(all_cpu_data[cpu]->hwp_cap_cached));
++
+ /*
+ * The priorities can be set regardless of whether or not
+ * sched_set_itmt_support(true) has been called and it is valid to
+--
+2.34.1
+
diff --git a/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
new file mode 100644
index 000000000000..e8b1c3036b51
--- /dev/null
+++ b/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
@@ -0,0 +1,60 @@
+From a6d4fb4f5e7fe795d9e3b28b261a0f86f1026d03 Mon Sep 17 00:00:00 2001
+From: Kiran K <kiran.k@intel.com>
+Date: Wed, 13 Oct 2021 13:35:11 +0530
+Subject: [PATCH 5/7] Bluetooth: btintel: Fix bdaddress comparison with garbage
+ value
+
+Intel Read Verision(TLV) data is parsed into a local structure variable
+and it contains a field for bd address. Bd address is returned only in
+bootloader mode and hence bd address in TLV structure needs to be validated
+only if controller is present in boot loader mode.
+
+Signed-off-by: Kiran K <kiran.k@intel.com>
+Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com>
+---
+ drivers/bluetooth/btintel.c | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
+index f1705b46fc88..b9055a3e61ed 100644
+--- a/drivers/bluetooth/btintel.c
++++ b/drivers/bluetooth/btintel.c
+@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
+ if (ver->img_type == 0x03) {
+ btintel_clear_flag(hdev, INTEL_BOOTLOADER);
+ btintel_check_bdaddr(hdev);
+- }
+-
+- /* If the OTP has no valid Bluetooth device address, then there will
+- * also be no valid address for the operational firmware.
+- */
+- if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) {
+- bt_dev_info(hdev, "No device address configured");
+- set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
++ } else {
++ /*
++ * Check for valid bd address in boot loader mode. Device
++ * will be marked as unconfigured if empty bd address is
++ * found.
++ */
++ if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) {
++ bt_dev_info(hdev, "No device address configured");
++ set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
++ }
+ }
+
+ btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");
+@@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)
+ goto exit_error;
+ }
+
++ /* memset ver_tlv to start with clean state as few fields are exclusive
++ * to bootloader mode and are not populated in operational mode
++ */
++ memset(&ver_tlv, 0, sizeof(ver_tlv));
+ /* For TLV type device, parse the tlv data */
+ err = btintel_parse_version_tlv(hdev, &ver_tlv, skb);
+ if (err) {
+--
+2.34.1
+
diff --git a/0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch b/0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch
deleted file mode 100644
index 70425bc58677..000000000000
--- a/0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 8414110f6b3801058a55b505539da7f7d7acd1fb Mon Sep 17 00:00:00 2001
-From: Evan Quan <evan.quan@amd.com>
-Date: Mon, 15 Nov 2021 10:51:37 +0800
-Subject: [PATCH 6/8] drm/amd/pm: avoid duplicate powergate/ungate setting
-
-Just bail out if the target IP block is already in the desired
-powergate/ungate state. This can avoid some duplicate settings
-which sometimes may cause unexpected issues.
-
-Link: https://lore.kernel.org/all/YV81vidWQLWvATMM@zn.tnic/
-
-Change-Id: I66346c69f121df0f5ee20182451313ae4fda2d04
-Signed-off-by: Evan Quan <evan.quan@amd.com>
-Tested-by: Borislav Petkov <bp@suse.de>
-Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
-For: https://bugs.archlinux.org/task/72753
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++
- drivers/gpu/drm/amd/include/amd_shared.h | 3 ++-
- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 10 ++++++++++
- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 8 ++++++++
- 4 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-index c1e34aa5925b..96ca42bcfdbf 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -3532,6 +3532,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
- adev->rmmio_size = pci_resource_len(adev->pdev, 2);
- }
-
-+ for (i = 0; i < AMD_IP_BLOCK_TYPE_NUM; i++)
-+ atomic_set(&adev->pm.pwr_state[i], POWER_STATE_UNKNOWN);
-+
- adev->rmmio = ioremap(adev->rmmio_base, adev->rmmio_size);
- if (adev->rmmio == NULL) {
- return -ENOMEM;
-diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
-index 257f280d3d53..bd077ea224a4 100644
---- a/drivers/gpu/drm/amd/include/amd_shared.h
-+++ b/drivers/gpu/drm/amd/include/amd_shared.h
-@@ -98,7 +98,8 @@ enum amd_ip_block_type {
- AMD_IP_BLOCK_TYPE_ACP,
- AMD_IP_BLOCK_TYPE_VCN,
- AMD_IP_BLOCK_TYPE_MES,
-- AMD_IP_BLOCK_TYPE_JPEG
-+ AMD_IP_BLOCK_TYPE_JPEG,
-+ AMD_IP_BLOCK_TYPE_NUM,
- };
-
- enum amd_clockgating_state {
-diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
-index 03581d5b1836..08362d506534 100644
---- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
-+++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
-@@ -927,6 +927,13 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block
- {
- int ret = 0;
- const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
-+ enum ip_power_state pwr_state = gate ? POWER_STATE_OFF : POWER_STATE_ON;
-+
-+ if (atomic_read(&adev->pm.pwr_state[block_type]) == pwr_state) {
-+ dev_dbg(adev->dev, "IP block%d already in the target %s state!",
-+ block_type, gate ? "gate" : "ungate");
-+ return 0;
-+ }
-
- switch (block_type) {
- case AMD_IP_BLOCK_TYPE_UVD:
-@@ -979,6 +986,9 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block
- break;
- }
-
-+ if (!ret)
-+ atomic_set(&adev->pm.pwr_state[block_type], pwr_state);
-+
- return ret;
- }
-
-diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
-index 98f1b3d8c1d5..16e3f72d31b9 100644
---- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
-+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
-@@ -417,6 +417,12 @@ struct amdgpu_dpm {
- enum amd_dpm_forced_level forced_level;
- };
-
-+enum ip_power_state {
-+ POWER_STATE_UNKNOWN,
-+ POWER_STATE_ON,
-+ POWER_STATE_OFF,
-+};
-+
- struct amdgpu_pm {
- struct mutex mutex;
- u32 current_sclk;
-@@ -452,6 +458,8 @@ struct amdgpu_pm {
- struct i2c_adapter smu_i2c;
- struct mutex smu_i2c_mutex;
- struct list_head pm_attr_list;
-+
-+ atomic_t pwr_state[AMD_IP_BLOCK_TYPE_NUM];
- };
-
- #define R600_SSTU_DFLT 0
---
-2.34.0
-
diff --git a/0006-lg-laptop-Recognize-more-models.patch b/0006-lg-laptop-Recognize-more-models.patch
new file mode 100644
index 000000000000..8e554b7bbdee
--- /dev/null
+++ b/0006-lg-laptop-Recognize-more-models.patch
@@ -0,0 +1,39 @@
+From 72edf8c167268bb68d701f46006ccfdfa5490db8 Mon Sep 17 00:00:00 2001
+From: Matan Ziv-Av <matan@svgalib.org>
+Date: Tue, 23 Nov 2021 22:14:55 +0200
+Subject: [PATCH 6/7] lg-laptop: Recognize more models
+
+LG uses 5 instead of 0 in the third digit (second digit after 2019) of the year string to indicate newer models in the same year. Handle this case as well.
+
+Signed-off-by: Matan Ziv-Av <matan@svgalib.org>
+For: https://bugs.archlinux.org/task/71772
+---
+ drivers/platform/x86/lg-laptop.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
+index 88b551caeaaf..d6f74d3a7605 100644
+--- a/drivers/platform/x86/lg-laptop.c
++++ b/drivers/platform/x86/lg-laptop.c
+@@ -658,6 +658,18 @@ static int acpi_add(struct acpi_device *device)
+ if (product && strlen(product) > 4)
+ switch (product[4]) {
+ case '5':
++ if (strlen(product) > 5)
++ switch (product[5]) {
++ case 'N':
++ year = 2021;
++ break;
++ case '0':
++ year = 2016;
++ break;
++ default:
++ year = 2022;
++ }
++ break;
+ case '6':
+ year = 2016;
+ break;
+--
+2.34.1
+
diff --git a/0008-Arch-Linux-kernel-v5.15.3-arch1.patch b/0008-Arch-Linux-kernel-v5.15.3-arch1.patch
deleted file mode 100644
index 4ec49bc1a8a6..000000000000
--- a/0008-Arch-Linux-kernel-v5.15.3-arch1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf9c89e1c25a735cb46a31512b1f21f5bdef2959 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Thu, 18 Nov 2021 23:15:29 +0100
-Subject: [PATCH 8/8] Arch Linux kernel v5.15.3-arch1
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 79eeb13c0973..19a4a82b5823 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- VERSION = 5
- PATCHLEVEL = 15
- SUBLEVEL = 3
--EXTRAVERSION =
-+EXTRAVERSION = -arch1
- NAME = Trick or Treat
-
- # *DOCUMENTATION*
---
-2.34.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 47dbb302fec9..87163ba1404e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.15
_major=5.15
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc
-_minor=3
+_minor=7
_minorc=$((_minor+1))
### on initial release this is just $_major
_fullver=$_major.$_minor
@@ -30,25 +30,27 @@ source=(
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
- 0005-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
- 0006-drm-amd-pm-avoid-duplicate-powergate-ungate-setting.patch
- 0007-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+ 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+ 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+ 0006-lg-laptop-Recognize-more-models.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('50162f3ed36160ec1cf8616fcf29cc84922a5bc2679ad5426a514e5855d9d9d8183ad68c8f62f910cf9d949d4618e61e481a6ed044e1aa0f8ca343925b3adbf7'
+b2sums=('c662ee0d1884d32836f734ddc7c035e9e1db400ecf66a7a4f4a7623b7cfc784d1618697408c5fac31c8b098f748d5c46ba35e761960568d8e31dcf0585ed728b'
'SKIP'
- '93379b68cfe85a979a7a39179e2bf622702d5e4f7a1d5a5bace1e8d11583d77966bce5b0e61f047fcb40c6c2be401e7725b3aa01e602c6ef4ac045a24ebcc2cd'
+ '66894c8d2001bccfbfc9d31d2f68fef64826c088676df94136a4dcf158962c146cc668490d342c2e8bf914903be69f5b4fbc1cd264b844a8d966059bf34fac6f'
'SKIP'
- '13e22007dfd81dcfcd9a159881ddc5f92a600d6ed5f581c0826c5e2b2823b6a7ba0628e09960b8146d3a9bb669ee5ba7b119bd7ecb6cad06a76e6511bf533a44'
- '90e2c56062fc6ab9f914d82ed3b5ff3cc9fef2293ffdedb51ab2776441b1d2ff46b69af8e6c97c80346449123f309fe4bcdeac2fe95a5f8e201f41b9d29943f3'
- '812f8ff0b7cdd21e6b1b9337b789619a992bd3053d3c47533d76ec4e84d5ca4c340252415cf4cc616ac4cf9887849c541d1e8e370fddcb7c5705532a6c8b1e78'
- '60699efcb88f8643dda1dad5a104c7b2780f8233c82d89bc1916c14fd808febdff4536b84e32d790137455d922d18d86d8d56c7671955b26c068a8f0272ed1a6'
- '47fe5e2eb9e2ceeabad141d2c631d22527f7068d81d673e0bdee2a7070986b3d1d75001a953a0e3501eb9b623c66700464af73153ad6f998f20587e58fc7820b'
- '7ac6e6886d578a46d22c089ccd4b99eca3515263c4f1aa92a2f85a1836c72b096560145ad4ee1c94c2c1c2b747afd299fc6b9c73d9076c364401d80413f69fe4')
+ '4b6759fae0abc440292b310aed12bd12bbfbc172f968572ee9b8a9164c844b3f2a12f81b1fdf5ed86d75403f0c5be5d57933292e22c2973ef14f481bf78a3f7e'
+ '4e8607f63c08ccb80e27de7af7eda49fb74212f2900d62d0b1dc67100c720ed6f4bd5423d71198a790e92bdc49998d78dd8bbb1cf25f449ada38c00ae1318467'
+ '6d52e045fef48f882d8a1dd96aff084e46f28b0bf719f664030f210a5f236b0d8ea3a4151597ccc7a7d404d39a5f965a4bdbe18c9cbaea7687355ec0515908f9'
+ '186cbcbe54d3135aadc704eeaba4453f30fbc495262c9f753c53ba25e895c71da25c432fe716795f1ca69199718d3920bda937889f84430c5db2795ae61440d9'
+ '716bce9038188e4f49f2ac9fcd399a1f8d1730af4442ff028977522e9d42994f25e22f4d41238d43ab73afc896e7b177a4d581b7f40af36a3e41e3a6ac2afa46'
+ 'c0f4b5f99c96a482c224043f0b901458dc9bbf5ae87f4456bc3553a608c8222b4ca7bb05bd9c71a674465ba6a09b27fa2762f4a458f6be49793a5a9952910a95'
+ '9a0763fee4e54076c721a0d0de53ed152f6ba24381e35d81ba023ce576ed89568be3b5afb56d489609a897971b9db6fa86646ae98be744dbff3b33b35b66cebb')
export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index 1fcf3c105437..df045a39eb33 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.2-arch1 Kernel Configuration
+# Linux/x86 5.15.5-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
CONFIG_CC_IS_GCC=y
@@ -828,6 +828,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
CONFIG_ARCH_USE_MEMREMAP_PROT=y
CONFIG_LOCK_EVENT_COUNTS=y
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
CONFIG_HAVE_STATIC_CALL=y
CONFIG_HAVE_STATIC_CALL_INLINE=y
CONFIG_HAVE_PREEMPT_DYNAMIC=y
@@ -2334,6 +2335,7 @@ CONFIG_MTD_BLOCK=m
# CONFIG_SSFDC is not set
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_PSTORE=m
# CONFIG_MTD_SWAP is not set
# CONFIG_MTD_PARTITIONED_MASTER is not set
@@ -9662,6 +9664,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="zstd"
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_FTRACE is not set
CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -9918,7 +9925,7 @@ CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
@@ -10071,11 +10078,11 @@ CONFIG_CRYPTO_ZSTD=y
# Random Number Generation
#
CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_DRBG_HMAC=y
CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m