diff options
author | Zhang, Yanmin <yanmin_zhang@linux.intel.com> | 2007-06-05 23:44:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-11 19:02:08 -0400 |
commit | 8d29bfb79e632fe318f4c01c9c2e8faacb89b800 (patch) | |
tree | 696caa373f8340153bd18655ed4f61b035823f16 /drivers/pci/pcie/aer/aerdrv.h | |
parent | f477836457730a2b925f625023ec4e5bf11015be (diff) |
PCI: fix AER driver error information
Below patch fixes aer driver error information and enables aer driver
although CONFIG_ACPI=n.
As a matter of fact, the new patch is created from below 2 patches plus
a minor patch apply fuzz fixing. Because the second patch fixed a compilation
error introduced by the first patch, I merge them to facilitate bisect.
1) http://marc.info/?l=linux-kernel&m=117783233918191&w=2;
2) http://marc.info/?l=linux-mm-commits&m=118046936720790&w=2
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv.h')
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index 5cca394d5999..c7ad68b6c6d6 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h | |||
@@ -19,10 +19,6 @@ | |||
19 | #define AER_ERROR_MASK 0x001fffff | 19 | #define AER_ERROR_MASK 0x001fffff |
20 | #define AER_ERROR(d) (d & AER_ERROR_MASK) | 20 | #define AER_ERROR(d) (d & AER_ERROR_MASK) |
21 | 21 | ||
22 | #define OSC_METHOD_RUN_SUCCESS 0 | ||
23 | #define OSC_METHOD_NOT_SUPPORTED 1 | ||
24 | #define OSC_METHOD_RUN_FAILURE 2 | ||
25 | |||
26 | /* Root Error Status Register Bits */ | 22 | /* Root Error Status Register Bits */ |
27 | #define ROOT_ERR_STATUS_MASKS 0x0f | 23 | #define ROOT_ERR_STATUS_MASKS 0x0f |
28 | 24 | ||
@@ -121,6 +117,14 @@ extern void aer_delete_rootport(struct aer_rpc *rpc); | |||
121 | extern int aer_init(struct pcie_device *dev); | 117 | extern int aer_init(struct pcie_device *dev); |
122 | extern void aer_isr(struct work_struct *work); | 118 | extern void aer_isr(struct work_struct *work); |
123 | extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); | 119 | extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); |
124 | extern int aer_osc_setup(struct pci_dev *dev); | 120 | |
121 | #ifdef CONFIG_ACPI | ||
122 | extern int aer_osc_setup(struct pcie_device *pciedev); | ||
123 | #else | ||
124 | static inline int aer_osc_setup(struct pcie_device *pciedev) | ||
125 | { | ||
126 | return 0; | ||
127 | } | ||
128 | #endif | ||
125 | 129 | ||
126 | #endif //_AERDRV_H_ | 130 | #endif //_AERDRV_H_ |