Merge branch 'pci/aer' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 31 Jan 2018 16:10:25 +0000 (10:10 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 31 Jan 2018 16:10:25 +0000 (10:10 -0600)
* pci/aer:
  PCI/AER: Return error if AER is not supported
  PCI/AER: Skip recovery callbacks for correctable errors from ACPI APEI

drivers/pci/pcie/aer/aerdrv_core.c

index 744805232155ccb15c7020ca3fdcab08bd50af7c..92ec13a09a2a1634c06831cc36fdcf5b4bd176e9 100644 (file)
@@ -633,7 +633,8 @@ static void aer_recover_work_func(struct work_struct *work)
                        continue;
                }
                cper_print_aer(pdev, entry.severity, entry.regs);
-               do_recovery(pdev, entry.severity);
+               if (entry.severity != AER_CORRECTABLE)
+                       do_recovery(pdev, entry.severity);
                pci_dev_put(pdev);
        }
 }
@@ -660,7 +661,7 @@ static int get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
 
        /* The device might not support AER */
        if (!pos)
-               return 1;
+               return 0;
 
        if (info->severity == AER_CORRECTABLE) {
                pci_read_config_dword(dev, pos + PCI_ERR_COR_STATUS,