diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci-acpi.h | 11 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 3ba25065fa96..8837928fbf33 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h | |||
| @@ -57,6 +57,15 @@ static inline acpi_status pcie_osc_support_set(u32 flags) | |||
| 57 | { | 57 | { |
| 58 | return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING); | 58 | return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING); |
| 59 | } | 59 | } |
| 60 | static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) | ||
| 61 | { | ||
| 62 | /* Find root host bridge */ | ||
| 63 | while (pdev->bus->self) | ||
| 64 | pdev = pdev->bus->self; | ||
| 65 | |||
| 66 | return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), | ||
| 67 | pdev->bus->number); | ||
| 68 | } | ||
| 60 | #else | 69 | #else |
| 61 | #if !defined(AE_ERROR) | 70 | #if !defined(AE_ERROR) |
| 62 | typedef u32 acpi_status; | 71 | typedef u32 acpi_status; |
| @@ -66,6 +75,8 @@ static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) | |||
| 66 | {return AE_ERROR;} | 75 | {return AE_ERROR;} |
| 67 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} | 76 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} |
| 68 | static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} | 77 | static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} |
| 78 | static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) | ||
| 79 | { return NULL; } | ||
| 69 | #endif | 80 | #endif |
| 70 | 81 | ||
| 71 | #endif /* _PCI_ACPI_H_ */ | 82 | #endif /* _PCI_ACPI_H_ */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9ec2bcce8e83..f1624b396754 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2428,6 +2428,9 @@ | |||
| 2428 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a | 2428 | #define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a |
| 2429 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 | 2429 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 |
| 2430 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 | 2430 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2431 | #define PCI_DEVICE_ID_INTEL_PCH_0 0x3b10 | ||
| 2432 | #define PCI_DEVICE_ID_INTEL_PCH_1 0x3b11 | ||
| 2433 | #define PCI_DEVICE_ID_INTEL_PCH_2 0x3b30 | ||
| 2431 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2434 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2432 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 | 2435 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 |
| 2433 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 | 2436 | #define PCI_DEVICE_ID_INTEL_5100_21 0x65f5 |
