diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-22 01:41:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-22 01:41:47 -0400 |
| commit | 25076246e80c0c48cc4c9115335b83343b9dc727 (patch) | |
| tree | c7b462c6b4f67227722135a7a419ad110a6fd93e /include/linux | |
| parent | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (diff) | |
| parent | c413d7682020a127f54744a1b30f597692aea1fd (diff) | |
Merge branch 'apei-release' into release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/aer.h | 24 | ||||
| -rw-r--r-- | include/linux/cper.h | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/include/linux/aer.h b/include/linux/aer.h index f7df1eefc10..8414de22a77 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -7,6 +7,28 @@ #ifndef _AER_H_ #define _AER_H_ +struct aer_header_log_regs { + unsigned int dw0; + unsigned int dw1; + unsigned int dw2; + unsigned int dw3; +}; + +struct aer_capability_regs { + u32 header; + u32 uncor_status; + u32 uncor_mask; + u32 uncor_severity; + u32 cor_status; + u32 cor_mask; + u32 cap_control; + struct aer_header_log_regs header_log; + u32 root_command; + u32 root_status; + u16 cor_err_source; + u16 uncor_err_source; +}; + #if defined(CONFIG_PCIEAER) /* pci-e port driver needs this function to enable aer */ extern int pci_enable_pcie_error_reporting(struct pci_dev *dev); @@ -27,5 +49,7 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) } #endif +extern void cper_print_aer(const char *prefix, int cper_severity, + struct aer_capability_regs *aer); #endif //_AER_H_ diff --git a/include/linux/cper.h b/include/linux/cper.h index 3104aaff5dd..372a25839fd 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -388,5 +388,7 @@ struct cper_sec_pcie { #pragma pack() u64 cper_next_record_id(void); +void cper_print_bits(const char *prefix, unsigned int bits, + const char *strs[], unsigned int strs_size); #endif |