]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
remove hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch from 3.0 and...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Apr 2012 21:17:14 +0000 (14:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Apr 2012 21:17:14 +0000 (14:17 -0700)
queue-3.0/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch [deleted file]
queue-3.0/series
queue-3.3/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch [deleted file]
queue-3.3/series

diff --git a/queue-3.0/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch b/queue-3.0/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch
deleted file mode 100644 (file)
index 589bb50..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From 00250ec90963b7ef6678438888f3244985ecde14 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <andre.przywara@amd.com>
-Date: Mon, 9 Apr 2012 18:16:34 -0400
-Subject: hwmon: fam15h_power: fix bogus values with current BIOSes
-
-From: Andre Przywara <andre.przywara@amd.com>
-
-commit 00250ec90963b7ef6678438888f3244985ecde14 upstream.
-
-Newer BKDG[1] versions recommend a different initialization value for
-the running average range register in the northbridge. This improves
-the power reading by avoiding counter saturations resulting in bogus
-values for anything below about 80% of TDP power consumption.
-Updated BIOSes will have this new value set up from the beginning,
-but meanwhile we correct this value ourselves.
-This needs to be done on all northbridges, even on those where the
-driver itself does not register at.
-
-This fixes the driver on all current machines to provide proper
-values for idle load.
-
-[1]
-http://support.amd.com/us/Processor_TechDocs/42301_15h_Mod_00h-0Fh_BKDG.pdf
-Chapter 3.8: D18F5xE0 Processor TDP Running Average (p. 452)
-
-Signed-off-by: Andre Przywara <andre.przywara@amd.com>
-Acked-by: Jean Delvare <khali@linux-fr.org>
-[guenter.roeck@ericsson.com: Removed unnecessary return statement]
-Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwmon/fam15h_power.c |   39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
---- a/drivers/hwmon/fam15h_power.c
-+++ b/drivers/hwmon/fam15h_power.c
-@@ -122,6 +122,38 @@ static bool __devinit fam15h_power_is_in
-       return true;
- }
-+/*
-+ * Newer BKDG versions have an updated recommendation on how to properly
-+ * initialize the running average range (was: 0xE, now: 0x9). This avoids
-+ * counter saturations resulting in bogus power readings.
-+ * We correct this value ourselves to cope with older BIOSes.
-+ */
-+static void __devinit tweak_runavg_range(struct pci_dev *pdev)
-+{
-+      u32 val;
-+      const struct pci_device_id affected_device = {
-+              PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) };
-+
-+      /*
-+       * let this quirk apply only to the current version of the
-+       * northbridge, since future versions may change the behavior
-+       */
-+      if (!pci_match_id(&affected_device, pdev))
-+              return;
-+
-+      pci_bus_read_config_dword(pdev->bus,
-+              PCI_DEVFN(PCI_SLOT(pdev->devfn), 5),
-+              REG_TDP_RUNNING_AVERAGE, &val);
-+      if ((val & 0xf) != 0xe)
-+              return;
-+
-+      val &= ~0xf;
-+      val |=  0x9;
-+      pci_bus_write_config_dword(pdev->bus,
-+              PCI_DEVFN(PCI_SLOT(pdev->devfn), 5),
-+              REG_TDP_RUNNING_AVERAGE, val);
-+}
-+
- static void __devinit fam15h_power_init_data(struct pci_dev *f4,
-                                            struct fam15h_power_data *data)
- {
-@@ -155,6 +187,13 @@ static int __devinit fam15h_power_probe(
-       struct device *dev;
-       int err;
-+      /*
-+       * though we ignore every other northbridge, we still have to
-+       * do the tweaking on _each_ node in MCM processors as the counters
-+       * are working hand-in-hand
-+       */
-+      tweak_runavg_range(pdev);
-+
-       if (!fam15h_power_is_internal_node0(pdev)) {
-               err = -ENODEV;
-               goto exit;
index 0a41cba89e638d98892990e0d4faf24242e5311d..85cab40a8775b71aaf257b5d017610c397f4670c 100644 (file)
@@ -1,6 +1,5 @@
 perf-fix-build-breakage.patch
 crypto-sha512-fix-byte-counter-overflow-in-sha-512.patch
-hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch
 alsa-hda-conexant-don-t-set-hp-pin-control-bit.patch
 arm-clps711x-serial-driver-hungs-are-a-result-of-call-disable_irq-within-isr.patch
 xen-gntdev-do-not-set-vm_pfnmap.patch
diff --git a/queue-3.3/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch b/queue-3.3/hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch
deleted file mode 100644 (file)
index 589bb50..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From 00250ec90963b7ef6678438888f3244985ecde14 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <andre.przywara@amd.com>
-Date: Mon, 9 Apr 2012 18:16:34 -0400
-Subject: hwmon: fam15h_power: fix bogus values with current BIOSes
-
-From: Andre Przywara <andre.przywara@amd.com>
-
-commit 00250ec90963b7ef6678438888f3244985ecde14 upstream.
-
-Newer BKDG[1] versions recommend a different initialization value for
-the running average range register in the northbridge. This improves
-the power reading by avoiding counter saturations resulting in bogus
-values for anything below about 80% of TDP power consumption.
-Updated BIOSes will have this new value set up from the beginning,
-but meanwhile we correct this value ourselves.
-This needs to be done on all northbridges, even on those where the
-driver itself does not register at.
-
-This fixes the driver on all current machines to provide proper
-values for idle load.
-
-[1]
-http://support.amd.com/us/Processor_TechDocs/42301_15h_Mod_00h-0Fh_BKDG.pdf
-Chapter 3.8: D18F5xE0 Processor TDP Running Average (p. 452)
-
-Signed-off-by: Andre Przywara <andre.przywara@amd.com>
-Acked-by: Jean Delvare <khali@linux-fr.org>
-[guenter.roeck@ericsson.com: Removed unnecessary return statement]
-Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwmon/fam15h_power.c |   39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
---- a/drivers/hwmon/fam15h_power.c
-+++ b/drivers/hwmon/fam15h_power.c
-@@ -122,6 +122,38 @@ static bool __devinit fam15h_power_is_in
-       return true;
- }
-+/*
-+ * Newer BKDG versions have an updated recommendation on how to properly
-+ * initialize the running average range (was: 0xE, now: 0x9). This avoids
-+ * counter saturations resulting in bogus power readings.
-+ * We correct this value ourselves to cope with older BIOSes.
-+ */
-+static void __devinit tweak_runavg_range(struct pci_dev *pdev)
-+{
-+      u32 val;
-+      const struct pci_device_id affected_device = {
-+              PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) };
-+
-+      /*
-+       * let this quirk apply only to the current version of the
-+       * northbridge, since future versions may change the behavior
-+       */
-+      if (!pci_match_id(&affected_device, pdev))
-+              return;
-+
-+      pci_bus_read_config_dword(pdev->bus,
-+              PCI_DEVFN(PCI_SLOT(pdev->devfn), 5),
-+              REG_TDP_RUNNING_AVERAGE, &val);
-+      if ((val & 0xf) != 0xe)
-+              return;
-+
-+      val &= ~0xf;
-+      val |=  0x9;
-+      pci_bus_write_config_dword(pdev->bus,
-+              PCI_DEVFN(PCI_SLOT(pdev->devfn), 5),
-+              REG_TDP_RUNNING_AVERAGE, val);
-+}
-+
- static void __devinit fam15h_power_init_data(struct pci_dev *f4,
-                                            struct fam15h_power_data *data)
- {
-@@ -155,6 +187,13 @@ static int __devinit fam15h_power_probe(
-       struct device *dev;
-       int err;
-+      /*
-+       * though we ignore every other northbridge, we still have to
-+       * do the tweaking on _each_ node in MCM processors as the counters
-+       * are working hand-in-hand
-+       */
-+      tweak_runavg_range(pdev);
-+
-       if (!fam15h_power_is_internal_node0(pdev)) {
-               err = -ENODEV;
-               goto exit;
index 462762d956e0749c8949b0657e85366c067012f7..74b59085718dbfef1640637f166c28cc60001d6b 100644 (file)
@@ -1,6 +1,5 @@
 perf-fix-build-breakage.patch
 crypto-sha512-fix-byte-counter-overflow-in-sha-512.patch
-hwmon-fam15h_power-fix-bogus-values-with-current-bioses.patch
 alsa-hda-conexant-don-t-set-hp-pin-control-bit.patch
 alsa-hda-conexant-set-up-the-missing-docking-station-pins.patch
 memblock-memblock-should-be-able-to-handle-zero-length-operations.patch