Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86e99150 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/aer' into next 

* pci/aer:
  PCI/AER: Return error if AER is not supported
  PCI/AER: Skip recovery callbacks for correctable errors from ACPI APEI
parents 1291a0d5 0f6f1d9f

drivers/pci/pcie/aer/aerdrv_core.c

+3 −2
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ static void aer_recover_work_func(struct work_struct *work) 
			continue;

		}

		cper_print_aer(pdev, entry.severity, entry.regs);

		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,