Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa8031ae authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

cpufreq: Add support for x86 cpuinfo auto loading v4 



This marks all the x86 cpuinfo tables to the CPU specific device drivers,
to allow auto loading by udev. This should simplify the distribution
startup scripts for this greatly.

I didn't add MODULE_DEVICE_IDs to the centrino and p4-clockmod drivers,
because those probably shouldn't be auto loaded and the acpi driver
be used instead (not fully sure on that, would appreciate feedback)

The old nforce drivers autoload based on the PCI ID.

ACPI cpufreq is autoloaded in another patch.

v3: Autoload gx based on PCI IDs only. Remove cpu check (Dave Jones)
v4: Use newly introduce HW_PSTATE feature for powernow-k8 loading

Cc: Dave Jones <davej@redhat.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f1e097e

drivers/cpufreq/cpufreq-nforce2.c

+8 −0
Original line number Diff line number Diff line
@@ -385,6 +385,14 @@ static struct cpufreq_driver nforce2_driver = { 
	.owner = THIS_MODULE,

};



#ifdef MODULE

static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2 },

	{}

};

MODULE_DEVICE_TABLE(pci, nforce2_ids);

#endif



/**

 * nforce2_detect_chipset - detect the Southbridge which contains FSB PLL logic

 *

drivers/cpufreq/e_powersaver.c

+11 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/io.h>

#include <linux/delay.h>



#include <asm/cpu_device_id.h>

#include <asm/msr.h>

#include <asm/tsc.h>
@@ -437,18 +438,19 @@ static struct cpufreq_driver eps_driver = { 
	.attr		= eps_attr,

};



static int __init eps_init(void)

{

	struct cpuinfo_x86 *c = &cpu_data(0);



/* This driver will work only on Centaur C7 processors with

 * Enhanced SpeedStep/PowerSaver registers */

	if (c->x86_vendor != X86_VENDOR_CENTAUR

	    || c->x86 != 6 || c->x86_model < 10)

		return -ENODEV;

	if (!cpu_has(c, X86_FEATURE_EST))

		return -ENODEV;

static const struct x86_cpu_id eps_cpu_id[] = {

	{ X86_VENDOR_CENTAUR, 6, X86_MODEL_ANY, X86_FEATURE_EST },

	{}

};

MODULE_DEVICE_TABLE(x86cpu, eps_cpu_id);



static int __init eps_init(void)

{

	if (!x86_match_cpu(eps_cpu_id) || boot_cpu_data.x86_model < 10)

		return -ENODEV;

	if (cpufreq_register_driver(&eps_driver))

		return -EINVAL;

	return 0;

drivers/cpufreq/elanfreq.c

+7 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/delay.h>

#include <linux/cpufreq.h>



#include <asm/cpu_device_id.h>

#include <asm/msr.h>

#include <linux/timex.h>

#include <linux/io.h>
@@ -277,17 +278,16 @@ static struct cpufreq_driver elanfreq_driver = { 
	.attr		= elanfreq_attr,

};



static const struct x86_cpu_id elan_id[] = {

	{ X86_VENDOR_AMD, 4, 10, },

	{}

};

MODULE_DEVICE_TABLE(x86cpu, elan_id);



static int __init elanfreq_init(void)

{

	struct cpuinfo_x86 *c = &cpu_data(0);



	/* Test if we have the right hardware */

	if ((c->x86_vendor != X86_VENDOR_AMD) ||

		(c->x86 != 4) || (c->x86_model != 10)) {

		printk(KERN_INFO "elanfreq: error: no Elan processor found!\n");

	if (!x86_match_cpu(elan_id))

		return -ENODEV;

	}

	return cpufreq_register_driver(&elanfreq_driver);

}

drivers/cpufreq/gx-suspmod.c

+2 −7
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#include <linux/errno.h>

#include <linux/slab.h>



#include <asm/cpu_device_id.h>

#include <asm/processor-cyrix.h>



/* PCI config registers, all at F0 */
@@ -171,6 +172,7 @@ static struct pci_device_id gx_chipset_tbl[] __initdata = { 
	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5510), },

	{ 0, },

};

MODULE_DEVICE_TABLE(gx_chipset_tbl);



static void gx_write_byte(int reg, int value)

{
@@ -185,13 +187,6 @@ static __init struct pci_dev *gx_detect_chipset(void) 
{

	struct pci_dev *gx_pci = NULL;



	/* check if CPU is a MediaGX or a Geode. */

	if ((boot_cpu_data.x86_vendor != X86_VENDOR_NSC) &&

	    (boot_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {

		pr_debug("error: no MediaGX/Geode processor found!\n");

		return NULL;

	}



	/* detect which companion chip is used */

	for_each_pci_dev(gx_pci) {

		if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL)

drivers/cpufreq/longhaul.c

+7 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/acpi.h>



#include <asm/msr.h>

#include <asm/cpu_device_id.h>

#include <acpi/processor.h>



#include "longhaul.h"
@@ -951,12 +952,17 @@ static struct cpufreq_driver longhaul_driver = { 
	.attr	= longhaul_attr,

};



static const struct x86_cpu_id longhaul_id[] = {

	{ X86_VENDOR_CENTAUR, 6 },

	{}

};

MODULE_DEVICE_TABLE(x86cpu, longhaul_id);



static int __init longhaul_init(void)

{

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor != X86_VENDOR_CENTAUR || c->x86 != 6)

	if (!x86_match_cpu(longhaul_id))

		return -ENODEV;



#ifdef CONFIG_SMP