diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index 1f4287eb..8b5d1389 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.8.8 Kernel Configuration +# Linux/x86_64 4.8.13 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/kernel/files/patches/linux/patch-4.8.13.xz b/kernel/kernel/files/patches/linux/patch-4.8.13.xz new file mode 100644 index 00000000..7771da9f Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.8.13.xz differ diff --git a/kernel/kernel/files/patches/mageia/PCI-Don-t-attempt-to-claim-shadow-copies-of-ROM.patch b/kernel/kernel/files/patches/mageia/PCI-Don-t-attempt-to-claim-shadow-copies-of-ROM.patch deleted file mode 100644 index 29a180f3..00000000 --- a/kernel/kernel/files/patches/mageia/PCI-Don-t-attempt-to-claim-shadow-copies-of-ROM.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 16d917b130d782b94fa02afc7bdf0d4aae689da4 Mon Sep 17 00:00:00 2001 -From: Bjorn Helgaas -Date: Tue, 8 Nov 2016 14:25:24 -0600 -Subject: [PATCH] PCI: Don't attempt to claim shadow copies of ROM - -If we're using a shadow copy of a PCI device ROM, the shadow copy is in RAM -and the device never sees accesses to it and doesn't respond to it. We -don't have to route the shadow range to the PCI device, and the device -doesn't have to claim the range. - -Previously we treated the shadow copy as though it were the ROM BAR, and we -failed to claim it because the region wasn't routed to the device: - - pci 0000:01:00.0: Video device with shadowed ROM at [mem 0x000c0000-0x000dffff] - pci_bus 0000:01: Allocating resources - pci 0000:01:00.0: can't claim BAR 6 [mem 0x000c0000-0x000dffff]: no compatible bridge window - -The failure path of pcibios_allocate_dev_rom_resource() cleared out the -resource start address, which also caused the following ioremap() warning: - - WARNING: CPU: 0 PID: 116 at /build/linux-akdJXO/linux-4.8.0/arch/x86/mm/ioremap.c:121 __ioremap_caller+0x1ec/0x370 - ioremap on RAM at 0x0000000000000000 - 0x000000000001ffff - -Handle an option ROM shadow copy as RAM, without trying to insert it into -the iomem resource tree. - -This fixes a regression caused by 0c0e0736acad ("PCI: Set ROM shadow -location in arch code, not in PCI core"), which appeared in v4.6. The -regression causes video device initialization to fail. This was reported -on AMD Turks, but it likely affects others as well. - -Fixes: 0c0e0736acad ("PCI: Set ROM shadow location in arch code, not in PCI core") -Reported-and-tested-by: Vecu Bosseur -Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1627496 -Link: https://bugzilla.kernel.org/show_bug.cgi?id=175391 -Link: https://bugzilla.redhat.com/show_bug.cgi?id=1352272 -Signed-off-by: Bjorn Helgaas -CC: stable@vger.kernel.org # v4.6+ ---- - drivers/pci/setup-res.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c -index 66c4d8f..9526e34 100644 ---- a/drivers/pci/setup-res.c -+++ b/drivers/pci/setup-res.c -@@ -121,6 +121,14 @@ int pci_claim_resource(struct pci_dev *dev, int resource) - return -EINVAL; - } - -+ /* -+ * If we have a shadow copy in RAM, the PCI device doesn't respond -+ * to the shadow range, so we don't need to claim it, and upstream -+ * bridges don't need to route the range to the device. -+ */ -+ if (res->flags & IORESOURCE_ROM_SHADOW) -+ return 0; -+ - root = pci_find_parent_resource(dev, res); - if (!root) { - dev_info(&dev->dev, "can't claim BAR %d %pR: no compatible bridge window\n", --- -2.10.2 - diff --git a/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch b/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch deleted file mode 100644 index a30f81df..00000000 --- a/kernel/kernel/files/patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e461958e7a7eb8df2e022e02f782dff5f60a44d0 Mon Sep 17 00:00:00 2001 -From: Thomas Backlund -Date: Sun, 16 Oct 2016 20:09:27 +0300 -Subject: [PATCH] Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" - -This reverts commit cf00713a655d3019be7faa184402f16c43a0fed3. - -It causes linux-atm build breakage between glibc headers and kernel headers... - -Fixws are in progress upstream as of: -https://patchwork.kernel.org/patch/9294305/ - -But it's not accepted yet so it might still change, and since its uapi -we dont want to expose changes that might never land upstream. - -Reported by: Pascal Terjam -Signed-off-by: Thomas Backlund - ---- - include/uapi/linux/atm_zatm.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h -index 5cd4d4d..9c9c6ad 100644 ---- a/include/uapi/linux/atm_zatm.h -+++ b/include/uapi/linux/atm_zatm.h -@@ -14,7 +14,6 @@ - - #include - #include --#include - - #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) - /* get pool statistics */ --- -2.10.1 - diff --git a/kernel/kernel/files/patches/mageia/gpu-drm-amdgpu-fix-crash-in-acp_hw_fini.patch b/kernel/kernel/files/patches/mageia/gpu-drm-amdgpu-fix-crash-in-acp_hw_fini.patch deleted file mode 100644 index 409f10c6..00000000 --- a/kernel/kernel/files/patches/mageia/gpu-drm-amdgpu-fix-crash-in-acp_hw_fini.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 757124d95c42bb579d67df51e51789849929ee31 Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Thu, 3 Nov 2016 17:47:51 -0400 -Subject: [PATCH] drm/amdgpu: fix crash in acp_hw_fini - -On CZ/ST systems with AZ rather than ACP audio, we need to bail -early in hw_fini since there is nothing to do. - -bug: https://bugs.freedesktop.org/show_bug.cgi?id=98276 - -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c -index 892d60f..2057683 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c -@@ -395,9 +395,12 @@ static int acp_hw_fini(void *handle) - { - int i, ret; - struct device *dev; -- - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -+ /* return early if no ACP */ -+ if (!adev->acp.acp_genpd) -+ return 0; -+ - for (i = 0; i < ACP_DEVS ; i++) { - dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i); - ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev); --- -2.10.2 - diff --git a/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-BDW-cdclk-fix-for-DP-audio.patch b/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-BDW-cdclk-fix-for-DP-audio.patch deleted file mode 100644 index 4309b478..00000000 --- a/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-BDW-cdclk-fix-for-DP-audio.patch +++ /dev/null @@ -1,88 +0,0 @@ -From fbb21c5202ae7f1e71e832b1af59fb047da6383e Mon Sep 17 00:00:00 2001 -From: Dhinakaran Pandiyan -Date: Tue, 1 Nov 2016 11:47:59 -0700 -Subject: [PATCH] drm/i915/dp: BDW cdclk fix for DP audio -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -According to BSpec, cdclk for BDW has to be not less than 432 MHz with DP -audio enabled, port width x4, and link rate HBR2 (5.4 GHz). With cdclk less -than 432 MHz, enabling audio leads to pipe FIFO underruns and displays -cycling on/off. - -From BSpec: -"Display» BDW-SKL» dpr» [Register] DP_TP_CTL [BDW+,EXCLUDE(CHV)] -Workaround : Do not use DisplayPort with CDCLK less than 432 MHz, audio -enabled, port width x4, and link rate HBR2 (5.4 GHz), or else there may -be audio corruption or screen corruption." - -Since, some DP configurations (e.g., MST) use port width x4 and HBR2 -link rate, let's increase the cdclk to >= 432 MHz to enable audio for those -cases. - -v4: Changed commit message -v3: Combine BDW pixel rate adjustments into a function (Jani) -v2: Restrict fix to BDW - Retain the set cdclk across modesets (Ville) -Cc: stable@vger.kernel.org -Signed-off-by: Dhinakaran Pandiyan -Reviewed-by: Ville Syrjälä -Reviewed-by: Jani Nikula -Signed-off-by: Jani Nikula -Link: http://patchwork.freedesktop.org/patch/msgid/1478026080-2925-1-git-send-email-dhinakaran.pandiyan@intel.com - -(cherry picked from commit b30ce9e0552aa017ac6f2243f3c2d8e36fe52e69) -Signed-off-by: Jani Nikula ---- - drivers/gpu/drm/i915/intel_display.c | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 0ad1879..4f57f8c 100644 ---- a/drivers/gpu/drm/i915/intel_display.c -+++ b/drivers/gpu/drm/i915/intel_display.c -@@ -10243,6 +10243,27 @@ static void bxt_modeset_commit_cdclk(struct drm_atomic_state *old_state) - bxt_set_cdclk(to_i915(dev), req_cdclk); - } - -+static int bdw_adjust_min_pipe_pixel_rate(struct intel_crtc_state *crtc_state, -+ int pixel_rate) -+{ -+ /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ -+ if (crtc_state->ips_enabled) -+ pixel_rate = DIV_ROUND_UP(pixel_rate * 100, 95); -+ -+ /* BSpec says "Do not use DisplayPort with CDCLK less than -+ * 432 MHz, audio enabled, port width x4, and link rate -+ * HBR2 (5.4 GHz), or else there may be audio corruption or -+ * screen corruption." -+ */ -+ if (intel_crtc_has_dp_encoder(crtc_state) && -+ crtc_state->has_audio && -+ crtc_state->port_clock >= 540000 && -+ crtc_state->lane_count == 4) -+ pixel_rate = max(432000, pixel_rate); -+ -+ return pixel_rate; -+} -+ - /* compute the max rate for new configuration */ - static int ilk_max_pixel_rate(struct drm_atomic_state *state) - { -@@ -10268,9 +10289,9 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state) - - pixel_rate = ilk_pipe_pixel_rate(crtc_state); - -- /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ -- if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled) -- pixel_rate = DIV_ROUND_UP(pixel_rate * 100, 95); -+ if (IS_BROADWELL(dev_priv)) -+ pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state, -+ pixel_rate); - - intel_state->min_pixclk[i] = pixel_rate; - } --- -2.10.2 - diff --git a/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-Extend-BDW-DP-audio-workaround-to-GEN9-p.patch b/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-Extend-BDW-DP-audio-workaround-to-GEN9-p.patch deleted file mode 100644 index a334c098..00000000 --- a/kernel/kernel/files/patches/mageia/gpu-drm-i915-dp-Extend-BDW-DP-audio-workaround-to-GEN9-p.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 61e0c5438866d0e737937fc35d752538960e1e9f Mon Sep 17 00:00:00 2001 -From: Dhinakaran Pandiyan -Date: Wed, 2 Nov 2016 13:13:21 -0700 -Subject: [PATCH] drm/i915/dp: Extend BDW DP audio workaround to GEN9 platforms - -According to BSpec, cdclk for BDW has to be not less than 432 MHz with DP -audio enabled, port width x4, and link rate HBR2 (5.4 GHz). With cdclk less -than 432 MHz, enabling audio leads to pipe FIFO underruns and displays -cycling on/off. - -Let's apply this work around to GEN9 platforms too, as it fixes the same -issue. - -v2: Move drm_device to drm_i915_private conversion - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97907 -Cc: stable@vger.kernel.org -Cc: Libin Yang -Signed-off-by: Dhinakaran Pandiyan -Reviewed-by: Jani Nikula -Signed-off-by: Jani Nikula -Link: http://patchwork.freedesktop.org/patch/msgid/1478117601-19122-1-git-send-email-dhinakaran.pandiyan@intel.com -(cherry picked from commit 9c7540241885838cfc7fa58c4a8bd75be0303ed1) -Signed-off-by: Jani Nikula ---- - drivers/gpu/drm/i915/intel_display.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 4f57f8c..81c1149 100644 ---- a/drivers/gpu/drm/i915/intel_display.c -+++ b/drivers/gpu/drm/i915/intel_display.c -@@ -10246,8 +10246,10 @@ static void bxt_modeset_commit_cdclk(struct drm_atomic_state *old_state) - static int bdw_adjust_min_pipe_pixel_rate(struct intel_crtc_state *crtc_state, - int pixel_rate) - { -+ struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); -+ - /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ -- if (crtc_state->ips_enabled) -+ if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled) - pixel_rate = DIV_ROUND_UP(pixel_rate * 100, 95); - - /* BSpec says "Do not use DisplayPort with CDCLK less than -@@ -10289,7 +10291,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state) - - pixel_rate = ilk_pipe_pixel_rate(crtc_state); - -- if (IS_BROADWELL(dev_priv)) -+ if (IS_BROADWELL(dev_priv) || IS_GEN9(dev_priv)) - pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state, - pixel_rate); - --- -2.10.2 - diff --git a/kernel/kernel/files/patches/mageia/kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch b/kernel/kernel/files/patches/mageia/kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch deleted file mode 100644 index 05b8cf99..00000000 --- a/kernel/kernel/files/patches/mageia/kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9f692cbe4a01dd9e3c3e954ec6b59662b68f9ce4 Mon Sep 17 00:00:00 2001 -From: Laura Abbott -Date: Fri, 9 Sep 2016 10:19:02 -0700 -Subject: [PATCH] cpupower: Correct return type of cpu_power_is_cpu_online in - cpufreq -To: Thomas Renninger -Cc: linux-pm@vger.kernel.org -Cc: linux-kernel@vger.kernel.org - -When converting to a shared library in ac5a181d065d ("cpupower: Add -cpuidle parts into library"), cpu_freq_cpu_exists was converted to -cpupower_is_cpu_online. cpu_req_cpu_exists returned 0 on success and --ENOSYS on failure whereas cpupower_is_cpu_online returns 1 on success. -Check for the correct return value in cpufreq-set. - -See https://bugzilla.redhat.com/show_bug.cgi?id=1374212 - -Fixes: ac5a181d065d ("cpupower: Add cpuidle parts into library") -Reported-by: Julian Seward -Signed-off-by: Laura Abbott ---- - tools/power/cpupower/utils/cpufreq-set.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c -index b4bf769..8971d71 100644 ---- a/tools/power/cpupower/utils/cpufreq-set.c -+++ b/tools/power/cpupower/utils/cpufreq-set.c -@@ -296,7 +296,7 @@ int cmd_freq_set(int argc, char **argv) - struct cpufreq_affected_cpus *cpus; - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpupower_is_cpu_online(cpu)) -+ cpupower_is_cpu_online(cpu) != 1) - continue; - - cpus = cpufreq_get_related_cpus(cpu); -@@ -316,7 +316,7 @@ int cmd_freq_set(int argc, char **argv) - cpu <= bitmask_last(cpus_chosen); cpu++) { - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpupower_is_cpu_online(cpu)) -+ cpupower_is_cpu_online(cpu) != 1) - continue; - - if (cpupower_is_cpu_online(cpu) != 1) --- -2.10.0 - diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series index 2fdc824d..2a2a481b 100644 --- a/kernel/kernel/files/patches/mageia/series +++ b/kernel/kernel/files/patches/mageia/series @@ -14,6 +14,7 @@ ### ### Stable Queue ### +patch-4.8.10-rc1.patch ### ### Arch x86 @@ -46,11 +47,6 @@ Revert-x86-mm-mtrr-Remove-kernel-internal-MTRR-inter.patch ### base-cacheinfo-silence-DT-warnings.patch -# Patch for having the cpupower setting the governor -# (from https://bugzilla.kernel.org/show_bug.cgi?id=135391, same as -# https://bugzilla.redhat.com/show_bug.cgi?id=1374212) -kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch - ### ### i2c ### @@ -65,9 +61,6 @@ kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch pci-add-ALI-M5229-ide-compatibility-mode-quirk.patch pci-quirks-drop-devinit-exit.patch -# fix video detection failure on Amd Turks -PCI-Don-t-attempt-to-claim-shadow-copies-of-ROM.patch - ### ### PNP core ### @@ -187,13 +180,6 @@ gpu-drm-mach64-linux-3.14-buildfix.patch gpu-drm-mach64-3.17-buildfix.patch gpu-drm-mach64-3.18-buildfix.patch -# amdgpu crash -gpu-drm-amdgpu-fix-crash-in-acp_hw_fini.patch - -# i915 dp fix -gpu-drm-i915-dp-BDW-cdclk-fix-for-DP-audio.patch -gpu-drm-i915-dp-Extend-BDW-DP-audio-workaround-to-GEN9-p.patch - ### ### Hardware Monitoring ### @@ -385,5 +371,3 @@ tools-testing-selftest-Makefile-remove-powerpc-reference.patch ### ### UAPI ### -# breaks linux-arm build -Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 715d3043..7fc3e080 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,8 +28,8 @@ - patches/linux/patch-4.8.8.xz - + patches/linux/patch-4.8.13.xz + patches/mageia/Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch @@ -40,10 +40,8 @@ patches/mageia/Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch patches/mageia/Revert-x86-mm-mtrr-Remove-kernel-internal-MTRR-inter.patch patches/mageia/base-cacheinfo-silence-DT-warnings.patch - patches/mageia/kernel-governor-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch patches/mageia/pci-add-ALI-M5229-ide-compatibility-mode-quirk.patch patches/mageia/pci-quirks-drop-devinit-exit.patch - patches/mageia/PCI-Don-t-attempt-to-claim-shadow-copies-of-ROM.patch patches/mageia/acpi-CLEVO-M360S-disable_acpi_irq.patch patches/mageia/acpi-processor-M720SR-limit-to-C2.patch patches/mageia/ACPI-video-Add-a-quirk-to-force-acpi-video-backlight.patch @@ -85,10 +83,7 @@ patches/mageia/gpu-drm-mach64-restore-mach64_PCI_IDS.patch patches/mageia/gpu-drm-mach64-linux-3.14-buildfix.patch patches/mageia/gpu-drm-mach64-3.17-buildfix.patch - patches/mageia/gpu-drm-mach64-3.18-buildfix.patch - patches/mageia/gpu-drm-amdgpu-fix-crash-in-acp_hw_fini.patch - patches/mageia/gpu-drm-i915-dp-BDW-cdclk-fix-for-DP-audio.patch - patches/mageia/gpu-drm-i915-dp-Extend-BDW-DP-audio-workaround-to-GEN9-p.patch + patches/mageia/gpu-drm-mach64-3.18-buildfix.patch patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch patches/mageia/net-sis190-fix-list-usage.patch patches/mageia/net-netfilter-IFWLOG.patch @@ -139,7 +134,6 @@ patches/mageia/3rd-rtl8723bs-4.7-buildfix.patch patches/mageia/3rd-rtl8723bs-4.8-buildfix.patch patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch - patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch @@ -196,8 +190,8 @@ - 2016-11-16 - 4.8.8 + 2016-12-10 + 4.8.13 Version Bump. security