diff options
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch (renamed from 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch) | 13 | ||||
-rw-r--r-- | 0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch | 6 | ||||
-rw-r--r-- | 0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch | 6 | ||||
-rw-r--r-- | 0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch | 99 | ||||
-rw-r--r-- | 0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch (renamed from 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch) | 10 | ||||
-rw-r--r-- | 0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch (renamed from 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch) | 6 | ||||
-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) | 6 | ||||
-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-suspend.patch) | 11 | ||||
-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-display.patch) | 11 | ||||
-rw-r--r-- | 0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch (renamed from 0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch) | 7 | ||||
-rw-r--r-- | 0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch (renamed from 0011-drm-915-Limit-audio-CDCLK-2BCLK-constraint-back-to-GLK-only.patch) | 7 | ||||
-rw-r--r-- | 0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch (renamed from 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch) | 7 | ||||
-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) | 6 | ||||
-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) | 12 | ||||
-rw-r--r-- | 0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch | 80 | ||||
-rw-r--r-- | 0015-ptp-free-ptp-device-pin-descriptors-properly.patch | 50 | ||||
-rw-r--r-- | PKGBUILD | 136 | ||||
-rw-r--r-- | config | 5 |
18 files changed, 259 insertions, 219 deletions
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index c406c3b..a0f8524 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,8 @@ -From ad4dbce36dd2083de69815f613342257535f6274 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: ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER +Subject: [PATCH 01/16] ZEN: Add sysctl and CONFIG to disallow unprivileged + CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. --- @@ -39,7 +40,7 @@ index b4daad2bac23..362f82c5ec07 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 6cabc124378c..fda4986da9eb 100644 +index 755d8160e001..ed909f8050b2 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -106,6 +106,11 @@ @@ -65,7 +66,7 @@ index 6cabc124378c..fda4986da9eb 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2826,6 +2835,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2836,6 +2845,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -79,7 +80,7 @@ index 6cabc124378c..fda4986da9eb 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index b6f2f35d0bcf..2e9c273990e8 100644 +index 70665934d53e..9797869ed829 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -110,6 +110,9 @@ extern int core_uses_pid; @@ -127,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644 static DEFINE_MUTEX(userns_state_mutex); -- -cgit v1.2.1-1-g437b +2.25.0 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 89450ae..3f0667d 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 5925138606a245d43d8a6db47b754cea6f6049ae 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: 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. @@ -75,5 +75,5 @@ index 6a0e9bd6524a..17624d35e82d 100644 * devm_ioremap_nocache - Managed ioremap_nocache() * @dev: Generic device to remap IO address for -- -cgit v1.2.1-1-g437b +2.25.0 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 3c49ac5..75641b5 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 3cec19068653e77d311382d7467728f5d424d4a3 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: 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, @@ -44,5 +44,5 @@ index bfe4ff337581..b0f0781a6b9c 100644 if (!lpss->priv) return -ENOMEM; -- -cgit v1.2.1-1-g437b +2.25.0 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 fc49e38..0000000 --- a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 271c8fe698d3ba5b3b135ffacfd1dc0c87243e32 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: 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 */ - }; --- -cgit v1.2.1-1-g437b - diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch index d882f59..b95179c 100644 --- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch +++ b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch @@ -1,7 +1,7 @@ -From 8d032e7fc1d1d37974785ccdb994524d60201ca3 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: 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: @@ -90,9 +90,9 @@ Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/hotplug/pciehp.h | 6 ++-- - drivers/pci/hotplug/pciehp_core.c | 11 ++++++-- + drivers/pci/hotplug/pciehp_core.c | 11 ++++-- drivers/pci/hotplug/pciehp_ctrl.c | 4 +-- - drivers/pci/hotplug/pciehp_hpc.c | 59 +++++++++++++++++++++++++++++++-------- + drivers/pci/hotplug/pciehp_hpc.c | 59 +++++++++++++++++++++++++------ 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h @@ -268,5 +268,5 @@ index 86d97f3112f0..a2a263764ef8 100644 int pciehp_query_power_fault(struct controller *ctrl) -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch index 3b6703d..9abef27 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 9888be9033e8e79a055df2ae8d388baf5970f83b 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: 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 @@ -74,5 +74,5 @@ index 2af937a8b1c5..6747a279621b 100644 acpi_enable_all_runtime_gpes(); -- -cgit v1.2.1-1-g437b +2.25.0 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 7611c7a..2f69a8a 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 fd1d146698d09aaac6709ae4fde90d80dbd153cd 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: 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 @@ -32,5 +32,5 @@ index b0b7eca1754e..de62a6dc4e73 100644 /* same thing for QuZ... */ -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch index 6ea75b6..a128921 100644 --- a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch +++ b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch @@ -1,7 +1,8 @@ -From c0da4d4ee458208d5427d0a284173bd39a95d040 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: drm/i915: save AUD_FREQ_CNTRL state at audio domain suspend +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 save state of AUD_FREQ_CNTRL on Tiger Lake and Ice Lake @@ -69,10 +70,10 @@ index 89b6112bd66b..043ce1b47aeb 100644 struct { struct mutex mutex; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h -index f8ee9aba3955..e1fe356463ec 100644 +index 7b6e68f082f8..a99ef18665f2 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h -@@ -9104,6 +9104,8 @@ enum { +@@ -9110,6 +9110,8 @@ enum { #define HSW_AUD_CHICKENBIT _MMIO(0x65f10) #define SKL_AUD_CODEC_WAKE_SIGNAL (1 << 15) @@ -82,5 +83,5 @@ index f8ee9aba3955..e1fe356463ec 100644 * HSW - ICL power wells * -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch index 7c46dbe..aa403bc 100644 --- a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch +++ b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch @@ -1,7 +1,8 @@ -From 6e149a5538676e885561f1dfc18bbb4dd104c1f6 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: drm/i915: Fix audio power up sequence for gen10+ display +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 AUDIO_PIN_BUF_CTL register before transactions with the HDA controller @@ -39,10 +40,10 @@ index 439bc0a93410..440b33762fef 100644 return ret; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h -index e1fe356463ec..ccfea9c2b8bf 100644 +index a99ef18665f2..1dd7b6187780 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h -@@ -9105,6 +9105,8 @@ enum { +@@ -9111,6 +9111,8 @@ enum { #define SKL_AUD_CODEC_WAKE_SIGNAL (1 << 15) #define AUD_FREQ_CNTRL _MMIO(0x65900) @@ -52,5 +53,5 @@ index e1fe356463ec..ccfea9c2b8bf 100644 /* * HSW - ICL power wells -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch index 8d5b9ae..07dee06 100644 --- a/0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch +++ b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch @@ -1,7 +1,8 @@ -From 975d5a884b3c80155808c2ac39e6bb6d51450dea 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: drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms +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. Extend the constraint logic in audio get/put_power(). @@ -36,5 +37,5 @@ index 440b33762fef..05ef43b13d1c 100644 intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie); -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0011-drm-915-Limit-audio-CDCLK-2BCLK-constraint-back-to-GLK-only.patch b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch index 5c8cbde..edd4404 100644 --- a/0011-drm-915-Limit-audio-CDCLK-2BCLK-constraint-back-to-GLK-only.patch +++ b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch @@ -1,7 +1,8 @@ -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: drm/i915: Limit audio CDCLK>=2*BCLK constraint back to GLK only +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 CDCLK>=2*BCLK constraint to more platforms"). Audio drivers @@ -59,5 +60,5 @@ index 05ef43b13d1c..0cf475f3063c 100644 intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie); -- -cgit v1.2.1-1-g437b +2.25.0 diff --git a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch index 64afce3..13d562a 100644 --- a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch +++ b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch @@ -1,7 +1,8 @@ -From adb810e1819b859aec1f8eb4c5611bc6ebe82137 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: pinctrl: sunrisepoint: Add missing Interrupt Status register offset +Subject: [PATCH 11/16] pinctrl: sunrisepoint: Add missing Interrupt Status + register offset Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status offset") removes default interrupt status offset of GPIO controllers, @@ -30,5 +31,5 @@ index 44d7f50bbc82..d936e7aa74c4 100644 .pin_base = (s), \ .npins = ((e) - (s) + 1), \ -- -cgit v1.2.1-1-g437b +2.25.0 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 5cf14e3..901b06d 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 78fe4d666ff244609c7d02bea07a22ce87e56326 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: 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 @@ -44,5 +44,5 @@ index fcafa22ec6ce..8aa567d7912c 100644 cfg = kzalloc(cmd_size, GFP_KERNEL); if (!cfg) -- -cgit v1.2.1-1-g437b +2.25.0 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 52e42b2..221543b 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 195bb1762da1aa1c1beffe402353afd619ea7338 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: e1000e: Revert "e1000e: Make watchdog use delayed work" +Subject: [PATCH 13/16] e1000e: Revert "e1000e: Make watchdog use delayed work" This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db. @@ -10,8 +10,8 @@ reset unexpectedly. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- - drivers/net/ethernet/intel/e1000e/e1000.h | 5 ++- - drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++++++---------------- + drivers/net/ethernet/intel/e1000e/e1000.h | 5 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++------------ 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -103,7 +103,7 @@ index d7d56e42a6aa..060daf66bf63 100644 struct net_device *netdev = adapter->netdev; struct e1000_mac_info *mac = &adapter->hw.mac; struct e1000_phy_info *phy = &adapter->hw.phy; -@@ -5404,9 +5416,8 @@ link_up: +@@ -5404,9 +5416,8 @@ static void e1000_watchdog_task(struct work_struct *work) /* Reset the timer */ if (!test_bit(__E1000_DOWN, &adapter->state)) @@ -170,5 +170,5 @@ index d7d56e42a6aa..060daf66bf63 100644 cancel_work_sync(&adapter->tx_hwtstamp_work); if (adapter->tx_hwtstamp_skb) { -- -cgit v1.2.1-1-g437b +2.25.0 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 0000000..a120391 --- /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 0000000..6298fa4 --- /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 + @@ -17,7 +17,7 @@ pkgbase=linux-ck _supver=5 _majver=4 -_minver=12 +_minver=13 _gccpatchver='20190822' _ckpatchversion=ck1 if [ "$_minver" == "0" ]; then @@ -39,20 +39,21 @@ options=('!strip') _srcname=linux-${pkgver} source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch + 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-suspend.patch - 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch - 0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch - 0011-drm-915-Limit-audio-CDCLK-2BCLK-constraint-back-to-GLK-only.patch - 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.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 linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz graysky_bdver2-hotfix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz @@ -65,28 +66,29 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('f08d30011b2021724a240f45a4d0a92ba01b97d0d2d33ce0d88aeb6dfb0a2e5a532fd55ad0a2ef0e3ec160cb23b351a09b494382e80b0db85bcfe7cfeaa554dd' +b2sums=('d610a2bf375c9147b26d6e314c1e86b9f32453572c1e8a859be3ac5fa42d7ba647334ef76a92a7e1e61f78fa256692bec3d62003589017840a37947d9d5b1de0' 'SKIP' - '8e25246725016ac6a1452592b092616aacba744ee6d1f87355b141011e31d91b2faca01494930a8bb4b816f92f86929098cc60bf786bdc68513e7bc572b06226' - '0e4e01200c6250c6d251d2cb38889e9f488e07b1014ea8c8f81182457cf057ce444b14e21afc786671115ec0b100e3ce9b32a5785c2b0b07b11d956887f477d3' - 'd3b62df935c6f5379b4c11f455a7231ffbab58857bdd650256499a702e54aaa729348054beb7742b90f145893622538aa4345c117238d46687ef6d07d62655da' - 'f2d71e3652594d7c23c87a952c40a3c2d394f6a621dce6a19a0463108695c55f5505d9526abb5283b74e3f84ae51283aeaf0e76a78e8e0133b0b07828def1d1d' - 'bf786a19dd0cc8572880f8339711fa173219b2cb9f44b2a4e48591671770c075706ea6db673ddd2cd49d42bdb2723e0161a704f77c761df5fdf31b033f45b6a0' - '8083144de9dcf8750a502589625d6d16c2316dfb01dddf6b502dbcf5d1632822ed1cee05e5eb0ecf58cd88726cda84b0ea493c1ab6df3a862886756aa78d540a' - '7a9081dee4774f8b2f51dcd980bfcd085ead77fb07915026044792bdf1c8831626173471a2c2cac0e1420fe7f23954b9101eab4884c78c33115f096cd5f560e9' - 'f28183f6fd07ba0e6787e935d56dd683435e0bdd6e04cba717aa5b0da093d40a79a422f3398b813e41d70411cbd664045518050fd9b61a0350e75e36e747c345' - '7fc476dc0fef4d0a11c3f04c33a0350eae87115dcafcfb96a453112041ba88e1cf5a3535c95069568c849f04c356e2bde0686c8e5ba25be7a781b775f808a43c' - '9d1ad2023e9ffc92a4ccb6194a858267fbb6286c13784b8b8a2af3d5814abd0e4229409489f8a6bea5157193324dba58553ba03229169809bec73a8cc59c26ba' - '7d6e7b7c2791971de427b346732c3fa345635db68c84c0b1ac736862fc62da61516975ccd78b28d3df50967d8ae1fe6b3251383733f797c19c1671b8b8a5aa42' - '782f41ae6352cfc1c47ed54eddcded54969c7d43a326dc2d6593b373b4dc4672bc82a6d938090635dc02ef3b3b74e133a2170c7f9c6fd614641c7cb3b013ff2e' - 'ae21b49fe1c6fef81aa93282d0a242c196a0378256e890013a05d4e2f3b79ad92526bd1088ab6e44fba511abeabcb328ef58907ab03214d21d2fb88ea702f3e0' - 'e1da80f3c9197e62223398b717e0c3ecfcdc7f33fa6477a9e8634ae806823c208bd5e05401a0b72a506d8e1df5a5cdf6624ff88926e7042156ee0fb6278e3ca3' + '76c34ea8f8d6fafcbb12fa0e01821af5926e60046c37cee9855786b8bfe16b8ac5222d441335aa01b62e7ebfe2805a1175d00d3bc4ee1c2617173934284c4164' + '5427a9283a9ccb38a63ba5bd680e331245bd134501ce66e912cb07c250e37810a895f4ae78371db2b0cfcbfcb1bee96daafc0e5c71f40ec9b8643d3a88a80bab' + 'fab987c7c77e07ae2db83d148e8d423e6aadbcfc84498a60a6396418c69108c0a38a426eca57c1e94f2540f25cbcd084eafe3d124ac9d0ce2ab4efff28852a16' + 'c5cd99138e9436ede9136e5f958a15a10e07ab51e77dc716158b1ff774d9fa06f4ec2b7a1ba171f4ea86c16ea61fb685b54cadb85411b1c7c468d984b495585d' + 'd283a69b0577dda72ae5814b3c681ca5f0655692216ce77cccc909903fda037feae35fc545c6d54daa377edb71895cfc4f199a335f3f4dfda3cde90350a627b3' + '2328a9bddbb712ffe587a2266d9c6074b4a9e1273b4546e86c56b26dcd7c509398a3e428e6292999bb0297f135683793fa28acfbc4d744962e2ca396943d9ddb' + 'a7318e80116cecfe0c31e254c6d52706ce56d202064d9ff851506569ad602ed106bce216facf793a27266a58b372092e5fa4a19b7b4a7380a789874066d91852' + 'ab7c15c8a219a7e895b39a10a452005252bb018749607676a7e436263a0876d096a5716c9bcbf30e2ff6bc4e525be22ac3838ab3d363373945d5bf5ce43648d4' + 'bb35fce00e121769f4a85c01a799efa7e3eccae8fdd29993d5bbd574a2af50cabeafcf6a9bebf5713223cdb64a53fd7bbf41de7f0a84023531b160e0fe88dc52' + '26082d1d89d9a6e44ea29be9056029f4af228cf22d6c4f6c9f32ed552859bcb8982dc57f63bcb216e220590a029800aeade0bf47356f7ef3ebbe9c0261674379' + 'aba17d1a3a4638d997c33ea385cfd4ac4008a13f31c026e86342169117aa6b238cdebdc4ddbe234e54c68816386ac0e401ecd9e5b49bd42e1ef60eecdf3ad89a' + 'd4878831fa03c17b590001d15ddbbfeb1a8747c961503c26aee330d213c0fbf6c2eab7226456083f52a5fb4b4ffd9bf7b2db741de7c7476a15873f2a8d9f7b74' + '76bb50a23b822de85f3381a511b42bb46110a39d31ede81bd168cb708882b93be525576b1805da5383f35f6f18fab817ad195aa870ab75e7775855a150d172a1' + '726d89aeb1f5df51cfa395e01edb4b8b36460b1f75611ee921d057dfb28cd2d6c41990bca4b40512b9398e0558c4028845252442d9ec1d8f13847a0ed9903a1d' + '00cfbcf17b5f89a0d69f46ea9487088b49b265d360612a777394c69746e13618aff56240dae754111db901891641925b83a8bb95c85c3ee0c11266611d72145c' '8faff0d2b95eda0b96e8042367634c45c1e823238e99793daeda5614efdc448dfe28172bf13f0d988cf4d5cbb4892089893e0183cd8825de7f54942283f2b5a0' '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' '0b11c09e01a7480466d5237a8792c941c9af3e8d6584ffd84285cd9569f5355c10879566ce5846ef9263535020c53e1aa6c58100a571b537ccb7f2431baf7996' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - 'f01a08c06c2888266e5e5929236ad19d03c650fae09f9794840e52692fb93708a2bf88f3a06b4f0ff1ea57d62d6d06d81e5c4ce52f3b55dae1ae71c8d6b736da') + '58e09bb87b4780228e6c347171f06a854356e9af21d1bbb3b697848a13c0d196fc8863c6b1343e7ee0b87c43e739132cd8978f31b4aaf04da1cee728b9d1236d') #export KBUILD_BUILD_HOST=arc4linux export KBUILD_BUILD_USER=$pkgbase @@ -97,61 +99,63 @@ prepare() { # add upstream patch # if [ "$_minver" != "0" ]; then -# msg2 "Applying upstream patch" +# echo "Applying upstream patch" # patch -Np1 < ../patch-${_supver}.${_majver}-${pkgver} # fi # Hotfixes - msg2 "Applying hotfixes" - patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch + echo "Applying hotfixes" + patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch patch -p1 -i ../0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch patch -p1 -i ../0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch - patch -p1 -i ../0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch - patch -p1 -i ../0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch - patch -p1 -i ../0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch - patch -p1 -i ../0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch - patch -p1 -i ../0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch - patch -p1 -i ../0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch - patch -p1 -i ../0010-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch - patch -p1 -i ../0011-drm-915-Limit-audio-CDCLK-2BCLK-constraint-back-to-GLK-only.patch - patch -p1 -i ../0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch - patch -p1 -i ../0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch - patch -p1 -i ../0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch + patch -p1 -i ../0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch + patch -p1 -i ../0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch + patch -p1 -i ../0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch + patch -p1 -i ../0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch + patch -p1 -i ../0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch + patch -p1 -i ../0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch + patch -p1 -i ../0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch + patch -p1 -i ../0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch + patch -p1 -i ../0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch + patch -p1 -i ../0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch + patch -p1 -i ../0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch + patch -p1 -i ../0015-ptp-free-ptp-device-pin-descriptors-properly.patch + # fix naming schema in EXTRAVERSION of ck patch set sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}" # ck patch - msg2 "Applying ck patch" + echo "Applying ck patch" patch -F 3 -Np1 -i ../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion} # graysky gcc hotfixes - msg2 "Applying graysky gcc patch hotfixes" + echo "Applying graysky gcc patch hotfixes" patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch" # graysky gcc patch - msg2 "Applying graysky cpu patch" + echo "Applying graysky cpu patch" patch -p1 -i ../kernel_gcc_patch-${_gccpatchver}/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch # Ignore ath9k eeprom patch - msg2 "Applying ath9k patch" + echo "Applying ath9k patch" patch -p1 -i ../ath9k-regdom-hack.patch # Set default raid6 algo patch - msg2 " Applying raid6 patch" + echo " Applying raid6 patch" patch -p1 -i ../raid6-default-algo.patch - msg2 "Setting version..." + echo "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname - msg2 "Setting config..." + echo "Setting config..." # we are in src/linux-x.yy.zz, looking for a config next to the pkgbuild if [ -f ${SRCDEST}/config.ck.previous ]; then cp ${SRCDEST}/config.ck.previous .config @@ -162,7 +166,7 @@ prepare() { make olddefconfig if [ -f $HOME/.config/modprobed.db ]; then - msg2 "Running make localmodconfig" + echo "Running make localmodconfig" make LSMOD=$HOME/.config/modprobed.db localmodconfig fi @@ -185,10 +189,10 @@ prepare() { cat ../version.temp | tr -d "\n" > version # back up the config - msg2 "Backing up config..." + echo "Backing up config..." cp .config ${SRCDEST}/config.ck.previous - msg2 "Prepared %s version %s" "$pkgbase" "$(<version)" + echo "Prepared %s version %s" "$pkgbase" "$(<version)" } build() { @@ -206,7 +210,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" @@ -214,13 +218,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" } @@ -230,7 +234,7 @@ _package-headers() { cd $_srcname 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 @@ -245,7 +249,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 @@ -261,10 +265,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 @@ -272,16 +276,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 @@ -296,11 +300,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" } @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.0 Kernel Configuration +# Linux/x86 5.4.13 Kernel Configuration # # @@ -6912,7 +6912,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 @@ -10144,7 +10143,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 |