Author: mav
Date: Thu Jun 2 07:21:27 2011
New Revision: 222594
URL: http://svn.freebsd.org/changeset/base/222594
Log:
MRC r212721:
Few whitespace cleanups and comments tunings.
Modified:
stable/8/sys/x86/cpufreq/est.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/x86/cpufreq/est.c
==============================================================================
--- stable/8/sys/x86/cpufreq/est.c Thu Jun 2 07:19:19 2011
(r222593)
+++ stable/8/sys/x86/cpufreq/est.c Thu Jun 2 07:21:27 2011
(r222594)
@@ -110,14 +110,16 @@ CTASSERT(EST_MAX_SETTINGS <= MAX_SETTING
#define EST_TRANS_LAT 1000
/*
- * Frequency (MHz) and voltage (mV) settings. Data from the
- * Intel Pentium M Processor Datasheet (Order Number 252612), Table 5.
+ * Frequency (MHz) and voltage (mV) settings.
*
* Dothan processors have multiple VID#s with different settings for
* each VID#. Since we can't uniquely identify this info
* without undisclosed methods from Intel, we can't support newer
* processors with this table method. If ACPI Px states are supported,
* we get info from them.
+ *
+ * Data from the "Intel Pentium M Processor Datasheet",
+ * Order Number 252612-003, Table 5.
*/
static freq_info PM17_130[] = {
/* 130nm 1.70GHz Pentium M */
@@ -217,7 +219,7 @@ static freq_info PM10_ULV_130[] = {
/*
* Data from "Intel Pentium M Processor on 90nm Process with
- * 2-MB L2 Cache Datasheet", Order Number 302189, Table 5.
+ * 2-MB L2 Cache Datasheet", Order Number 302189-008, Table 5.
*/
static freq_info PM_765A_90[] = {
/* 90 nm 2.10GHz Pentium M, VID #A */
@@ -988,7 +990,7 @@ est_probe(device_t dev)
device_t perf_dev;
uint64_t msr;
int error, type;
-
+
if (resource_disabled("est", 0))
return (ENXIO);
@@ -1128,7 +1130,7 @@ est_acpi_info(device_t dev, freq_info **
if (sets[i].freq > 0) {
error = est_set_id16(dev, sets[i].spec[0], strict);
if (error != 0) {
- if (bootverbose)
+ if (bootverbose)
device_printf(dev, "Invalid freq %u, "
"ignored.\n", sets[i].freq);
continue;
@@ -1224,7 +1226,7 @@ est_msr_info(device_t dev, uint64_t msr,
device_printf(dev, "Guessed bus clock (low) of %d MHz\n", bus);
if (!bus_speed_ok(bus))
return (EOPNOTSUPP);
-
+
/* Calculate high frequency. */
id = msr >> 32;
freq = ((id >> 8) & 0xff) * bus;
@@ -1285,14 +1287,14 @@ est_set_id16(device_t dev, uint16_t id16
msr = rdmsr(MSR_PERF_CTL);
msr = (msr & ~0xffff) | id16;
wrmsr(MSR_PERF_CTL, msr);
-
+
/* Wait a short while for the new setting. XXX Is this necessary? */
DELAY(EST_TRANS_LAT);
-
+
if (need_check) {
- est_get_id16(&new_id16);
+ est_get_id16(&new_id16);
if (new_id16 != id16) {
- if (bootverbose)
+ if (bootverbose)
device_printf(dev, "Invalid id16 (set, cur) "
"= (%u, %u)\n", id16, new_id16);
ret = ENXIO;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
