vserver 1.9.5.x5

[linux-2.6.git] / include / acpi / processor.h

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index dab7521..d1c8a8b 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -2,10 +2,11 @@
 #define __ACPI_PROCESSOR_H
 
 #include <linux/kernel.h>
+#include <linux/config.h>
 
 #define ACPI_PROCESSOR_BUSY_METRIC     10
 
-#define ACPI_PROCESSOR_MAX_POWER       ACPI_C_STATE_COUNT
+#define ACPI_PROCESSOR_MAX_POWER       8
 #define ACPI_PROCESSOR_MAX_C2_LATENCY  100
 #define ACPI_PROCESSOR_MAX_C3_LATENCY  1000
 
@@ -15,9 +16,22 @@
 
 /* Power Management */
 
+struct acpi_processor_cx;
+
+struct acpi_power_register {
+       u8                      descriptor;
+       u16                     length;
+       u8                      space_id;
+       u8                      bit_width;
+       u8                      bit_offset;
+       u8                      reserved;
+       u64                     address;
+} __attribute__ ((packed));
+
+
 struct acpi_processor_cx_policy {
        u32                     count;
-       int                     state;
+       struct acpi_processor_cx *state;
        struct {
                u32                     time;
                u32                     ticks;
@@ -28,6 +42,7 @@ struct acpi_processor_cx_policy {
 
 struct acpi_processor_cx {
        u8                      valid;
+       u8                      type;
        u32                     address;
        u32                     latency;
        u32                     latency_ticks;
@@ -38,9 +53,11 @@ struct acpi_processor_cx {
 };
 
 struct acpi_processor_power {
-       int                     state;
-       int                     default_state;
+       struct acpi_processor_cx *state;
+       unsigned long           bm_check_timestamp;
+       u32                     default_state;
        u32                     bm_activity;
+       int                     count;
        struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
 };
 
@@ -118,13 +135,15 @@ struct acpi_processor_flags {
        u8                      limit:1;
        u8                      bm_control:1;
        u8                      bm_check:1;
-       u8                      reserved:2;
+       u8                      has_cst:1;
+       u8                      power_setup_done:1;
 };
 
 struct acpi_processor {
        acpi_handle             handle;
        u32                     acpi_id;
        u32                     id;
+       u32                     pblk;
        int                     performance_platform_limit;
        struct acpi_processor_flags flags;
        struct acpi_processor_power power;
@@ -133,6 +152,16 @@ struct acpi_processor {
        struct acpi_processor_limit limit;
 };
 
+struct acpi_processor_errata {
+       u8                      smp;
+       struct {
+               u8                      throttle:1;
+               u8                      fdma:1;
+               u8                      reserved:6;
+               u32                     bmisx;
+       }                       piix4;
+};
+
 extern int acpi_processor_register_performance (
        struct acpi_processor_performance * performance,
        unsigned int cpu);
@@ -140,4 +169,69 @@ extern void acpi_processor_unregister_performance (
        struct acpi_processor_performance * performance,
        unsigned int cpu);
 
+/* note: this locks both the calling module and the processor module
+         if a _PPC object exists, rmmod is disallowed then */
+int acpi_processor_notify_smm(struct module *calling_module);
+
+
+
+/* for communication between multiple parts of the processor kernel module */
+extern struct acpi_processor   *processors[NR_CPUS];
+extern struct acpi_processor_errata errata;
+
+/* in processor_perflib.c */
+#ifdef CONFIG_CPU_FREQ
+void acpi_processor_ppc_init(void);
+void acpi_processor_ppc_exit(void);
+int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+#else
+static inline void acpi_processor_ppc_init(void) { return; }
+static inline void acpi_processor_ppc_exit(void) { return; }
+static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) {
+       static unsigned int printout = 1;
+       if (printout) {
+               printk(KERN_WARNING "Warning: Processor Platform Limit event detected, but not handled.\n");
+               printk(KERN_WARNING "Consider compiling CPUfreq support into your kernel.\n");
+               printout = 0;
+       }
+       return 0;
+}
+#endif /* CONFIG_CPU_FREQ */
+
+/* in processor_throttling.c */
+int acpi_processor_get_throttling_info (struct acpi_processor *pr);
+int acpi_processor_set_throttling (struct acpi_processor *pr, int state);
+int acpi_processor_throttling_open_fs(struct inode *inode, struct file *file);
+ssize_t acpi_processor_write_throttling (
+        struct file            *file,
+        const char             __user *buffer,
+        size_t                 count,
+        loff_t                 *data);
+extern struct file_operations acpi_processor_throttling_fops;
+
+/* in processor_idle.c */
+int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *device);
+int acpi_processor_cst_has_changed (struct acpi_processor *pr);
+int acpi_processor_power_exit(struct acpi_processor *pr, struct acpi_device *device);
+
+
+/* in processor_thermal.c */
+int acpi_processor_get_limit_info (struct acpi_processor *pr);
+int acpi_processor_limit_open_fs(struct inode *inode, struct file *file);
+ssize_t acpi_processor_write_limit (
+       struct file             *file,
+       const char              __user *buffer,
+       size_t                  count,
+       loff_t                  *data);
+extern struct file_operations acpi_processor_limit_fops;
+
+#ifdef CONFIG_CPU_FREQ
+void acpi_thermal_cpufreq_init(void);
+void acpi_thermal_cpufreq_exit(void);
+#else
+static inline void acpi_thermal_cpufreq_init(void) { return; }
+static inline void acpi_thermal_cpufreq_exit(void) { return; }
+#endif
+
+
 #endif