aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acconfig.h4
-rw-r--r--include/acpi/acoutput.h8
-rw-r--r--include/acpi/acpi_bus.h26
-rw-r--r--include/acpi/acpi_drivers.h8
-rw-r--r--include/acpi/acpixf.h3
-rw-r--r--include/acpi/processor.h5
6 files changed, 20 insertions, 34 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 14ceff788c40..1c16f821434f 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -219,8 +219,8 @@
219 * 219 *
220 *****************************************************************************/ 220 *****************************************************************************/
221 221
222#define ACPI_DEBUGGER_MAX_ARGS 8 /* Must be max method args + 1 */ 222#define ACPI_DEBUGGER_MAX_ARGS ACPI_METHOD_NUM_ARGS + 4 /* Max command line arguments */
223#define ACPI_DB_LINE_BUFFER_SIZE 512 223#define ACPI_DB_LINE_BUFFER_SIZE 512
224 224
225#define ACPI_DEBUGGER_COMMAND_PROMPT '-' 225#define ACPI_DEBUGGER_COMMAND_PROMPT '-'
226#define ACPI_DEBUGGER_EXECUTE_PROMPT '%' 226#define ACPI_DEBUGGER_EXECUTE_PROMPT '%'
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 4f52ea795c7a..4607b027a657 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -428,27 +428,21 @@
428 * This is the non-debug case -- make everything go away, 428 * This is the non-debug case -- make everything go away,
429 * leaving no executable debug code! 429 * leaving no executable debug code!
430 */ 430 */
431#define ACPI_FUNCTION_NAME(a)
432#define ACPI_DEBUG_PRINT(pl) 431#define ACPI_DEBUG_PRINT(pl)
433#define ACPI_DEBUG_PRINT_RAW(pl) 432#define ACPI_DEBUG_PRINT_RAW(pl)
434#define ACPI_DEBUG_EXEC(a) 433#define ACPI_DEBUG_EXEC(a)
435#define ACPI_DEBUG_ONLY_MEMBERS(a) 434#define ACPI_DEBUG_ONLY_MEMBERS(a)
435#define ACPI_FUNCTION_NAME(a)
436#define ACPI_FUNCTION_TRACE(a) 436#define ACPI_FUNCTION_TRACE(a)
437#define ACPI_FUNCTION_TRACE_PTR(a, b) 437#define ACPI_FUNCTION_TRACE_PTR(a, b)
438#define ACPI_FUNCTION_TRACE_U32(a, b) 438#define ACPI_FUNCTION_TRACE_U32(a, b)
439#define ACPI_FUNCTION_TRACE_STR(a, b) 439#define ACPI_FUNCTION_TRACE_STR(a, b)
440#define ACPI_FUNCTION_EXIT
441#define ACPI_FUNCTION_STATUS_EXIT(s)
442#define ACPI_FUNCTION_VALUE_EXIT(s)
443#define ACPI_FUNCTION_ENTRY() 440#define ACPI_FUNCTION_ENTRY()
444#define ACPI_DUMP_STACK_ENTRY(a) 441#define ACPI_DUMP_STACK_ENTRY(a)
445#define ACPI_DUMP_OPERANDS(a, b, c) 442#define ACPI_DUMP_OPERANDS(a, b, c)
446#define ACPI_DUMP_ENTRY(a, b) 443#define ACPI_DUMP_ENTRY(a, b)
447#define ACPI_DUMP_TABLES(a, b)
448#define ACPI_DUMP_PATHNAME(a, b, c, d) 444#define ACPI_DUMP_PATHNAME(a, b, c, d)
449#define ACPI_DUMP_BUFFER(a, b) 445#define ACPI_DUMP_BUFFER(a, b)
450#define ACPI_DEBUG_PRINT(pl)
451#define ACPI_DEBUG_PRINT_RAW(pl)
452#define ACPI_IS_DEBUG_ENABLED(level, component) 0 446#define ACPI_IS_DEBUG_ENABLED(level, component) 0
453 447
454/* Return macros must have a return statement at the minimum */ 448/* Return macros must have a return statement at the minimum */
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index b790607298cb..ca081ace2a1d 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -63,13 +63,6 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
63#define ACPI_BUS_FILE_ROOT "acpi" 63#define ACPI_BUS_FILE_ROOT "acpi"
64extern struct proc_dir_entry *acpi_root_dir; 64extern struct proc_dir_entry *acpi_root_dir;
65 65
66enum acpi_bus_removal_type {
67 ACPI_BUS_REMOVAL_NORMAL = 0,
68 ACPI_BUS_REMOVAL_EJECT,
69 ACPI_BUS_REMOVAL_SUPRISE,
70 ACPI_BUS_REMOVAL_TYPE_COUNT
71};
72
73enum acpi_bus_device_type { 66enum acpi_bus_device_type {
74 ACPI_BUS_TYPE_DEVICE = 0, 67 ACPI_BUS_TYPE_DEVICE = 0,
75 ACPI_BUS_TYPE_POWER, 68 ACPI_BUS_TYPE_POWER,
@@ -284,6 +277,7 @@ struct acpi_device_physical_node {
284 u8 node_id; 277 u8 node_id;
285 struct list_head node; 278 struct list_head node;
286 struct device *dev; 279 struct device *dev;
280 bool put_online:1;
287}; 281};
288 282
289/* set maximum of physical nodes to 32 for expansibility */ 283/* set maximum of physical nodes to 32 for expansibility */
@@ -308,7 +302,6 @@ struct acpi_device {
308 struct acpi_driver *driver; 302 struct acpi_driver *driver;
309 void *driver_data; 303 void *driver_data;
310 struct device dev; 304 struct device dev;
311 enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
312 u8 physical_node_count; 305 u8 physical_node_count;
313 struct list_head physical_node_list; 306 struct list_head physical_node_list;
314 struct mutex physical_node_lock; 307 struct mutex physical_node_lock;
@@ -380,6 +373,7 @@ const char *acpi_power_state_string(int state);
380int acpi_device_get_power(struct acpi_device *device, int *state); 373int acpi_device_get_power(struct acpi_device *device, int *state);
381int acpi_device_set_power(struct acpi_device *device, int state); 374int acpi_device_set_power(struct acpi_device *device, int state);
382int acpi_bus_init_power(struct acpi_device *device); 375int acpi_bus_init_power(struct acpi_device *device);
376int acpi_device_fix_up_power(struct acpi_device *device);
383int acpi_bus_update_power(acpi_handle handle, int *state_p); 377int acpi_bus_update_power(acpi_handle handle, int *state_p);
384bool acpi_bus_power_manageable(acpi_handle handle); 378bool acpi_bus_power_manageable(acpi_handle handle);
385 379
@@ -465,8 +459,6 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
465 acpi_notify_handler handler, void *context); 459 acpi_notify_handler handler, void *context);
466acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, 460acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
467 acpi_notify_handler handler); 461 acpi_notify_handler handler);
468int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
469 u32 target_state, int d_max_in, int *d_min_p);
470int acpi_pm_device_sleep_state(struct device *, int *, int); 462int acpi_pm_device_sleep_state(struct device *, int *, int);
471void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev); 463void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev);
472void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev); 464void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev);
@@ -482,23 +474,13 @@ static inline acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
482{ 474{
483 return AE_SUPPORT; 475 return AE_SUPPORT;
484} 476}
485static inline int __acpi_device_power_state(int m, int *p) 477static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
486{ 478{
487 if (p) 479 if (p)
488 *p = ACPI_STATE_D0; 480 *p = ACPI_STATE_D0;
481
489 return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0; 482 return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0;
490} 483}
491static inline int acpi_device_power_state(struct device *dev,
492 struct acpi_device *adev,
493 u32 target_state, int d_max_in,
494 int *d_min_p)
495{
496 return __acpi_device_power_state(d_max_in, d_min_p);
497}
498static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
499{
500 return __acpi_device_power_state(m, p);
501}
502static inline void acpi_dev_pm_add_dependent(acpi_handle handle, 484static inline void acpi_dev_pm_add_dependent(acpi_handle handle,
503 struct device *depdev) {} 485 struct device *depdev) {}
504static inline void acpi_dev_pm_remove_dependent(acpi_handle handle, 486static inline void acpi_dev_pm_remove_dependent(acpi_handle handle,
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index e6168a24b9f0..b420939f5eb5 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -123,7 +123,9 @@ extern int register_dock_notifier(struct notifier_block *nb);
123extern void unregister_dock_notifier(struct notifier_block *nb); 123extern void unregister_dock_notifier(struct notifier_block *nb);
124extern int register_hotplug_dock_device(acpi_handle handle, 124extern int register_hotplug_dock_device(acpi_handle handle,
125 const struct acpi_dock_ops *ops, 125 const struct acpi_dock_ops *ops,
126 void *context); 126 void *context,
127 void (*init)(void *),
128 void (*release)(void *));
127extern void unregister_hotplug_dock_device(acpi_handle handle); 129extern void unregister_hotplug_dock_device(acpi_handle handle);
128#else 130#else
129static inline int is_dock_device(acpi_handle handle) 131static inline int is_dock_device(acpi_handle handle)
@@ -139,7 +141,9 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
139} 141}
140static inline int register_hotplug_dock_device(acpi_handle handle, 142static inline int register_hotplug_dock_device(acpi_handle handle,
141 const struct acpi_dock_ops *ops, 143 const struct acpi_dock_ops *ops,
142 void *context) 144 void *context,
145 void (*init)(void *),
146 void (*release)(void *))
143{ 147{
144 return -ENODEV; 148 return -ENODEV;
145} 149}
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 454881e6450a..1b09300810e6 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
46 46
47/* Current ACPICA subsystem version in YYYYMMDD format */ 47/* Current ACPICA subsystem version in YYYYMMDD format */
48 48
49#define ACPI_CA_VERSION 0x20130328 49#define ACPI_CA_VERSION 0x20130517
50 50
51#include <acpi/acconfig.h> 51#include <acpi/acconfig.h>
52#include <acpi/actypes.h> 52#include <acpi/actypes.h>
@@ -80,6 +80,7 @@ extern bool acpi_gbl_enable_aml_debug_object;
80extern u8 acpi_gbl_copy_dsdt_locally; 80extern u8 acpi_gbl_copy_dsdt_locally;
81extern u8 acpi_gbl_truncate_io_addresses; 81extern u8 acpi_gbl_truncate_io_addresses;
82extern u8 acpi_gbl_disable_auto_repair; 82extern u8 acpi_gbl_disable_auto_repair;
83extern u8 acpi_gbl_disable_ssdt_table_load;
83 84
84/* 85/*
85 * Hardware-reduced prototypes. All interfaces that use these macros will 86 * Hardware-reduced prototypes. All interfaces that use these macros will
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ea69367fdd3b..66096d06925e 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -6,6 +6,10 @@
6#include <linux/thermal.h> 6#include <linux/thermal.h>
7#include <asm/acpi.h> 7#include <asm/acpi.h>
8 8
9#define ACPI_PROCESSOR_CLASS "processor"
10#define ACPI_PROCESSOR_DEVICE_NAME "Processor"
11#define ACPI_PROCESSOR_DEVICE_HID "ACPI0007"
12
9#define ACPI_PROCESSOR_BUSY_METRIC 10 13#define ACPI_PROCESSOR_BUSY_METRIC 10
10 14
11#define ACPI_PROCESSOR_MAX_POWER 8 15#define ACPI_PROCESSOR_MAX_POWER 8
@@ -207,6 +211,7 @@ struct acpi_processor {
207 struct acpi_processor_throttling throttling; 211 struct acpi_processor_throttling throttling;
208 struct acpi_processor_limit limit; 212 struct acpi_processor_limit limit;
209 struct thermal_cooling_device *cdev; 213 struct thermal_cooling_device *cdev;
214 struct device *dev; /* Processor device. */
210}; 215};
211 216
212struct acpi_processor_errata { 217struct acpi_processor_errata {