This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / arch / i386 / kernel / cpu / cpufreq / acpi.c
similarity index 83%
rename from arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
rename to arch/i386/kernel/cpu/cpufreq/acpi.c
index 1e11401..4ba9127 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * acpi-cpufreq.c - ACPI Processor P-States Driver ($Revision: 1.3 $)
+ * acpi-cpufreq-io.c - ACPI Processor P-States Driver ($Revision: 1.3 $)
  *
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
 #include <linux/acpi.h>
 #include <acpi/processor.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "acpi-cpufreq", msg)
+#define ACPI_PROCESSOR_COMPONENT       0x01000000
+#define ACPI_PROCESSOR_CLASS           "processor"
+#define ACPI_PROCESSOR_DRIVER_NAME     "ACPI Processor P-States Driver"
+#define ACPI_PROCESSOR_DEVICE_NAME     "Processor"
+
+#define _COMPONENT             ACPI_PROCESSOR_COMPONENT
+ACPI_MODULE_NAME               ("acpi_processor_perf")
 
 MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
-MODULE_DESCRIPTION("ACPI Processor P-States Driver");
+MODULE_DESCRIPTION(ACPI_PROCESSOR_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 
 
@@ -105,7 +111,7 @@ acpi_processor_set_performance (
        cpumask_t               saved_mask;
        int                     retval;
 
-       dprintk("acpi_processor_set_performance\n");
+       ACPI_FUNCTION_TRACE("acpi_processor_set_performance");
 
        /*
         * TBD: Use something other than set_cpus_allowed.
@@ -115,17 +121,18 @@ acpi_processor_set_performance (
        saved_mask = current->cpus_allowed;
        set_cpus_allowed(current, cpumask_of_cpu(cpu));
        if (smp_processor_id() != cpu) {
-               return (-EAGAIN);
+               return_VALUE(-EAGAIN);
        }
        
        if (state == data->acpi_data.state) {
-               dprintk("Already at target state (P%d)\n", state);
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+                       "Already at target state (P%d)\n", state));
                retval = 0;
                goto migrate_end;
        }
 
-       dprintk("Transitioning from P%d to P%d\n",
-               data->acpi_data.state, state);
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Transitioning from P%d to P%d\n",
+               data->acpi_data.state, state));
 
        /* cpufreq frequency struct */
        cpufreq_freqs.cpu = cpu;
@@ -144,11 +151,13 @@ acpi_processor_set_performance (
        bit_width = data->acpi_data.control_register.bit_width;
        value = (u32) data->acpi_data.states[state].control;
 
-       dprintk("Writing 0x%08x to port 0x%04x\n", value, port);
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+               "Writing 0x%08x to port 0x%04x\n", value, port));
 
        ret = acpi_processor_write_port(port, bit_width, value);
        if (ret) {
-               dprintk("Invalid port width 0x%04x\n", bit_width);
+               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                       "Invalid port width 0x%04x\n", bit_width));
                retval = ret;
                goto migrate_end;
        }
@@ -163,13 +172,15 @@ acpi_processor_set_performance (
        port = data->acpi_data.status_register.address;
        bit_width = data->acpi_data.status_register.bit_width;
 
-       dprintk("Looking for 0x%08x from port 0x%04x\n",
-               (u32) data->acpi_data.states[state].status, port);
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+               "Looking for 0x%08x from port 0x%04x\n",
+               (u32) data->acpi_data.states[state].status, port));
 
        for (i=0; i<100; i++) {
                ret = acpi_processor_read_port(port, bit_width, &value);
                if (ret) {      
-                       dprintk("Invalid port width 0x%04x\n", bit_width);
+                       ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                               "Invalid port width 0x%04x\n", bit_width));
                        retval = ret;
                        goto migrate_end;
                }
@@ -187,19 +198,21 @@ acpi_processor_set_performance (
                cpufreq_freqs.old = tmp;
                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE);
                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
-               printk(KERN_WARNING "acpi-cpufreq: Transition failed\n");
+               ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Transition failed\n"));
                retval = -ENODEV;
                goto migrate_end;
        }
 
-       dprintk("Transition successful after %d microseconds\n", i * 10);
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+               "Transition successful after %d microseconds\n",
+               i * 10));
 
        data->acpi_data.state = state;
 
        retval = 0;
 migrate_end:
        set_cpus_allowed(current, saved_mask);
-       return (retval);
+       return_VALUE(retval);
 }
 
 
