summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-08-21 01:50:52 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-08-24 13:43:08 -0700
commitf1a7bfaf6bb9cb195577e674c0ab2fd0a55d9014 (patch)
tree8150335e1d70d026704f39c28921615d5af9701e /drivers/pci/pcie
parent23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8 (diff)
downloadlinux-f1a7bfaf6bb9cb195577e674c0ab2fd0a55d9014.tar.gz
linux-f1a7bfaf6bb9cb195577e674c0ab2fd0a55d9014.tar.bz2
linux-f1a7bfaf6bb9cb195577e674c0ab2fd0a55d9014.zip
PCI: PCIe AER: Introduce pci_aer_available()
Introduce a function allowing the caller to check whether to try to enable PCIe AER. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r--drivers/pci/pcie/aer/aerdrv.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 484cc55194b8..f409948e1a9b 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -72,6 +72,11 @@ void pci_no_aer(void)
pcie_aer_disable = 1; /* has priority over 'forceload' */
}
+bool pci_aer_available(void)
+{
+ return !pcie_aer_disable && pci_msi_enabled();
+}
+
static int set_device_error_reporting(struct pci_dev *dev, void *data)
{
bool enable = *((bool *)data);
@@ -411,9 +416,7 @@ static void aer_error_resume(struct pci_dev *dev)
*/
static int __init aer_service_init(void)
{
- if (pcie_aer_disable)
- return -ENXIO;
- if (!pci_msi_enabled())
+ if (!pci_aer_available())
return -ENXIO;
return pcie_port_service_register(&aerdriver);
}