Commit 2de2f927 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aer' 

- Change pcie_aer_disable from int to bool (Hans Zhang)

- Add message if AER interrupt occurs and we find more downstream devices
  with AER errors logged than we can process (Akshay Jindal)

* pci/aer:
  PCI/AER: Add message when AER_MAX_MULTI_ERR_DEVICES limit is hit
  PCI/AER: Use bool for AER disable state tracking
parents 19272b37 a6f494be

drivers/pci/pcie/aer.c

+4 −3
Original line number Diff line number Diff line
@@ -116,12 +116,12 @@ struct aer_info { 
					PCI_ERR_ROOT_MULTI_COR_RCV |	\

					PCI_ERR_ROOT_MULTI_UNCOR_RCV)



static int pcie_aer_disable;

static bool pcie_aer_disable;

static pci_ers_result_t aer_root_reset(struct pci_dev *dev);



void pci_no_aer(void)

{

	pcie_aer_disable = 1;

	pcie_aer_disable = true;

}



bool pci_aer_available(void)
@@ -1039,7 +1039,8 @@ static int find_device_iter(struct pci_dev *dev, void *data) 
		/* List this device */

		if (add_error_device(e_info, dev)) {

			/* We cannot handle more... Stop iteration */

			/* TODO: Should print error message here? */

			pci_err(dev, "Exceeded max supported (%d) devices with errors logged\n",

				AER_MAX_MULTI_ERR_DEVICES);

			return 1;

		}