aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/cpufreq
diff options
context:
space:
mode:
authorNate Lawson <njl@FreeBSD.org>2005-03-20 01:25:21 +0000
committerNate Lawson <njl@FreeBSD.org>2005-03-20 01:25:21 +0000
commit823d404a6d929d473ee81056b61f675c74082aea (patch)
tree51badc94ac79d2fce7e2e21cfc047e40c0dd7349 /sys/dev/cpufreq
parent2b2714935bc7d030de3fdc88eae331a40f2d188d (diff)
Notes
Diffstat (limited to 'sys/dev/cpufreq')
-rw-r--r--sys/dev/cpufreq/ichss.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index d38ed523482d..f28d477a4408 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -150,7 +150,6 @@ ichss_pci_probe(device_t dev)
{
device_t child, parent;
uint32_t pmbase;
- uint16_t ss_en;
/*
* TODO: add a quirk to disable if we see the 82815_MC along
@@ -198,14 +197,6 @@ ichss_pci_probe(device_t dev)
bus_set_resource(child, SYS_RES_IOPORT, 1, pmbase + ICHSS_CTRL_OFFSET,
1);
- /* Activate SpeedStep control if not already enabled. */
- ss_en = pci_read_config(dev, ICHSS_PMCFG_OFFSET, sizeof(ss_en));
- if ((ss_en & ICHSS_ENABLE) == 0) {
- printf("ichss: enabling SpeedStep support\n");
- pci_write_config(dev, ICHSS_PMCFG_OFFSET,
- ss_en | ICHSS_ENABLE, sizeof(ss_en));
- }
-
/* Attach the new CPU child now. */
device_probe_and_attach(child);
@@ -217,6 +208,7 @@ ichss_probe(device_t dev)
{
device_t est_dev, perf_dev;
int error, type;
+ uint16_t ss_en;
if (resource_disabled("ichss", 0))
return (ENXIO);
@@ -236,6 +228,14 @@ ichss_probe(device_t dev)
if (est_dev && device_is_attached(est_dev))
return (ENXIO);
+ /* Activate SpeedStep control if not already enabled. */
+ ss_en = pci_read_config(dev, ICHSS_PMCFG_OFFSET, sizeof(ss_en));
+ if ((ss_en & ICHSS_ENABLE) == 0) {
+ printf("ichss: enabling SpeedStep support\n");
+ pci_write_config(dev, ICHSS_PMCFG_OFFSET,
+ ss_en | ICHSS_ENABLE, sizeof(ss_en));
+ }
+
device_set_desc(dev, "SpeedStep ICH");
return (-1000);
}