diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index e2a9b9c6e6c..384be74cfcb 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -474,9 +474,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) performance_cx_lowest="HIGH" # Online CPU idle state -performance_cpu_freq="HIGH" # Online CPU frequency +performance_cpu_freq="NONE" # Online CPU frequency economy_cx_lowest="HIGH" # Offline CPU idle state -economy_cpu_freq="HIGH" # Offline CPU frequency +economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4) diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c index 073b06088c3..105ac1d7d35 100644 --- a/sys/dev/acpica/acpi_throttle.c +++ b/sys/dev/acpica/acpi_throttle.c @@ -175,7 +175,8 @@ acpi_throttle_probe(device_t dev) * Since p4tcc uses the same mechanism (but internal to the CPU), * we disable acpi_throttle when p4tcc is also present. */ - if (device_find_child(device_get_parent(dev), "p4tcc", -1)) + if (device_find_child(device_get_parent(dev), "p4tcc", -1) && + !resource_disabled("p4tcc", 0)) return (ENXIO); device_set_desc(dev, "ACPI CPU Throttling"); @@ -186,6 +187,7 @@ static int acpi_throttle_attach(device_t dev) { struct acpi_throttle_softc *sc; + struct cf_setting set; ACPI_BUFFER buf; ACPI_OBJECT *obj; ACPI_STATUS status; @@ -217,6 +219,13 @@ acpi_throttle_attach(device_t dev) if (error) return (error); + /* + * Set our initial frequency to the highest since some systems + * seem to boot with this at the lowest setting. + */ + set.freq = 10000; + acpi_thr_set(dev, &set); + /* Everything went ok, register with cpufreq(4). */ cpufreq_register(dev); return (0);