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

Commit 7ab92e89 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/AER: Clear only ERR_FATAL status bits during fatal recovery 



During recovery from fatal errors, we previously called
pci_cleanup_aer_uncorrect_error_status(), which cleared *all* uncorrectable
error status bits (both ERR_FATAL and ERR_NONFATAL).

Instead, call a new pci_aer_clear_fatal_status() that clears only the
ERR_FATAL bits (as indicated by the PCI_ERR_UNCOR_SEVER register).

Based-on-patch-by: default avatarOza Pawandeep <poza@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7af02fcd

drivers/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -485,10 +485,12 @@ void pci_no_aer(void); 
void pci_aer_init(struct pci_dev *dev);

void pci_aer_exit(struct pci_dev *dev);

extern const struct attribute_group aer_stats_attr_group;

void pci_aer_clear_fatal_status(struct pci_dev *dev);

#else

static inline void pci_no_aer(void) { }

static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }

static inline void pci_aer_exit(struct pci_dev *d) { }

static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }

#endif



#endif /* DRIVERS_PCI_H */

drivers/pci/pcie/aer.c

+17 −0
Original line number Diff line number Diff line
@@ -399,6 +399,23 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 
}

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);



void pci_aer_clear_fatal_status(struct pci_dev *dev)

{

	int pos;

	u32 status, sev;



	pos = dev->aer_cap;

	if (!pos)

		return;



	/* Clear status bits for ERR_FATAL errors only */

	pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, &status);

	pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &sev);

	status &= sev;

	if (status)

		pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);

}



int pci_cleanup_aer_error_status_regs(struct pci_dev *dev)

{

	int pos;

drivers/pci/pcie/err.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service) 
		 * do error recovery on all subordinates of the bridge instead

		 * of the bridge and clear the error status of the bridge.

		 */

		pci_cleanup_aer_uncorrect_error_status(dev);

		pci_aer_clear_fatal_status(dev);

	}



	if (result == PCI_ERS_RESULT_RECOVERED) {