summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLance Ortiz <lance.ortiz@hp.com>2013-05-30 08:25:12 -0600
committerTony Luck <tony.luck@intel.com>2013-05-30 10:51:20 -0700
commit37448adfc7ce0d6d5892b87aa8d57edde4126f49 (patch)
tree384a776fe506e4dfb1cb6d64cc56ce7ae3c289e9 /include/linux
parente4aa937ec75df0eea0bee03bffa3303ad36c986b (diff)
downloadlinux-3.10-37448adfc7ce0d6d5892b87aa8d57edde4126f49.tar.gz
linux-3.10-37448adfc7ce0d6d5892b87aa8d57edde4126f49.tar.bz2
linux-3.10-37448adfc7ce0d6d5892b87aa8d57edde4126f49.zip
aerdrv: Move cper_print_aer() call out of interrupt context
The following warning was seen on 3.9 when a corrected PCIe error was being handled by the AER subsystem. WARNING: at .../drivers/pci/search.c:214 pci_get_dev_by_id+0x8a/0x90() This occurred because a call to pci_get_domain_bus_and_slot() was added to cper_print_pcie() to setup for the call to cper_print_aer(). The warning showed up because cper_print_pcie() is called in an interrupt context and pci_get* functions are not supposed to be called in that context. The solution is to move the cper_print_aer() call out of the interrupt context and into aer_recover_work_func() to avoid any warnings when calling pci_get* functions. Signed-off-by: Lance Ortiz <lance.ortiz@hp.com> Acked-by: Borislav Petkov <bp@suse.de> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/aer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/aer.h b/include/linux/aer.h
index ec10e1b24c1..737f90ab4b6 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -49,10 +49,11 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
}
#endif
-extern void cper_print_aer(const char *prefix, struct pci_dev *dev,
+extern void cper_print_aer(struct pci_dev *dev,
int cper_severity, struct aer_capability_regs *aer);
extern int cper_severity_to_aer(int cper_severity);
extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- int severity);
+ int severity,
+ struct aer_capability_regs *aer_regs);
#endif //_AER_H_