]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop cpupower-fix-coredump-on-vmware.patch from 4.4 and 4.9
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2018 13:32:17 +0000 (05:32 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2018 13:32:17 +0000 (05:32 -0800)
queue-4.4/cpupower-fix-coredump-on-vmware.patch [deleted file]
queue-4.4/series
queue-4.9/cpupower-fix-coredump-on-vmware.patch [deleted file]
queue-4.9/series

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 (file)
index 576affd..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From foo@baz Sat Nov 10 11:34:22 PST 2018
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Mon, 8 Oct 2018 11:06:19 -0400
-Subject: cpupower: Fix coredump on VMWare
-
-From: Prarit Bhargava <prarit@redhat.com>
-
-[ 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 <prarit@redhat.com>
-Cc: Shuah Khan <shuah@kernel.org>
-Cc: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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;
index c66942023550b8bf866c6eff032c7d2991dc1dd9..8ae40146f9890bf139f9410d3e0cc979c07aaf7b 100644 (file)
@@ -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 (file)
index 9f160b8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From foo@baz Sat Nov 10 11:24:34 PST 2018
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Mon, 8 Oct 2018 11:06:19 -0400
-Subject: cpupower: Fix coredump on VMWare
-
-From: Prarit Bhargava <prarit@redhat.com>
-
-[ 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 <prarit@redhat.com>
-Cc: Shuah Khan <shuah@kernel.org>
-Cc: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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;
index c072afa1ebb83b1e446b86c706a813362656a3a2..19157ac055019e9260b292a895ad2ec8df1c8cac 100644 (file)
@@ -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