From: Greg Kroah-Hartman Date: Mon, 12 Nov 2018 13:32:17 +0000 (-0800) Subject: drop cpupower-fix-coredump-on-vmware.patch from 4.4 and 4.9 X-Git-Tag: v4.19.2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2651d231208a5049d28dbbfa73853e81596b42e7;p=thirdparty%2Fkernel%2Fstable-queue.git drop cpupower-fix-coredump-on-vmware.patch from 4.4 and 4.9 --- diff --git a/queue-4.4/cpupower-fix-coredump-on-vmware.patch b/queue-4.4/cpupower-fix-coredump-on-vmware.patch deleted file mode 100644 index 576affd808b..00000000000 --- a/queue-4.4/cpupower-fix-coredump-on-vmware.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Sat Nov 10 11:34:22 PST 2018 -From: Prarit Bhargava -Date: Mon, 8 Oct 2018 11:06:19 -0400 -Subject: cpupower: Fix coredump on VMWare - -From: Prarit Bhargava - -[ Upstream commit f69ffc5d3db8f1f03fd6d1df5930f9a1fbd787b6 ] - -cpupower crashes on VMWare guests. The guests have the AMD PStateDef MSR -(0xC0010064 + state number) set to zero. As a result fid and did are zero -and the crash occurs because of a divide by zero (cof = fid/did). This -can be prevented by checking the enable bit in the PStateDef MSR before -calculating cof. By doing this the value of pstate[i] remains zero and -the value can be tested before displaying the active Pstates. - -Check the enable bit in the PstateDef register for all supported families -and only print out enabled Pstates. - -Signed-off-by: Prarit Bhargava -Cc: Shuah Khan -Cc: Stafford Horne -Signed-off-by: Shuah Khan (Samsung OSG) -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - tools/power/cpupower/utils/cpufreq-info.c | 2 ++ - tools/power/cpupower/utils/helpers/amd.c | 5 +++++ - 2 files changed, 7 insertions(+) - ---- a/tools/power/cpupower/utils/cpufreq-info.c -+++ b/tools/power/cpupower/utils/cpufreq-info.c -@@ -200,6 +200,8 @@ static int get_boost_mode(unsigned int c - printf(_(" Boost States: %d\n"), b_states); - printf(_(" Total States: %d\n"), pstate_no); - for (i = 0; i < pstate_no; i++) { -+ if (!pstates[i]) -+ continue; - if (i < b_states) - printf(_(" Pstate-Pb%d: %luMHz (boost state)" - "\n"), i, pstates[i]); ---- a/tools/power/cpupower/utils/helpers/amd.c -+++ b/tools/power/cpupower/utils/helpers/amd.c -@@ -103,6 +103,11 @@ int decode_pstates(unsigned int cpu, uns - } - if (read_msr(cpu, MSR_AMD_PSTATE + i, &pstate.val)) - return -1; -+ if ((cpu_family == 0x17) && (!pstate.fam17h_bits.en)) -+ continue; -+ else if (!pstate.bits.en) -+ continue; -+ - pstates[i] = get_cof(cpu_family, pstate); - } - *no = i; diff --git a/queue-4.4/series b/queue-4.4/series index c6694202355..8ae40146f98 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -21,7 +21,6 @@ swim-fix-cleanup-on-setup-error.patch tun-consistently-configure-generic-netdev-params-via-rtnetlink.patch perf-tools-free-temporary-sys-string-in-read_event_files.patch perf-tools-cleanup-trace-event-info-tdata-leak.patch -cpupower-fix-coredump-on-vmware.patch mmc-sdhci-pci-o2micro-add-quirk-for-o2-micro-dev-0x8620-rev-0x01.patch x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch bluetooth-btbcm-add-entry-for-bcm4335c0-uart-bluetooth.patch diff --git a/queue-4.9/cpupower-fix-coredump-on-vmware.patch b/queue-4.9/cpupower-fix-coredump-on-vmware.patch deleted file mode 100644 index 9f160b8bc93..00000000000 --- a/queue-4.9/cpupower-fix-coredump-on-vmware.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Sat Nov 10 11:24:34 PST 2018 -From: Prarit Bhargava -Date: Mon, 8 Oct 2018 11:06:19 -0400 -Subject: cpupower: Fix coredump on VMWare - -From: Prarit Bhargava - -[ Upstream commit f69ffc5d3db8f1f03fd6d1df5930f9a1fbd787b6 ] - -cpupower crashes on VMWare guests. The guests have the AMD PStateDef MSR -(0xC0010064 + state number) set to zero. As a result fid and did are zero -and the crash occurs because of a divide by zero (cof = fid/did). This -can be prevented by checking the enable bit in the PStateDef MSR before -calculating cof. By doing this the value of pstate[i] remains zero and -the value can be tested before displaying the active Pstates. - -Check the enable bit in the PstateDef register for all supported families -and only print out enabled Pstates. - -Signed-off-by: Prarit Bhargava -Cc: Shuah Khan -Cc: Stafford Horne -Signed-off-by: Shuah Khan (Samsung OSG) -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - tools/power/cpupower/utils/cpufreq-info.c | 2 ++ - tools/power/cpupower/utils/helpers/amd.c | 5 +++++ - 2 files changed, 7 insertions(+) - ---- a/tools/power/cpupower/utils/cpufreq-info.c -+++ b/tools/power/cpupower/utils/cpufreq-info.c -@@ -202,6 +202,8 @@ static int get_boost_mode(unsigned int c - printf(_(" Boost States: %d\n"), b_states); - printf(_(" Total States: %d\n"), pstate_no); - for (i = 0; i < pstate_no; i++) { -+ if (!pstates[i]) -+ continue; - if (i < b_states) - printf(_(" Pstate-Pb%d: %luMHz (boost state)" - "\n"), i, pstates[i]); ---- a/tools/power/cpupower/utils/helpers/amd.c -+++ b/tools/power/cpupower/utils/helpers/amd.c -@@ -103,6 +103,11 @@ int decode_pstates(unsigned int cpu, uns - } - if (read_msr(cpu, MSR_AMD_PSTATE + i, &pstate.val)) - return -1; -+ if ((cpu_family == 0x17) && (!pstate.fam17h_bits.en)) -+ continue; -+ else if (!pstate.bits.en) -+ continue; -+ - pstates[i] = get_cof(cpu_family, pstate); - } - *no = i; diff --git a/queue-4.9/series b/queue-4.9/series index c072afa1ebb..19157ac0550 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -33,7 +33,6 @@ hwmon-pwm-fan-set-fan-speed-to-0-on-suspend.patch perf-tools-free-temporary-sys-string-in-read_event_files.patch perf-tools-cleanup-trace-event-info-tdata-leak.patch perf-strbuf-match-va_-add-copy-with-va_end.patch -cpupower-fix-coredump-on-vmware.patch mmc-sdhci-pci-o2micro-add-quirk-for-o2-micro-dev-0x8620-rev-0x01.patch iwlwifi-pcie-avoid-empty-free-rb-queue.patch x86-olpc-indicate-that-legacy-pc-xo-1-platform-should-not-register-rtc.patch