Prev: USB: gadget: Use new composite features in some gadgets
Next: [024/140] sky2: enable rx/tx in sky2_phy_reinit()
From: Greg KH on 30 Jul 2010 15:00
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Jean Delvare <khali(a)linux-fr.org>

commit eefc2d9e3d4f8820f2c128a0e44a23de28b1ed64 upstream.

When detecting AM2+ or AM3 socket with DDR2, only blacklist cores
which are known to exist in AM2+ format.

Signed-off-by: Jean Delvare <khali(a)linux-fr.org>
Acked-by: Clemens Ladisch <clemens(a)ladisch.de>
Cc: Andreas Herrmann <andreas.herrmann3(a)amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/hwmon/k10temp.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -112,11 +112,21 @@ static bool __devinit has_erratum_319(st
if (pkg_type != CPUID_PKGTYPE_AM2R2_AM3)
return false;

- /* Differentiate between AM2+ (bad) and AM3 (good) */
+ /* DDR3 memory implies socket AM3, which is good */
pci_bus_read_config_dword(pdev->bus,
PCI_DEVFN(PCI_SLOT(pdev->devfn), 2),
REG_DCT0_CONFIG_HIGH, &reg_dram_cfg);
- return !(reg_dram_cfg & DDR3_MODE);
+ if (reg_dram_cfg & DDR3_MODE)
+ return false;
+
+ /*
+ * Unfortunately it is possible to run a socket AM3 CPU with DDR2
+ * memory. We blacklist all the cores which do exist in socket AM2+
+ * format. It still isn't perfect, as RB-C2 cores exist in both AM2+
+ * and AM3 formats, but that's the best we can do.
+ */
+ return boot_cpu_data.x86_model < 4 ||
+ (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask <= 2);
}

static int __devinit k10temp_probe(struct pci_dev *pdev,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: USB: gadget: Use new composite features in some gadgets
Next: [024/140] sky2: enable rx/tx in sky2_phy_reinit()