diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 20:25:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 20:25:46 -0400 |
commit | dc7c65db2845a8d17432d89252c4227a9a7cb15f (patch) | |
tree | 79030b0aaaafc04bc4303c21495134e744afc058 /drivers/pci/pci.h | |
parent | 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af (diff) | |
parent | 58b6e5538460be358fdf1286d9a2fbcfcc2cfaba (diff) |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits)
Revert "x86/PCI: ACPI based PCI gap calculation"
PCI: remove unnecessary volatile in PCIe hotplug struct controller
x86/PCI: ACPI based PCI gap calculation
PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
PCI PM: Fix pci_prepare_to_sleep
x86/PCI: Fix PCI config space for domains > 0
Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
PCI: Simplify PCI device PM code
PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
PCI ACPI: Rework PCI handling of wake-up
ACPI: Introduce new device wakeup flag 'prepared'
ACPI: Introduce acpi_device_sleep_wake function
PCI: rework pci_set_power_state function to call platform first
PCI: Introduce platform_pci_power_manageable function
ACPI: Introduce acpi_bus_power_manageable function
PCI: make pci_name use dev_name
PCI: handle pci_name() being const
PCI: add stub for pci_set_consistent_dma_mask()
PCI: remove unused arch pcibios_update_resource() functions
PCI: fix pci_setup_device()'s sprinting into a const buffer
...
Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually.
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 47 |
1 files changed, 43 insertions, 4 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 312daff834b6..d807cd786f20 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -5,10 +5,36 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); | |||
5 | extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); | 5 | extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); |
6 | extern void pci_cleanup_rom(struct pci_dev *dev); | 6 | extern void pci_cleanup_rom(struct pci_dev *dev); |
7 | 7 | ||
8 | /* Firmware callbacks */ | 8 | /** |
9 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev); | 9 | * Firmware PM callbacks |
10 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, | 10 | * |
11 | pci_power_t state); | 11 | * @is_manageable - returns 'true' if given device is power manageable by the |
12 | * platform firmware | ||
13 | * | ||
14 | * @set_state - invokes the platform firmware to set the device's power state | ||
15 | * | ||
16 | * @choose_state - returns PCI power state of given device preferred by the | ||
17 | * platform; to be used during system-wide transitions from a | ||
18 | * sleeping state to the working state and vice versa | ||
19 | * | ||
20 | * @can_wakeup - returns 'true' if given device is capable of waking up the | ||
21 | * system from a sleeping state | ||
22 | * | ||
23 | * @sleep_wake - enables/disables the system wake up capability of given device | ||
24 | * | ||
25 | * If given platform is generally capable of power managing PCI devices, all of | ||
26 | * these callbacks are mandatory. | ||
27 | */ | ||
28 | struct pci_platform_pm_ops { | ||
29 | bool (*is_manageable)(struct pci_dev *dev); | ||
30 | int (*set_state)(struct pci_dev *dev, pci_power_t state); | ||
31 | pci_power_t (*choose_state)(struct pci_dev *dev); | ||
32 | bool (*can_wakeup)(struct pci_dev *dev); | ||
33 | int (*sleep_wake)(struct pci_dev *dev, bool enable); | ||
34 | }; | ||
35 | |||
36 | extern int pci_set_platform_pm(struct pci_platform_pm_ops *ops); | ||
37 | extern void pci_pm_init(struct pci_dev *dev); | ||
12 | 38 | ||
13 | extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val); | 39 | extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val); |
14 | extern int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val); | 40 | extern int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val); |
@@ -105,3 +131,16 @@ pci_match_one_device(const struct pci_device_id *id, const struct pci_dev *dev) | |||
105 | } | 131 | } |
106 | 132 | ||
107 | struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev); | 133 | struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev); |
134 | |||
135 | /* PCI slot sysfs helper code */ | ||
136 | #define to_pci_slot(s) container_of(s, struct pci_slot, kobj) | ||
137 | |||
138 | extern struct kset *pci_slots_kset; | ||
139 | |||
140 | struct pci_slot_attribute { | ||
141 | struct attribute attr; | ||
142 | ssize_t (*show)(struct pci_slot *, char *); | ||
143 | ssize_t (*store)(struct pci_slot *, const char *, size_t); | ||
144 | }; | ||
145 | #define to_pci_slot_attr(s) container_of(s, struct pci_slot_attribute, attr) | ||
146 | |||