@@ -213,7 +226,7 @@ acpi_cpufreq_target (
        unsigned int next_state = 0;
        unsigned int result = 0;
 
-       dprintk("acpi_cpufreq_setpolicy\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_setpolicy");
 
        result = cpufreq_frequency_table_target(policy,
                        data->freq_table,
@@ -221,11 +234,11 @@ acpi_cpufreq_target (
                        relation,
                        &next_state);
        if (result)
-               return (result);
+               return_VALUE(result);
 
        result = acpi_processor_set_performance (data, policy->cpu, next_state);
 
-       return (result);
+       return_VALUE(result);
 }
 
 
@@ -236,12 +249,12 @@ acpi_cpufreq_verify (
        unsigned int result = 0;
        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
 
-       dprintk("acpi_cpufreq_verify\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_verify");
 
        result = cpufreq_frequency_table_verify(policy, 
                        data->freq_table);
 
-       return (result);
+       return_VALUE(result);
 }
 
 
@@ -295,17 +308,17 @@ acpi_processor_cpu_init_pdc_est(
        union acpi_object *obj;
        u32 *buf;
        struct cpuinfo_x86 *c = cpu_data + cpu;
-       dprintk("acpi_processor_cpu_init_pdc_est\n");
+       ACPI_FUNCTION_TRACE("acpi_processor_cpu_init_pdc_est");
 
        if (!cpu_has(c, X86_FEATURE_EST))
-               return;
+               return_VOID;
 
        /* Initialize pdc. It will be used later. */
        if (!obj_list)
-               return;
+               return_VOID;
                
        if (!(obj_list->count && obj_list->pointer))
-               return;
+               return_VOID;
 
        obj = obj_list->pointer;
        if ((obj->buffer.length == 12) && obj->buffer.pointer) {
@@ -315,7 +328,7 @@ acpi_processor_cpu_init_pdc_est(
                        buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;
                perf->pdc = obj_list;
        }
-       return;
+       return_VOID;
 }
  
 
@@ -328,11 +341,11 @@ acpi_processor_cpu_init_pdc(
                )
 {
        struct cpuinfo_x86 *c = cpu_data + cpu;
-       dprintk("acpi_processor_cpu_init_pdc\n");
+       ACPI_FUNCTION_TRACE("acpi_processor_cpu_init_pdc");
        perf->pdc = NULL;
        if (cpu_has(c, X86_FEATURE_EST))
                acpi_processor_cpu_init_pdc_est(perf, cpu, obj_list);
-       return;
+       return_VOID;
 }
 
 
@@ -349,14 +362,14 @@ acpi_cpufreq_cpu_init (
        u32                             arg0_buf[3];
        struct acpi_object_list         arg_list = {1, &arg0};
 
-       dprintk("acpi_cpufreq_cpu_init\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_cpu_init");
        /* setup arg_list for _PDC settings */
         arg0.buffer.length = 12;
         arg0.buffer.pointer = (u8 *) arg0_buf;
 
        data = kmalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
        if (!data)
-               return (-ENOMEM);
+               return_VALUE(-ENOMEM);
        memset(data, 0, sizeof(struct cpufreq_acpi_io));
 
        acpi_io_data[cpu] = data;
@@ -370,15 +383,15 @@ acpi_cpufreq_cpu_init (
 
        /* capability check */
        if (data->acpi_data.state_count <= 1) {
-               dprintk("No P-States\n");
+               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No P-States\n"));
                result = -ENODEV;
                goto err_unreg;
        }
        if ((data->acpi_data.control_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO) ||
            (data->acpi_data.status_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-               dprintk("Unsupported address space [%d, %d]\n",
-                       (u32) (data->acpi_data.control_register.space_id),
-                       (u32) (data->acpi_data.status_register.space_id));
+               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unsupported address space [%d, %d]\n",
+                                 (u32) (data->acpi_data.control_register.space_id),
+                                 (u32) (data->acpi_data.status_register.space_id)));
                result = -ENODEV;
                goto err_unreg;
        }
@@ -415,21 +428,19 @@ acpi_cpufreq_cpu_init (
        if (result) {
                goto err_freqfree;
        }
+               
 
-       /* notify BIOS that we exist */
-       acpi_processor_notify_smm(THIS_MODULE);
-
-       printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management activated.\n",
+       printk(KERN_INFO "cpufreq: CPU%u - ACPI performance management activated.\n",
               cpu);
        for (i = 0; i < data->acpi_data.state_count; i++)
-               dprintk("     %cP%d: %d MHz, %d mW, %d uS\n",
+               printk(KERN_INFO "cpufreq: %cP%d: %d MHz, %d mW, %d uS\n",
                        (i == data->acpi_data.state?'*':' '), i,
                        (u32) data->acpi_data.states[i].core_frequency,
                        (u32) data->acpi_data.states[i].power,
                        (u32) data->acpi_data.states[i].transition_latency);
 
        cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
-       return (result);
+       return_VALUE(result);
 
  err_freqfree:
        kfree(data->freq_table);
@@ -439,7 +450,7 @@ acpi_cpufreq_cpu_init (
        kfree(data);
        acpi_io_data[cpu] = NULL;
 
-       return (result);
+       return_VALUE(result);
 }
 
 
@@ -450,7 +461,7 @@ acpi_cpufreq_cpu_exit (
        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
 
 
-       dprintk("acpi_cpufreq_cpu_exit\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_cpu_exit");
 
        if (data) {
                cpufreq_frequency_table_put_attr(policy->cpu);
@@ -459,7 +470,7 @@ acpi_cpufreq_cpu_exit (
                kfree(data);
        }
 
-       return (0);
+       return_VALUE(0);
 }
 
 
@@ -484,26 +495,24 @@ acpi_cpufreq_init (void)
 {
        int                     result = 0;
 
-       dprintk("acpi_cpufreq_init\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_init");
 
        result = cpufreq_register_driver(&acpi_cpufreq_driver);
        
-       return (result);
+       return_VALUE(result);
 }
 
 
 static void __exit
 acpi_cpufreq_exit (void)
 {
-       dprintk("acpi_cpufreq_exit\n");
+       ACPI_FUNCTION_TRACE("acpi_cpufreq_exit");
 
        cpufreq_unregister_driver(&acpi_cpufreq_driver);
 
-       return;
+       return_VOID;
 }
 
 
 late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
-
-MODULE_ALIAS("acpi");