aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index f485107ddc43..ca59ee9cc651 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -246,7 +246,6 @@ struct acpi_device_perf {
246/* Wakeup Management */ 246/* Wakeup Management */
247struct acpi_device_wakeup_flags { 247struct acpi_device_wakeup_flags {
248 u8 valid:1; /* Can successfully enable wakeup? */ 248 u8 valid:1; /* Can successfully enable wakeup? */
249 u8 prepared:1; /* Has the wake-up capability been enabled? */
250 u8 run_wake:1; /* Run-Wake GPE devices */ 249 u8 run_wake:1; /* Run-Wake GPE devices */
251}; 250};
252 251
@@ -261,6 +260,7 @@ struct acpi_device_wakeup {
261 struct acpi_handle_list resources; 260 struct acpi_handle_list resources;
262 struct acpi_device_wakeup_state state; 261 struct acpi_device_wakeup_state state;
263 struct acpi_device_wakeup_flags flags; 262 struct acpi_device_wakeup_flags flags;
263 int prepare_count;
264}; 264};
265 265
266/* Device */ 266/* Device */
@@ -367,10 +367,26 @@ int register_acpi_bus_type(struct acpi_bus_type *);
367int unregister_acpi_bus_type(struct acpi_bus_type *); 367int unregister_acpi_bus_type(struct acpi_bus_type *);
368struct device *acpi_get_physical_device(acpi_handle); 368struct device *acpi_get_physical_device(acpi_handle);
369 369
370struct acpi_pci_root {
371 struct list_head node;
372 struct acpi_device * device;
373 struct acpi_pci_id id;
374 struct pci_bus *bus;
375 u16 segment;
376 u8 bus_nr;
377
378 u32 osc_support_set; /* _OSC state of support bits */
379 u32 osc_control_set; /* _OSC state of control bits */
380 u32 osc_control_qry; /* the latest _OSC query result */
381
382 u32 osc_queried:1; /* has _OSC control been queried? */
383};
384
370/* helper */ 385/* helper */
371acpi_handle acpi_get_child(acpi_handle, acpi_integer); 386acpi_handle acpi_get_child(acpi_handle, acpi_integer);
372int acpi_is_root_bridge(acpi_handle); 387int acpi_is_root_bridge(acpi_handle);
373acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); 388acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
389struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
374#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) 390#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
375 391
376#ifdef CONFIG_PM_SLEEP 392#ifdef CONFIG_PM_SLEEP