summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-01-20 16:18:31 -0500
committergraysky2020-01-20 16:18:31 -0500
commitdcdb6273feb58f926260897c2dd8e67f308a273b (patch)
tree8da6a4d541a6863cbed501eb5795ef9ec8872b18
parent616ec1bb1f2c0fc42b6fb5c20995996897b4f43b (diff)
downloadaur-dcdb6273feb58f926260897c2dd8e67f308a273b.tar.gz
Update to 5.4.13-1
-rw-r--r--.SRCINFO68
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch4
-rw-r--r--0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch4
-rw-r--r--0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch99
-rw-r--r--0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch (renamed from 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch)4
-rw-r--r--0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch (renamed from 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch)4
-rw-r--r--0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch (renamed from 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch)4
-rw-r--r--0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch (renamed from 0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch)4
-rw-r--r--0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch (renamed from 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch)4
-rw-r--r--0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch (renamed from 0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch)4
-rw-r--r--0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch (renamed from 0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch)4
-rw-r--r--0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch (renamed from 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch)4
-rw-r--r--0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch (renamed from 0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch)4
-rw-r--r--0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch (renamed from 0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch)4
-rw-r--r--0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch80
-rw-r--r--0015-ptp-free-ptp-device-pin-descriptors-properly.patch50
-rw-r--r--PKGBUILD100
-rw-r--r--config10
19 files changed, 244 insertions, 215 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9bb753392e..f81d794f64c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.4.12
+ pkgver = 5.4.13
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -8,46 +8,48 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.12.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.12.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.13.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.13.tar.sign
source = config
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
source = 0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
- source = 0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
- source = 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
- source = 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- source = 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- source = 0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
- source = 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
- source = 0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
- source = 0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
- source = 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
- source = 0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
- source = 0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+ source = 0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+ source = 0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+ source = 0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ source = 0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+ source = 0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+ source = 0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+ source = 0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+ source = 0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+ source = 0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+ source = 0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+ source = 0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
+ source = 0015-ptp-free-ptp-device-pin-descriptors-properly.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = d9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb
+ sha256sums = 49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7
sha256sums = SKIP
- sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
+ sha256sums = 8470e238fcecbb03fdbadb35e6bfea5d09413f3f5ba38fa50ea600fd8f01abd1
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c
- sha256sums = 9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee
- sha256sums = 0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984
- sha256sums = 1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6
- sha256sums = 4dddac706c4983bd9ddd67aafc08d4b17d0cd9d929be14d92586dfacdb0f37fb
- sha256sums = 66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d
- sha256sums = 4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da
- sha256sums = d32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31
- sha256sums = 44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7
- sha256sums = 5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7
- sha256sums = 14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f
- sha256sums = 1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61
- sha256sums = de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171
- sha256sums = 1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae
- sha256sums = 75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881
+ sha256sums = a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39
+ sha256sums = 134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf
+ sha256sums = 0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36
+ sha256sums = 59d4cff52a7c37429ab167d358d8bda44b1927361cd403be61bc5e8fc484d34b
+ sha256sums = 6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9
+ sha256sums = d03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e
+ sha256sums = b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632
+ sha256sums = ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed
+ sha256sums = f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999
+ sha256sums = 0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec
+ sha256sums = a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef
+ sha256sums = 80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499
+ sha256sums = fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0
+ sha256sums = ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a
+ sha256sums = 19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -56,11 +58,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.4.12
+ provides = linux-ck=5.4.13
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.4.12
- provides = linux-headers=5.4.12
+ provides = linux-ck-headers=5.4.13
+ provides = linux-headers=5.4.13
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 5d4014a2b45..a0f85248be1 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 a8d736bad70d4062a14c29bdcbed71bef7b575f5 Mon Sep 17 00:00:00 2001
+From ace933a17f0b2e6e75e5ed330e8c12efae62aa53 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/15] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/16] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
index d12405111c3..3f0667d80b0 100644
--- a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
+++ b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -1,7 +1,7 @@
-From 1e41b685fcac38c05219030acb033a42832f7459 Mon Sep 17 00:00:00 2001
+From 78b64515af95e12dac806fa630ae4499e9527100 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:28 -0600
-Subject: [PATCH 02/15] lib: devres: add a helper function for ioremap_uc
+Subject: [PATCH 02/16] lib: devres: add a helper function for ioremap_uc
Implement a resource managed strongly uncachable ioremap function.
diff --git a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
index cd1bc9b3f6c..75641b53510 100644
--- a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
+++ b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
@@ -1,7 +1,7 @@
-From 3f0415751d3c1456d314a46d9f28053c8c2a7afa Mon Sep 17 00:00:00 2001
+From dbc56c8785b2f6698722f3e9c189c7cb1f963679 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:29 -0600
-Subject: [PATCH 03/15] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
+Subject: [PATCH 03/16] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
Some BIOS erroneously specifies write-combining BAR for intel-lpss-pci
in MTRR. This will cause the system to hang during boot. If possible,
diff --git a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch b/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
deleted file mode 100644
index acf4474d77b..00000000000
--- a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From ea5b8c60cd739ed3166d8c0f0cba6df6f57d271f Mon Sep 17 00:00:00 2001
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Tue, 29 Oct 2019 20:00:21 +0300
-Subject: [PATCH 04/15] PCI: pciehp: Do not disable interrupt twice on suspend
-
-We try to keep PCIe hotplug ports runtime suspended when entering system
-suspend. Because the PCIe portdrv sets the DPM_FLAG_NEVER_SKIP flag, the PM
-core always calls system suspend/resume hooks even if the device is left
-runtime suspended. Since PCIe hotplug driver re-used the same function for
-both runtime suspend and system suspend, it ended up disabling hotplug
-interrupt twice and the second time following was printed:
-
- pciehp 0000:03:01.0:pcie204: pcie_do_write_cmd: no response from device
-
-Prevent this from happening by checking whether the device is already
-runtime suspended when the system suspend hook is called.
-
-Fixes: 9c62f0bfb832 ("PCI: pciehp: Implement runtime PM callbacks")
-Link: https://lore.kernel.org/r/20191029170022.57528-1-mika.westerberg@linux.intel.com
-Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
- drivers/pci/hotplug/pciehp_core.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index b3122c151b80..56daad828c9e 100644
---- a/drivers/pci/hotplug/pciehp_core.c
-+++ b/drivers/pci/hotplug/pciehp_core.c
-@@ -253,7 +253,7 @@ static bool pme_is_native(struct pcie_device *dev)
- return pcie_ports_native || host->native_pme;
- }
-
--static int pciehp_suspend(struct pcie_device *dev)
-+static void pciehp_disable_interrupt(struct pcie_device *dev)
- {
- /*
- * Disable hotplug interrupt so that it does not trigger
-@@ -261,7 +261,19 @@ static int pciehp_suspend(struct pcie_device *dev)
- */
- if (pme_is_native(dev))
- pcie_disable_interrupt(get_service_data(dev));
-+}
-
-+#ifdef CONFIG_PM_SLEEP
-+static int pciehp_suspend(struct pcie_device *dev)
-+{
-+ /*
-+ * If the port is already runtime suspended we can keep it that
-+ * way.
-+ */
-+ if (dev_pm_smart_suspend_and_suspended(&dev->port->dev))
-+ return 0;
-+
-+ pciehp_disable_interrupt(dev);
- return 0;
- }
-
-@@ -279,6 +291,7 @@ static int pciehp_resume_noirq(struct pcie_device *dev)
-
- return 0;
- }
-+#endif
-
- static int pciehp_resume(struct pcie_device *dev)
- {
-@@ -292,6 +305,12 @@ static int pciehp_resume(struct pcie_device *dev)
- return 0;
- }
-
-+static int pciehp_runtime_suspend(struct pcie_device *dev)
-+{
-+ pciehp_disable_interrupt(dev);
-+ return 0;
-+}
-+
- static int pciehp_runtime_resume(struct pcie_device *dev)
- {
- struct controller *ctrl = get_service_data(dev);
-@@ -318,10 +337,12 @@ static struct pcie_port_service_driver hpdriver_portdrv = {
- .remove = pciehp_remove,
-
- #ifdef CONFIG_PM
-+#ifdef CONFIG_PM_SLEEP
- .suspend = pciehp_suspend,
- .resume_noirq = pciehp_resume_noirq,
- .resume = pciehp_resume,
-- .runtime_suspend = pciehp_suspend,
-+#endif
-+ .runtime_suspend = pciehp_runtime_suspend,
- .runtime_resume = pciehp_runtime_resume,
- #endif /* PM */
- };
---
-2.25.0
-
diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index 3e01de8a844..b95179c0f7b 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From 02dc4cbf4b169ff89a2380b178e07e20eb661d62 Mon Sep 17 00:00:00 2001
+From fa21078f336286d835bc734c8b4e4a24b67f245e Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:22 +0300
-Subject: [PATCH 05/15] PCI: pciehp: Prevent deadlock on disconnect
+Subject: [PATCH 04/16] PCI: pciehp: Prevent deadlock on disconnect
This addresses deadlocks in these common cases in hierarchies containing
two switches:
diff --git a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
index cac7e7ede3e..9abef27eea2 100644
--- a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
@@ -1,7 +1,7 @@
-From b5ae067d036c7d621af4178bba61c8c6fa3c7850 Mon Sep 17 00:00:00 2001
+From 7f6991978c1c388c2b11bb8101e4658f81fe85ed Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 28 Nov 2019 23:50:40 +0100
-Subject: [PATCH 06/15] ACPI: PM: s2idle: Rework ACPI events synchronization
+Subject: [PATCH 05/16] ACPI: PM: s2idle: Rework ACPI events synchronization
Note that the EC GPE processing need not be synchronized in
acpi_s2idle_wake() after invoking acpi_ec_dispatch_gpe(), because
diff --git a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 5657d6c3703..2f69a8adb70 100644
--- a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From 6c245b6bc1a0c4979566dbd13edcb553919010d7 Mon Sep 17 00:00:00 2001
+From 50b253fe7f01a82c8054d88319598db71ae5d083 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 24 Dec 2019 05:18:47 +0100
-Subject: [PATCH 07/15] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+Subject: [PATCH 06/16] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Commit 809805a820c6 refactored the cfg mangling. Unfortunately, in this
process the lines which picked the right cfg for Killer Qu C0 NICs after
diff --git a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index bbd3e5dd57d..a128921803f 100644
--- a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,7 +1,7 @@
-From ac55f63c14c1e7d0740c27d325e8abe40e2478b3 Mon Sep 17 00:00:00 2001
+From e0a3ce4a9ebf049e76ea38c48e41f2c67f4b3330 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Fri, 20 Sep 2019 11:39:18 +0300
-Subject: [PATCH 08/15] drm/i915: save AUD_FREQ_CNTRL state at audio domain
+Subject: [PATCH 07/16] drm/i915: save AUD_FREQ_CNTRL state at audio domain
suspend
When audio power domain is suspended, the display driver must
diff --git a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index 591c4f4dd8d..aa403bc281c 100644
--- a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,7 +1,7 @@
-From 77437dba84a29da0fdf62f9946416b6e53496b1d Mon Sep 17 00:00:00 2001
+From e4bcd75c297598b87b89533c2c995f7d88c12010 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:30 +0300
-Subject: [PATCH 09/15] drm/i915: Fix audio power up sequence for gen10+
+Subject: [PATCH 08/16] drm/i915: Fix audio power up sequence for gen10+
display
On platfroms with gen10+ display, driver must set the enable bit of
diff --git a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index 92108ff2e86..07dee0655f6 100644
--- a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,7 +1,7 @@
-From 466961b7872771f84a86f2304197d303ed749925 Mon Sep 17 00:00:00 2001
+From 7ff6d556c831f5f909b3315974816a45a3802670 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:31 +0300
-Subject: [PATCH 10/15] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
+Subject: [PATCH 09/16] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
platforms
The CDCLK>=2*BCLK constraint applies to all generations since gen10.
diff --git a/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
index a24c8925445..edd4404b9fe 100644
--- a/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+++ b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
@@ -1,7 +1,7 @@
-From 238026166679e618b3bad1c86b0e37a43303b6b0 Mon Sep 17 00:00:00 2001
+From ce769a8e35537fc71cc9934a1fa39a481f994b25 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Tue, 31 Dec 2019 16:00:07 +0200
-Subject: [PATCH 11/15] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
+Subject: [PATCH 10/16] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
GLK only
Revert changes done in commit f6ec9483091f ("drm/i915: extend audio
diff --git a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
index dab476ce6d4..13d562a6fa0 100644
--- a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
@@ -1,7 +1,7 @@
-From c7e2526442e1a92f2c875c0300935918a295f527 Mon Sep 17 00:00:00 2001
+From 93ca62c645759168768638e65d52452b4a9898a4 Mon Sep 17 00:00:00 2001
From: Boyan Ding <boyan.j.ding@gmail.com>
Date: Wed, 1 Jan 2020 11:44:49 -0800
-Subject: [PATCH 12/15] pinctrl: sunrisepoint: Add missing Interrupt Status
+Subject: [PATCH 11/16] pinctrl: sunrisepoint: Add missing Interrupt Status
register offset
Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status
diff --git a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
index 8dcb254db05..901b06d3871 100644
--- a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+++ b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -1,7 +1,7 @@
-From ad6657302538790fdf5c0c0f6e88add139e0c530 Mon Sep 17 00:00:00 2001
+From 540f62738b8f3049e200a086cac75d14d289fae9 Mon Sep 17 00:00:00 2001
From: Mehmet Akif Tasova <makiftasova@gmail.com>
Date: Mon, 30 Dec 2019 15:48:16 +0200
-Subject: [PATCH 13/15] Revert "iwlwifi: mvm: fix scan config command size"
+Subject: [PATCH 12/16] Revert "iwlwifi: mvm: fix scan config command size"
Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
commands were sent to the firmware with certain devices (depending on
diff --git a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
index 17a717ed59e..221543b62b5 100644
--- a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+++ b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -1,7 +1,7 @@
-From 22aa8417725e7b4cb467a78a6bce6f23ad799d98 Mon Sep 17 00:00:00 2001
+From cce47515454675d9c82448e865b42570f9eabc39 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 4 Jan 2020 23:29:22 -0800
-Subject: [PATCH 14/15] e1000e: Revert "e1000e: Make watchdog use delayed work"
+Subject: [PATCH 13/16] e1000e: Revert "e1000e: Make watchdog use delayed work"
This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db.
diff --git a/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
new file mode 100644
index 00000000000..a12039123a6
--- /dev/null
+++ b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
@@ -0,0 +1,80 @@
+From f247d4a6fe42acc60b775457e3c35b8289532590 Mon Sep 17 00:00:00 2001
+From: Leo Li <sunpeng.li@amd.com>
+Date: Mon, 21 Oct 2019 14:58:47 -0400
+Subject: [PATCH 14/16] drm/amdgpu: Add DC feature mask to disable fractional
+ pwm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[Why]
+
+Some LED panel drivers might not like fractional PWM. In such cases,
+backlight flickering may be observed.
+
+[How]
+
+Add a DC feature mask to disable fractional PWM, and associate it with
+the preexisting dc_config flag.
+
+The flag is only plumbed through the dmcu firmware, so plumb it through
+the driver path as well.
+
+To disable, add the following to the linux cmdline:
+amdgpu.dcfeaturemask=0x4
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204957
+Signed-off-by: Leo Li <sunpeng.li@amd.com>
+Reviewed-by: Anthony Koo <anthony.koo@amd.com>
+Tested-by: Lukáš Krejčí <lskrejci@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 ++++
+ drivers/gpu/drm/amd/include/amd_shared.h | 1 +
+ 3 files changed, 8 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 4e9c15c409ba..25b72eb76add 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -697,6 +697,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
+ if (amdgpu_dc_feature_mask & DC_MULTI_MON_PP_MCLK_SWITCH_MASK)
+ init_data.flags.multi_mon_pp_mclk_switch = true;
+
++ if (amdgpu_dc_feature_mask & DC_DISABLE_FRACTIONAL_PWM_MASK)
++ init_data.flags.disable_fractional_pwm = true;
++
+ init_data.flags.power_down_display_on_boot = true;
+
+ #ifdef CONFIG_DRM_AMD_DC_DCN2_0
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+index 7700a855d77c..698b84acc44f 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+@@ -404,6 +404,10 @@ static bool dce_abm_init_backlight(struct abm *abm)
+ /* Enable the backlight output */
+ REG_UPDATE(BL_PWM_CNTL, BL_PWM_EN, 1);
+
++ /* Disable fractional pwm if configured */
++ REG_UPDATE(BL_PWM_CNTL, BL_PWM_FRACTIONAL_EN,
++ abm->ctx->dc->config.disable_fractional_pwm ? 0 : 1);
++
+ /* Unlock group 2 backlight registers */
+ REG_UPDATE(BL_PWM_GRP1_REG_LOCK,
+ BL_PWM_GRP1_REG_LOCK, 0);
+diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
+index 8889aaceec60..5450ed762b7a 100644
+--- a/drivers/gpu/drm/amd/include/amd_shared.h
++++ b/drivers/gpu/drm/amd/include/amd_shared.h
+@@ -143,6 +143,7 @@ enum PP_FEATURE_MASK {
+ enum DC_FEATURE_MASK {
+ DC_FBC_MASK = 0x1,
+ DC_MULTI_MON_PP_MCLK_SWITCH_MASK = 0x2,
++ DC_DISABLE_FRACTIONAL_PWM_MASK = 0x4,
+ };
+
+ enum amd_dpm_forced_level;
+--
+2.25.0
+
diff --git a/0015-ptp-free-ptp-device-pin-descriptors-properly.patch b/0015-ptp-free-ptp-device-pin-descriptors-properly.patch
new file mode 100644
index 00000000000..6298fa44349
--- /dev/null
+++ b/0015-ptp-free-ptp-device-pin-descriptors-properly.patch
@@ -0,0 +1,50 @@
+From b89e9f6a3ec61a96b5abced31813ad043bda3827 Mon Sep 17 00:00:00 2001
+From: Vladis Dronov <vdronov@redhat.com>
+Date: Mon, 13 Jan 2020 14:00:09 +0100
+Subject: [PATCH 15/16] ptp: free ptp device pin descriptors properly
+
+There is a bug in ptp_clock_unregister(), where ptp_cleanup_pin_groups()
+first frees ptp->pin_{,dev_}attr, but then posix_clock_unregister() needs
+them to destroy a related sysfs device.
+
+These functions can not be just swapped, as posix_clock_unregister() frees
+ptp which is needed in the ptp_cleanup_pin_groups(). Fix this by calling
+ptp_cleanup_pin_groups() in ptp_clock_release(), right before ptp is freed.
+
+This makes this patch fix an UAF bug in a patch which fixes an UAF bug.
+
+Reported-by: Antti Laakso <antti.laakso@intel.com>
+Fixes: a33121e5487b ("ptp: fix the race between the release of ptp_clock and cdev")
+Link: https://lore.kernel.org/netdev/3d2bd09735dbdaf003585ca376b7c1e5b69a19bd.camel@intel.com/
+Signed-off-by: Vladis Dronov <vdronov@redhat.com>
+Acked-by: Richard Cochran <richardcochran@gmail.com>
+---
+ drivers/ptp/ptp_clock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
+index 61fafe0374ce..b84f16bbd6f2 100644
+--- a/drivers/ptp/ptp_clock.c
++++ b/drivers/ptp/ptp_clock.c
+@@ -170,6 +170,7 @@ static void ptp_clock_release(struct device *dev)
+ {
+ struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev);
+
++ ptp_cleanup_pin_groups(ptp);
+ mutex_destroy(&ptp->tsevq_mux);
+ mutex_destroy(&ptp->pincfg_mux);
+ ida_simple_remove(&ptp_clocks_map, ptp->index);
+@@ -302,9 +303,8 @@ int ptp_clock_unregister(struct ptp_clock *ptp)
+ if (ptp->pps_source)
+ pps_unregister_source(ptp->pps_source);
+
+- ptp_cleanup_pin_groups(ptp);
+-
+ posix_clock_unregister(&ptp->clock);
++
+ return 0;
+ }
+ EXPORT_SYMBOL(ptp_clock_unregister);
+--
+2.25.0
+
diff --git a/PKGBUILD b/PKGBUILD
index ecfcf18eb9c..f6863f5f7d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,7 +61,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.4.12
+pkgver=5.4.13
pkgrel=1
_ckpatchversion=1
arch=(x86_64)
@@ -79,41 +79,43 @@ source=(
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
-0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
-0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
-0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
-0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
-0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
-0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
-0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
-0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
-0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
-0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
+0015-ptp-free-ptp-device-pin-descriptors-properly.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('d9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb'
+sha256sums=('49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7'
'SKIP'
- 'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
+ '8470e238fcecbb03fdbadb35e6bfea5d09413f3f5ba38fa50ea600fd8f01abd1'
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
- '9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee'
- '0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984'
- '1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6'
- '4dddac706c4983bd9ddd67aafc08d4b17d0cd9d929be14d92586dfacdb0f37fb'
- '66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d'
- '4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da'
- 'd32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31'
- '44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7'
- '5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7'
- '14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f'
- '1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61'
- 'de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171'
- '1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae'
- '75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881')
+ 'a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39'
+ '134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf'
+ '0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36'
+ '59d4cff52a7c37429ab167d358d8bda44b1927361cd403be61bc5e8fc484d34b'
+ '6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9'
+ 'd03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e'
+ 'b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632'
+ 'ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed'
+ 'f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999'
+ '0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec'
+ 'a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef'
+ '80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499'
+ 'fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0'
+ 'ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a'
+ '19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
@@ -122,7 +124,7 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
prepare() {
cd linux-${pkgver}
- msg2 "Setting version..."
+ echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
@@ -132,11 +134,11 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
[[ $src = 0*.patch ]] || continue
- msg2 "Applying patch $src..."
+ echo "Applying patch $src..."
patch -Np1 < "../$src"
done
- msg2 "Setting config..."
+ echo "Setting config..."
cp ../config .config
# https://bbs.archlinux.org/viewtopic.php?pid=1824594#p1824594
@@ -149,7 +151,7 @@ prepare() {
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatch}"
- msg2 "Patching with ck patchset..."
+ echo "Patching with ck patchset..."
# ck patchset itself
patch -Np1 -i ../"${_ckpatch}"
@@ -159,7 +161,7 @@ prepare() {
make olddefconfig
# https://github.com/graysky2/kernel_gcc_patch
- msg2 "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..."
+ echo "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..."
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch"
if [ -n "$_subarch" ]; then
@@ -174,16 +176,16 @@ prepare() {
# See https://aur.archlinux.org/packages/modprobed-db
if [ -n "$_localmodcfg" ]; then
if [ -f $HOME/.config/modprobed.db ]; then
- msg2 "Running Steven Rostedt's make localmodconfig now"
+ echo "Running Steven Rostedt's make localmodconfig now"
make LSMOD=$HOME/.config/modprobed.db localmodconfig
else
- msg2 "No modprobed.db data found"
+ echo "No modprobed.db data found"
exit
fi
fi
make -s kernelrelease > version
- msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
+ echo "Prepared %s version %s" "$pkgbase" "$(<version)"
[[ -z "$_makenconfig" ]] || make nconfig
@@ -209,7 +211,7 @@ _package() {
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
- msg2 "Installing boot image..."
+ echo "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
#install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
@@ -221,13 +223,13 @@ _package() {
# Used by mkinitcpio to name the kernel
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
- msg2 "Installing modules..."
+ echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
# remove build and source links
rm "$modulesdir"/{source,build}
- msg2 "Fixing permissions..."
+ echo "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
}
@@ -240,7 +242,7 @@ _package-headers() {
cd linux-${pkgver}
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
- msg2 "Installing build files..."
+ echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
localversion.* version vmlinux
install -Dt "$builddir/kernel" -m644 kernel/Makefile
@@ -253,7 +255,7 @@ _package-headers() {
# add xfs and shmem for aufs building
mkdir -p "$builddir"/{fs/xfs,mm}
- msg2 "Installing headers..."
+ echo "Installing headers..."
cp -t "$builddir" -a include
cp -t "$builddir/arch/x86" -a arch/x86/include
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
@@ -269,10 +271,10 @@ _package-headers() {
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
- msg2 "Installing KConfig files..."
+ echo "Installing KConfig files..."
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
- msg2 "Removing unneeded architectures..."
+ echo "Removing unneeded architectures..."
local arch
for arch in "$builddir"/arch/*/; do
[[ $arch = */x86/ ]] && continue
@@ -280,16 +282,16 @@ _package-headers() {
rm -r "$arch"
done
- msg2 "Removing documentation..."
+ echo "Removing documentation..."
rm -r "$builddir/Documentation"
- msg2 "Removing broken symlinks..."
+ echo "Removing broken symlinks..."
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
- msg2 "Removing loose objects..."
+ echo "Removing loose objects..."
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
- msg2 "Stripping build tools..."
+ echo "Stripping build tools..."
local file
while read -rd '' file; do
case "$(file -bi "$file")" in
@@ -304,11 +306,11 @@ _package-headers() {
esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
- msg2 "Adding symlink..."
+ echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
- msg2 "Fixing permissions..."
+ echo "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
}
diff --git a/config b/config
index d5946e50ccd..3cc87a1118c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.7-arch1 Kernel Configuration
+# Linux/x86 5.4.13-arch1 Kernel Configuration
#
#
@@ -860,14 +860,9 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
CONFIG_PLUGIN_HOSTCC="g++"
CONFIG_HAVE_GCC_PLUGINS=y
CONFIG_GCC_PLUGINS=y
-
-#
-# GCC plugins
-#
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
-# end of GCC plugins
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
@@ -6931,7 +6926,6 @@ CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
CONFIG_SND_SOC_SOF_INTEL_COMMON=m
# CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT is not set
-# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set
CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
@@ -10514,7 +10508,7 @@ CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_FUNCTION_PROFILER=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y