diff -urN linux-2.6.17-rc1-mm3-orig/arch/i386/kernel/cpu/cpufreq/Kconfig linux-2.6.17-rc1-mm3-new/arch/i386/kernel/cpu/cpufreq/Kconfig
--- linux-2.6.17-rc1-mm3-orig/arch/i386/kernel/cpu/cpufreq/Kconfig 2006-04-21 22:12:15.000000000 +0000
+++ linux-2.6.17-rc1-mm3-new/arch/i386/kernel/cpu/cpufreq/Kconfig 2006-04-22 13:10:03.767127765 +0000
@@ -107,17 +107,44 @@
config X86_SPEEDSTEP_CENTRINO
tristate "Intel Enhanced SpeedStep"
select CPU_FREQ_TABLE
- select X86_SPEEDSTEP_CENTRINO_TABLE if (!X86_SPEEDSTEP_CENTRINO_ACPI)
- help
- This adds the CPUFreq driver for Enhanced SpeedStep enabled
- mobile CPUs. This means Intel Pentium M (Centrino) CPUs. However,
- you also need to say Y to "Use ACPI tables to decode..." below
- [which might imply enabling ACPI] if you want to use this driver
- on non-Banias CPUs.
-
- For details, take a look at .
-
- If in doubt, say N.
+ select X86_SPEEDSTEP_CENTRINO_ACPI if (!X86_SPEEDSTEP_CENTRINO_BUILTIN || (!X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS && !X86_SPEEDSTEP_CENTRINO_BUILTIN_DOTHAN && !X86_SPEEDSTEP_CENTRINO_BUILTIN_SONOMA ))
+ help
+ This adds the CPUFreq driver for Enhanced SpeedStep enabled
+ mobile CPUs. This means Intel Pentium M (Centrino) CPUs. However,
+ you also need to say Y below to at least one of the following options:
+ - "Use ACPI tables to decode..." [which might imply enabling ACPI]
+ - "Built-in Tables for ... CPUs"
+ - "Default table"
+
+ You can also say yes to all of these options. In this configuration the
+ driver will first try to use ACPI. Then if it fails it will try to use
+ a built-in table if there is one matching the CPU. And as a last resort
+ a default table will be used.
+
+ In the last case you will also want to say yes to "Userspace control of
+ CPU frequency/voltage table" to setup the frequency/voltage operating
+ points of the CPU from the userspace. This is because de default table
+ will initially have only one operating point. This means that you will
+ need to add yourself the other control points to switch the CPU between
+ different frequencies.
+
+ For details, take a look at .
+
+ If in doubt, say N.
+
+config X86_SPEEDSTEP_CENTRINO_SYSFS
+ bool "Userspace control of CPU frequency/voltage table"
+ depends on X86_SPEEDSTEP_CENTRINO
+ depends on SYSFS
+ depends on (X86_SPEEDSTEP_CENTRINO_BUILTIN && (X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS || X86_SPEEDSTEP_CENTRINO_BUILTIN_$+ default y
+ help
+ Add support for user space control of the CPU frequency/voltage
+ operating points table through a sysfs interface.
+
+ If you say Y here files will be created in
+ /sys/devices/system/cpu/cpu*/cpufreq/oppoints
+ allowing reading and writing of the current table values as well as
+ adding or removing operating points.
config X86_SPEEDSTEP_CENTRINO_ACPI
bool "Use ACPI tables to decode valid frequency/voltage pairs"
@@ -125,21 +152,66 @@
depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
default y
help
- Use primarily the information provided in the BIOS ACPI tables
- to determine valid CPU frequency and voltage pairings. It is
- required for the driver to work on non-Banias CPUs.
+ Use primarily the information provided in the BIOS ACPI tables
- If in doubt, say Y.
+ If in doubt, say Y.
-config X86_SPEEDSTEP_CENTRINO_TABLE
- bool "Built-in tables for Banias CPUs"
+config X86_SPEEDSTEP_CENTRINO_BUILTIN
+ bool "Built-in tables"
depends on X86_SPEEDSTEP_CENTRINO
default y
help
- Use built-in tables for Banias CPUs if ACPI encoding
+ Use "hard coded" built-in tables if ACPI decoding
is not available.
+
+ If you say Y here you must select at least one of the CPU below.
+
+ If you are not sure of your exact CPU model you can select several CPU
+ models or all of them. The driver will only use the table that match
+ the exact CPU name and family/model/stepping numbers.
+ Selecting all the built-in tables will only add a small size overhead
+ to the kernel and an insignificant extra time to intialize the driver.
+
+ If both ACPI and built-in tables support are enabled then built-in
+ tables will be used only if ACPI table decoding fails.
+
+ If you want to force usage of built-in tables over ACPI you need to say
+ Y here and N to X86_SPEEDSTEP_CENTRINO_ACPI.
+
+ If in doubt, say Y.
- If in doubt, say N.
+config X86_SPEEDSTEP_CENTRINO_BUILTIN_BANIAS
+ bool "Built-in tables for Banias CPUs"
+ depends on X86_SPEEDSTEP_CENTRINO_BUILTIN
+ default y
+ help
+ Use built-in tables for Banias CPUs if ACPI encoding is not available.
+ Banias CPUs are the first generation of Pentium-M, with a 1 MB L2 cache
+ and 400 MHz FSB manufactured on 0.13 micron process.
+
+ If in doubt, say Y.
+
+config X86_SPEEDSTEP_CENTRINO_BUILTIN_DOTHAN
+ bool "Built-in tables for Dothan CPUs"
+ depends on X86_SPEEDSTEP_CENTRINO_BUILTIN
+ default y
+ help
+ Use built-in tables for Dothan CPUs if ACPI encoding is not available.
+ Dothan CPUs are the second generation of Pentium-M, with a 2 MB L2
+ cache and 400 MHz FSB manufactured on 90 nm process.
+
+ If in doubt, say Y.
+
+config X86_SPEEDSTEP_CENTRINO_BUILTIN_SONOMA
+ bool "Built-in tables for Sonoma CPUs"
+ depends on X86_SPEEDSTEP_CENTRINO_BUILTIN
+ default y
+ help
+ Use built-in tables for Sonoma CPUs if ACPI encoding is not available.
+ Sonoma CPUs are the third generation of Pentium-M, with a 2 MB L2 cache
+ and 533 MHz FSB manufactured on 90 nm process.
+
+ If in doubt, say Y.
config X86_SPEEDSTEP_ICH
tristate "Intel Speedstep on ICH-M chipsets (ioport interface)"
diff -urN linux-2.6.17-rc1-mm3-orig/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.17-rc1-mm3-new/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
--- linux-2.6.17-rc1-mm3-orig/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-04-21 22:15:19.318712250 +0000
+++ linux-2.6.17-rc1-mm3-new/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-04-22 13:02:45.447762437 +0000
@@ -201,6 +201,82 @@
OP(1700, 1484),
{ .frequency = CPUFREQ_TABLE_END }
};
+
+#undef OP
+
+/* Dothan processor datasheet 30218903.pdf defines 4 voltages for each
+ frequency (VID#A through VID#D) - this macro allows us to define all
+ of these but we only use the VID#C voltages at compile time - this may
+ need some work if we want to select the voltage profile at runtime. */
+
+#define OP(mhz, mva, mvb, mvc, mvd) \
+ { \
+ .frequency = (mhz) * 1000, \
+ .index = (((mhz)/100) << 8) | ((mvc - 700) / 16) \
+ }
+
+/* Intel Pentium M processor 715 / 1.50GHz (Dothan) */
+static struct cpufreq_frequency_table dothan_1500[] =
+{
+ OP( 600, 988, 988, 988, 988),
+ OP( 800, 1068, 1068, 1068, 1052),
+ OP(1000, 1148, 1148, 1132, 1116),
+ OP(1200, 1228, 1212, 1212, 1180),
+ OP(1500, 1340, 1324, 1308, 1276),
+ { .frequency = CPUFREQ_TABLE_END }
+};
+
+/* Intel Pentium M processor 725 / 1.60GHz (Dothan) */
+static struct cpufreq_frequency_table dothan_1600[] =
+{
+ OP( 600, 988, 988, 988, 988),
+ OP( 800, 1068, 1068, 1052, 1052),
+ OP(1000, 1132, 1132, 1116, 1116),
+ OP(1200, 1212, 1196, 1180, 1164),
+ OP(1400, 1276, 1260, 1244, 1228),
+ OP(1600, 1340, 1324, 1308, 1276),
+ { .frequency = CPUFREQ_TABLE_END }
+};
+
+/* Intel Pentium M processor 735 / 1.70GHz (Dothan) */
+static struct cpufreq_frequency_table dothan_1700[] =
+{
+ OP( 600, 988, 988, 988, 988),
+ OP( 800, 1052, 1052, 1052, 1052),
+ OP(1000, 1116, 1116, 1116, 1100),
+ OP(1200, 1180, 1180, 1164, 1148),
+ OP(1400, 1244, 1244, 1228, 1212),
+ OP(1700, 1340, 1324, 1308, 1276),
+ { .frequency = CPUFREQ_TABLE_END }
+};
+
+/* Intel Pentium M processor 745 / 1.80GHz (Dothan) */
+static struct cpufreq_frequency_table dothan_1800[] =
+{
+ OP( 600, 988, 988, 988, 988),
+ OP( 800, 1052, 1052, 1052, 1036),
+ OP(1000, 1116, 1100, 1100, 1084),
+ OP(1200, 1164, 1164, 1148, 1132),
+ OP(1400, 1228, 1212, 1212, 1180),
+ OP(1600, 1292, 1276, 1260, 1228),
+ OP(1800, 1340, 1324, 1308, 1276),
+ { .frequency = CPUFREQ_TABLE_END }
+};
+
+/* Intel Pentium M processor 755 / 2.00GHz (Dothan) */
+static struct cpufreq_frequency_table dothan_2000[] =
+{
+ OP( 600, 988, 988, 988, 988),
+ OP( 800, 1052, 1036, 1036, 1036),
+ OP(1000, 1100, 1084, 1084, 1084),
+ OP(1200, 1148, 1132, 1132, 1116),
+ OP(1400, 1196, 1180, 1180, 1164),
+ OP(1600, 1244, 1228, 1228, 1196),
+ OP(1800, 1292, 1276, 1276, 1244),
+ OP(2000, 1340, 1324, 1308, 1276),
+ { .frequency = CPUFREQ_TABLE_END }
+};
+
#undef OP
#define _BANIAS(cpuid, max, name) \
@@ -211,6 +287,13 @@
}
#define BANIAS(max) _BANIAS(&cpu_ids[CPU_BANIAS], max, #max)
+#define DOTHAN(cpuid, max, name) \
+{ .cpu_id = cpuid, \
+ .model_name = "Intel(R) Pentium(R) M processor " name "GHz", \
+ .max_freq = (max)*1000, \
+ .op_points = dothan_##max, \
+}
+
/* CPU models, their operating frequency range, and freq/voltage
operating points */
static struct cpu_model models[] =
@@ -224,6 +307,11 @@
BANIAS(1500),
BANIAS(1600),
BANIAS(1700),
+ DOTHAN(&cpu_ids[CPU_DOTHAN_B0], 1500, "1.50"),
+ DOTHAN(&cpu_ids[CPU_DOTHAN_B0], 1600, "1.60"),
+ DOTHAN(&cpu_ids[CPU_DOTHAN_B0], 1700, "1.70"),
+ DOTHAN(&cpu_ids[CPU_DOTHAN_B0], 1800, "1.80"),
+ DOTHAN(&cpu_ids[CPU_DOTHAN_B0], 2000, "2.00"),
/* NULL model_name is a wildcard */
{ &cpu_ids[CPU_DOTHAN_A1], NULL, 0, NULL },
@@ -236,6 +324,7 @@
};
#undef _BANIAS
#undef BANIAS
+#undef DOTHAN
static int centrino_cpu_init_table(struct cpufreq_policy *policy)
{
@@ -507,6 +596,151 @@
static inline int centrino_cpu_early_init_acpi(void) { return 0; }
#endif
+static int centrino_target (struct cpufreq_policy *policy,
+ unsigned int target_freq,
+ unsigned int relation);
+
+/************************** sysfs interface for user defined voltage table ************************/
+static ssize_t show_user_voltage (struct cpufreq_policy *policy, char *buf)
+{
+ ssize_t bytes_written = 0;
+ unsigned int cpu = policy->cpu;
+ unsigned int op_index = 0;
+ unsigned int voltage = 0;
+
+ //dprintk("showing user voltage table in sysfs\n");
+
+ while (centrino_model[cpu]->op_points[op_index].frequency != CPUFREQ_TABLE_END)
+ {
+ //dprintk("getting state %i \n", i);
+ voltage = centrino_model[cpu]->op_points[op_index].index;
+ voltage = 700 + ((voltage & 0xFF) << 4);
+ //dprintk("writing voltage %i: %u mV \n", i, voltage);
+ bytes_written += snprintf (&buf[bytes_written],PAGE_SIZE, "%u",voltage);
+ op_index++;
+ if (centrino_model[cpu]->op_points[op_index].frequency != CPUFREQ_TABLE_END)
+ bytes_written += snprintf (&buf[bytes_written],PAGE_SIZE, ",");
+ else
+ bytes_written += snprintf (&buf[bytes_written],PAGE_SIZE, "\n");
+ }
+ buf[PAGE_SIZE-1] = 0;
+ return bytes_written;
+}
+
+static ssize_t
+store_user_voltage (struct cpufreq_policy *policy, const char *buf, size_t count)
+{
+ unsigned int cpu;
+ const char *curr_buf;
+ unsigned int curr_freq;
+ unsigned int op_index;
+ int i;
+ int isok;
+ char *next_buf;
+ unsigned int op_point;
+ ssize_t retval;
+ unsigned int voltage;
+
+ static struct cpufreq_frequency_table **original_table = NULL;
+
+ if (!policy)
+ return -ENODEV;
+ cpu = policy->cpu;
+ if (!centrino_model[cpu] || !centrino_model[cpu]->op_points)
+ return -ENODEV;
+
+ if (!original_table)
+ {
+ original_table = kmalloc(sizeof(struct cpufreq_frequency_table *)*NR_CPUS, GFP_KERNEL);
+ for (i=0; i < NR_CPUS; i++)
+ {
+ original_table[i] = NULL;
+ }
+ }
+
+ if (!original_table[cpu])
+ {
+ /* Count number of frequencies and allocate memory for a copy */
+ for (i=0; centrino_model[cpu]->op_points[i].frequency != CPUFREQ_TABLE_END; i++);
+ /* Allocate memory to store the copy */
+ original_table[cpu] = (struct cpufreq_frequency_table*) kmalloc(sizeof(struct cpufreq_frequency_table)*(i+1), GFP_KERNEL);
+ /* Make copy of frequency/voltage pairs */
+ for (i=0; centrino_model[cpu]->op_points[i].frequency != CPUFREQ_TABLE_END; i++)
+ {
+ original_table[cpu][i].frequency = centrino_model[cpu]->op_points[i].frequency;
+ original_table[cpu][i].index = centrino_model[cpu]->op_points[i].index;
+ }
+ original_table[cpu][i].frequency = CPUFREQ_TABLE_END;
+ }
+
+ op_index = 0;
+ curr_buf = buf;
+ next_buf = NULL;
+ isok = 1;
+
+ while ((centrino_model[cpu]->op_points[op_index].frequency != CPUFREQ_TABLE_END)
+ && (isok))
+ {
+ voltage = simple_strtoul(curr_buf, &next_buf, 10);
+ if ((next_buf != curr_buf) && (next_buf != NULL))
+ {
+ if ((voltage >= 700) && (voltage<=1600))
+ {
+ voltage = ((voltage - 700) >> 4) & 0xFF;
+ op_point = (original_table[cpu])[op_index].index;
+ if (voltage <= (op_point & 0xFF))
+ {
+ //dprintk("setting control value %i to %04x\n", op_index, op_point);
+ op_point = (op_point & 0xFFFFFF00) | voltage;
+ centrino_model[cpu]->op_points[op_index].index = op_point;
+ }
+ else
+ {
+ op_point = (op_point & 0xFFFFFF00) | voltage;
+ dprintk("not setting control value %i to %04x because requested voltage is not lower than the default value\n", op_index, op_point);
+ //isok = 0;
+ }
+ }
+ else
+ {
+ dprintk("voltage value %i is out of bounds: %u mV\n", op_index, voltage);
+ isok = 0;
+ }
+ curr_buf = next_buf;
+ if (*curr_buf==',')
+ curr_buf++;
+ next_buf = NULL;
+ }
+ else
+ {
+ dprintk("failed to parse voltage value %i\n", op_index);
+ isok = 0;
+ }
+ op_index++;
+ }
+
+ if (isok)
+ {
+ retval = count;
+ curr_freq = cpufreq_get(policy->cpu);
+ centrino_target(policy, curr_freq, CPUFREQ_RELATION_L);
+ }
+ else
+ {
+ retval = -EINVAL;
+ }
+
+ return retval;
+}
+
+static struct freq_attr centrino_freq_attr_voltage_table =
+{
+ .attr = { .name = "voltage_table", .mode = 0644, .owner = THIS_MODULE },
+ .show = show_user_voltage,
+ .store = store_user_voltage,
+};
+
+
static int centrino_cpu_init(struct cpufreq_policy *policy)
{
struct cpuinfo_x86 *cpu = &cpu_data[policy->cpu];
@@ -758,6 +992,7 @@
static struct freq_attr* centrino_attr[] = {
&cpufreq_freq_attr_scaling_available_freqs,
+ ¢rino_freq_attr_voltage_table,
NULL,
};