diff options
18 files changed, 62 insertions, 207 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-rt - pkgver = 5.4.13.7 + pkgver = 5.4.17.9 pkgrel = 1 url = https://wiki.linuxfoundation.org/realtime/start arch = x86_64 @@ -15,10 +15,10 @@ pkgbase = linux-rt makedepends = python-sphinx_rtd_theme makedepends = xmlto options = !strip - 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 = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.13-rt7.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.13-rt7.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.17.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.17.tar.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.17-rt9.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.17-rt9.patch.sign source = config source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch @@ -30,37 +30,31 @@ pkgbase = linux-rt 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 validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73 validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 - sha256sums = 49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7 + sha256sums = 945f2bf6af69eed0ac81ef75b571f37ae1e16a9bb8a2ae698a365ee3ec2c74b9 sha256sums = SKIP - sha256sums = 435449401c9c5fce7c456b274ca6084b6ffd54319dbef8d4f13d23a8f1303b40 + sha256sums = f836174fc06ca8c9edb69d7d7ea480a6f6957caf00dfc08b042dbdd85a5cf265 sha256sums = SKIP - sha256sums = e3fa845780853cd99b7579cd36b5dd5f27f163093cb223cdcfe3cf51aa8f0b0a - sha256sums = a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39 - sha256sums = 134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf - sha256sums = 0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36 - sha256sums = a03b5c63b288b0334fd6e0340e3fb99e9e21850973efe7592ae116745e3bcbb5 - sha256sums = 6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9 - sha256sums = d03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e - sha256sums = b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632 - sha256sums = ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed - sha256sums = f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999 - sha256sums = 0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec - sha256sums = a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef - sha256sums = 80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499 - sha256sums = fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0 - sha256sums = ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a - sha256sums = 19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad + sha256sums = 6717f70ab716375d769f83db43f0c16b45dd041cb24f3c4c0a29ff9d9b405dca + sha256sums = ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85 + sha256sums = cce19157ce22b33b33cd6ba917d1994ad7b2456cb0bbae004ed9276d6af2f2fa + sha256sums = 4b8dc61f03a6b72eec64de86c2ccf8e98dab44f72f7daad0cec2723b3d06331c + sha256sums = 6055025e53d87087774f7497088bf1a2ba43404c6629fd8601302496c226896d + sha256sums = f48c9a8a286901ce12eefe11fbd830fdede08afac8911ab887f7d89c687421f0 + sha256sums = 194b893c18118be08c5d42762f5f1926953fc7a5903f06f1d39f893542d377a9 + sha256sums = 2234444ae52bf3810e13bdb4c0ab6d808eb9fe6cb003c2b78be04a987ef12388 + sha256sums = 5a1584d26c7d046fa0398b56980f628b4194dff95d0916e9527dbea7299e7765 + sha256sums = de34a0a82ce40de4394ad9d02421a53ac04c5e0b36a79b5f937fdebc93ac7bfb + sha256sums = 1a3073cbbc5d4e3a7970fc92706a5ec5729ea4a5cffb94af8343e046881cabf1 + sha256sums = bb376024ac7a13108064af60150af8746b57ebb72df2f464fddc037a14c9faff + sha256sums = 7e6b2c7f919dc28d1144fe8d5cc08f9455ba65a32577944cf86d9c278fff6d20 pkgname = linux-rt pkgdesc = The Linux-rt 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 a0f85248be18..30c857593c0e 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 ace933a17f0b2e6e75e5ed330e8c12efae62aa53 Mon Sep 17 00:00:00 2001 +From b11c6d42fcbbbb0f807dd23ede4931cbee54f9a9 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/16] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 01/15] 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 3f0667d80b0c..626da546082b 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 78b64515af95e12dac806fa630ae4499e9527100 Mon Sep 17 00:00:00 2001 +From c1514f7f277ce90eaf74cbb52ad484fcd2aa3100 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/16] lib: devres: add a helper function for ioremap_uc +Subject: [PATCH 02/15] 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 75641b535107..faae68a0cc77 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 dbc56c8785b2f6698722f3e9c189c7cb1f963679 Mon Sep 17 00:00:00 2001 +From c751a20a61358f55933194dbd83e592a730ad0cb 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/16] mfd: intel-lpss: Use devm_ioremap_uc for MMIO +Subject: [PATCH 03/15] 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-Prevent-deadlock-on-disconnect.patch b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch index a094e6c5a399..9cd07e81d39b 100644 --- a/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch +++ b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch @@ -1,7 +1,7 @@ -From fa21078f336286d835bc734c8b4e4a24b67f245e Mon Sep 17 00:00:00 2001 +From 46131a2bddc04cd7a647703e7ef372534d3b43e5 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 04/16] PCI: pciehp: Prevent deadlock on disconnect +Subject: [PATCH 04/15] PCI: pciehp: Prevent deadlock on disconnect This addresses deadlocks in these common cases in hierarchies containing two switches: diff --git a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch index 9abef27eea2a..de9c756f9046 100644 --- a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch +++ b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch @@ -1,7 +1,7 @@ -From 7f6991978c1c388c2b11bb8101e4658f81fe85ed Mon Sep 17 00:00:00 2001 +From 766611dcde15685197f756d86f4ada389a98375e 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 05/16] ACPI: PM: s2idle: Rework ACPI events synchronization +Subject: [PATCH 05/15] 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/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch index 2f69a8adb70e..076285303e74 100644 --- a/0006-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 50b253fe7f01a82c8054d88319598db71ae5d083 Mon Sep 17 00:00:00 2001 +From 1987607625d918069643bfb43f93dcdc3647f3d6 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 06/16] iwlwifi: pcie: restore support for Killer Qu C0 NICs +Subject: [PATCH 06/15] 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/0007-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 a128921803fa..6447ca265923 100644 --- a/0007-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 e0a3ce4a9ebf049e76ea38c48e41f2c67f4b3330 Mon Sep 17 00:00:00 2001 +From c70869ad6f3a5f9bc48fb62486d159ac0d61b13e 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 07/16] drm/i915: save AUD_FREQ_CNTRL state at audio domain +Subject: [PATCH 07/15] drm/i915: save AUD_FREQ_CNTRL state at audio domain suspend When audio power domain is suspended, the display driver must diff --git a/0008-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 aa403bc281c0..034721abba9b 100644 --- a/0008-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 e4bcd75c297598b87b89533c2c995f7d88c12010 Mon Sep 17 00:00:00 2001 +From fb5c4a65581a781da9bc327c51752616580fad95 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 08/16] drm/i915: Fix audio power up sequence for gen10+ +Subject: [PATCH 08/15] 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/0009-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 07dee0655f68..0b7c556cbb96 100644 --- a/0009-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 7ff6d556c831f5f909b3315974816a45a3802670 Mon Sep 17 00:00:00 2001 +From 3176065daacab3967392e20e1fad611f83f73d9c 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 09/16] drm/i915: extend audio CDCLK>=2*BCLK constraint to more +Subject: [PATCH 09/15] 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/0010-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 edd4404b9fe6..63672d7ae3b1 100644 --- a/0010-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 ce769a8e35537fc71cc9934a1fa39a481f994b25 Mon Sep 17 00:00:00 2001 +From e16ed265e3aad492d0143a41b22eeb050b3dc60f 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 10/16] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to +Subject: [PATCH 10/15] 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/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch deleted file mode 100644 index 13d562a6fa08..000000000000 --- a/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 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, -with previous commits explicitly providing the previously default -offsets. However, the is_offset value in SPTH_COMMUNITY is missing, -preventing related irq from being properly detected and handled. - -Fixes: f702e0b93cdb ("pinctrl: sunrisepoint: Provide Interrupt Status register offset") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=205745 -Cc: stable@vger.kernel.org -Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com> ---- - drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c -index 44d7f50bbc82..d936e7aa74c4 100644 ---- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c -+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c -@@ -49,6 +49,7 @@ - .padown_offset = SPT_PAD_OWN, \ - .padcfglock_offset = SPT_PADCFGLOCK, \ - .hostown_offset = SPT_HOSTSW_OWN, \ -+ .is_offset = SPT_GPI_IS, \ - .ie_offset = SPT_GPI_IE, \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ --- -2.25.0 - diff --git a/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch deleted file mode 100644 index 901b06d38715..000000000000 --- a/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 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 -the OTP burned in the device, which contains the list of available -channels). For instance: - -iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD - -This bug was reported in the ArchLinux bug tracker: -https://bugs.archlinux.org/task/64703 - -And also in a specific case in bugzilla, when the lar_disabled option -was set: https://bugzilla.kernel.org/show_bug.cgi?id=205193 - -Revert the commit that introduced this error, by using the number of -channels from the OTP instead of the number of channels that is -specified in the FW TLV that tells us how many channels it supports. - -This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b. - -Cc: stable@vger.kernel.org # v5.4+ -Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com> -[ Luca: reworded the commit message a bit. ] -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> ---- - drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c -index fcafa22ec6ce..8aa567d7912c 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c -@@ -1220,7 +1220,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm) - cmd_size = sizeof(struct iwl_scan_config_v2); - else - cmd_size = sizeof(struct iwl_scan_config_v1); -- cmd_size += num_channels; -+ cmd_size += mvm->fw->ucode_capa.n_scan_channels; - - cfg = kzalloc(cmd_size, GFP_KERNEL); - if (!cfg) --- -2.25.0 - diff --git a/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch index 221543b62b55..888575723b8c 100644 --- a/0013-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 cce47515454675d9c82448e865b42570f9eabc39 Mon Sep 17 00:00:00 2001 +From b11d7c088173fbb39544fa7a95fc13c0b89896ba 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 13/16] e1000e: Revert "e1000e: Make watchdog use delayed work" +Subject: [PATCH 13/15] 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 index a12039123a67..441f1208aa2f 100644 --- a/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch +++ b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch @@ -1,7 +1,7 @@ -From f247d4a6fe42acc60b775457e3c35b8289532590 Mon Sep 17 00:00:00 2001 +From a952be50df891611e459512fc05818238c2c4cd0 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 +Subject: [PATCH 14/15] drm/amdgpu: Add DC feature mask to disable fractional pwm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0015-ptp-free-ptp-device-pin-descriptors-properly.patch b/0015-ptp-free-ptp-device-pin-descriptors-properly.patch deleted file mode 100644 index 6298fa443499..000000000000 --- a/0015-ptp-free-ptp-device-pin-descriptors-properly.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 - @@ -7,8 +7,8 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-rt -_pkgver=5.4.13 -_rtpatchver=7 +_pkgver=5.4.17 +_rtpatchver=9 pkgver="${_pkgver}.${_rtpatchver}" pkgrel=1 arch=('x86_64') @@ -34,11 +34,8 @@ source=( 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 @@ -48,26 +45,23 @@ validpgpkeys=( '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt 'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner ) -sha256sums=('49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7' +sha256sums=('945f2bf6af69eed0ac81ef75b571f37ae1e16a9bb8a2ae698a365ee3ec2c74b9' 'SKIP' - '435449401c9c5fce7c456b274ca6084b6ffd54319dbef8d4f13d23a8f1303b40' + 'f836174fc06ca8c9edb69d7d7ea480a6f6957caf00dfc08b042dbdd85a5cf265' 'SKIP' - 'e3fa845780853cd99b7579cd36b5dd5f27f163093cb223cdcfe3cf51aa8f0b0a' - 'a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39' - '134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf' - '0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36' - 'a03b5c63b288b0334fd6e0340e3fb99e9e21850973efe7592ae116745e3bcbb5' - '6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9' - 'd03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e' - 'b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632' - 'ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed' - 'f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999' - '0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec' - 'a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef' - '80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499' - 'fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0' - 'ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a' - '19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad') + '6717f70ab716375d769f83db43f0c16b45dd041cb24f3c4c0a29ff9d9b405dca' + 'ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85' + 'cce19157ce22b33b33cd6ba917d1994ad7b2456cb0bbae004ed9276d6af2f2fa' + '4b8dc61f03a6b72eec64de86c2ccf8e98dab44f72f7daad0cec2723b3d06331c' + '6055025e53d87087774f7497088bf1a2ba43404c6629fd8601302496c226896d' + 'f48c9a8a286901ce12eefe11fbd830fdede08afac8911ab887f7d89c687421f0' + '194b893c18118be08c5d42762f5f1926953fc7a5903f06f1d39f893542d377a9' + '2234444ae52bf3810e13bdb4c0ab6d808eb9fe6cb003c2b78be04a987ef12388' + '5a1584d26c7d046fa0398b56980f628b4194dff95d0916e9527dbea7299e7765' + 'de34a0a82ce40de4394ad9d02421a53ac04c5e0b36a79b5f937fdebc93ac7bfb' + '1a3073cbbc5d4e3a7970fc92706a5ec5729ea4a5cffb94af8343e046881cabf1' + 'bb376024ac7a13108064af60150af8746b57ebb72df2f464fddc037a14c9faff' + '7e6b2c7f919dc28d1144fe8d5cc08f9455ba65a32577944cf86d9c278fff6d20') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.13 Kernel Configuration +# Linux/x86 5.4.17 Kernel Configuration # # |