From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
alan@lxorguk.ukuu.org.uk,
Boris Ostrovsky <boris.ostrovsky@amd.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: [ 14/37] x86,AMD: Power driver support for AMDs family 16h processors
Date: Fri, 14 Dec 2012 15:00:51 -0800 [thread overview]
Message-ID: <20121214222255.957916552@linuxfoundation.org> (raw)
In-Reply-To: <20121214222252.781413287@linuxfoundation.org>
3.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Ostrovsky <boris.ostrovsky@amd.com>
commit 22e32f4f57778ebc6e17812fa3008361c05d64f9 upstream.
Add family 16h PCI ID to AMD's power driver to allow it report
power consumption on these processors.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/hwmon/fam15h_power.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU p
MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>");
MODULE_LICENSE("GPL");
+/* Family 16h Northbridge's function 4 PCI ID */
+#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
+
/* D18F3 */
#define REG_NORTHBRIDGE_CAP 0xe8
@@ -257,6 +260,7 @@ static void __devexit fam15h_power_remov
static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
{}
};
MODULE_DEVICE_TABLE(pci, fam15h_power_id_table);
next prev parent reply other threads:[~2012-12-14 23:00 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-14 23:00 [ 00/37] 3.6.11-stable review Greg Kroah-Hartman
2012-12-14 23:00 ` [ 01/37] tmpfs: fix shared mempolicy leak Greg Kroah-Hartman
2012-12-14 23:00 ` [ 02/37] Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts" Greg Kroah-Hartman
2012-12-14 23:00 ` [ 03/37] mmc: sh-mmcif: avoid oops on spurious interrupts (second try) Greg Kroah-Hartman
2012-12-14 23:00 ` [ 04/37] ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set Greg Kroah-Hartman
2012-12-14 23:00 ` [ 05/37] ASoC: dmaengine: Correct Makefile when sound is built as module Greg Kroah-Hartman
2012-12-14 23:00 ` [ 06/37] Staging: ipack/bridges/tpci200: avoid kernel bug when uninstalling a device Greg Kroah-Hartman
2012-12-14 23:00 ` [ 07/37] Input: matrix-keymap - provide proper module license Greg Kroah-Hartman
2012-12-14 23:00 ` [ 08/37] i82975x_edac: Fix dimm label initialization Greg Kroah-Hartman
2012-12-14 23:00 ` [ 09/37] edac: Fix the dimm filling for csrows-based layouts Greg Kroah-Hartman
2012-12-14 23:00 ` [ 10/37] workqueue: convert BUG_ON()s in __queue_delayed_work() to WARN_ON_ONCE()s Greg Kroah-Hartman
2012-12-14 23:00 ` [ 11/37] drm/i915: do not ignore eDP bpc settings from vbt Greg Kroah-Hartman
2012-12-14 23:00 ` [ 12/37] drm/i915: do not default to 18 bpp for eDP if missing from VBT Greg Kroah-Hartman
2012-12-14 23:00 ` [ 13/37] mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls Greg Kroah-Hartman
2012-12-14 23:00 ` Greg Kroah-Hartman [this message]
2012-12-14 23:00 ` [ 15/37] floppy: destroy floppy workqueue before cleaning up the queue Greg Kroah-Hartman
2012-12-14 23:00 ` [ 16/37] x86: hpet: Fix masking of MSI interrupts Greg Kroah-Hartman
2012-12-14 23:00 ` [ 17/37] USB: add new zte 3g-dongles pid to option.c Greg Kroah-Hartman
2012-12-14 23:00 ` [ 18/37] USB: option: blacklist network interface on Huawei E173 Greg Kroah-Hartman
2012-12-14 23:00 ` [ 19/37] USB: ftdi_sio: Add support for Newport AGILIS motor drivers Greg Kroah-Hartman
2012-12-14 23:00 ` [ 20/37] usb: ftdi_sio: fixup BeagleBone A5+ quirk Greg Kroah-Hartman
2012-12-14 23:00 ` [ 21/37] USB: cp210x: add Virtenio Preon32 device id Greg Kroah-Hartman
2012-12-14 23:00 ` [ 22/37] USB: mark uas driver as BROKEN Greg Kroah-Hartman
2012-12-14 23:01 ` [ 23/37] ACPI / battery: Correct battery capacity values on Thinkpads Greg Kroah-Hartman
2012-12-14 23:01 ` [ 24/37] ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist Greg Kroah-Hartman
2012-12-14 23:01 ` [ 25/37] ACPI / PNP: Do not crash due to stale pointer use during system resume Greg Kroah-Hartman
2012-12-14 23:01 ` [ 26/37] ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000 Greg Kroah-Hartman
2012-12-14 23:01 ` [ 27/37] ACPI / video: Add "Asus UL30VT" to ACPI video detect blacklist Greg Kroah-Hartman
2012-12-14 23:01 ` [ 28/37] USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue Greg Kroah-Hartman
2012-12-14 23:01 ` [ 29/37] xhci: Extend Fresco Logic MSI quirk Greg Kroah-Hartman
2012-12-14 23:01 ` [ 30/37] ftrace: Clear bits properly in reset_iter_read() Greg Kroah-Hartman
2012-12-14 23:01 ` [ 31/37] ring-buffer: Fix NULL pointer if rb_set_head_page() fails Greg Kroah-Hartman
2012-12-14 23:01 ` [ 32/37] ring-buffer: Fix race between integrity check and readers Greg Kroah-Hartman
2012-12-14 23:01 ` [ 33/37] cdc-acm: implement TIOCSSERIAL to avoid blocking close(2) Greg Kroah-Hartman
2012-12-14 23:01 ` [ 34/37] perf test: fix a build error on builtin-test Greg Kroah-Hartman
2012-12-14 23:01 ` [ 35/37] USB: EHCI: bugfix: urb->hcpriv should not be NULL Greg Kroah-Hartman
2012-12-14 23:01 ` [ 36/37] rcu: Fix batch-limit size problem Greg Kroah-Hartman
2012-12-14 23:01 ` [ 37/37] PCI/PM: Fix deadlock when unbinding device if parent in D3cold Greg Kroah-Hartman
2012-12-15 14:24 ` [ 00/37] 3.6.11-stable review Shuah Khan
2012-12-15 20:47 ` Shuah Khan
2012-12-15 14:27 ` Satoru Takeuchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121214222255.957916552@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=boris.ostrovsky@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).