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

Commit 5b6c0966 authored by Oza Pawandeep's avatar Oza Pawandeep Committed by Bjorn Helgaas
Browse files

PCI/AER: Factor out ERR_NONFATAL status bit clearing 



aer_error_resume() clears all ERR_NONFATAL error status bits.  This is
exactly what pci_cleanup_aer_uncorrect_error_status(), so use that instead
of duplicating the code.

Signed-off-by: default avatarOza Pawandeep <poza@codeaurora.org>
[bhelgaas: split to separate patch]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e7b0b847

drivers/pci/pcie/aer.c

+1 −8
Original line number Diff line number Diff line
@@ -1532,20 +1532,13 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
 */

static void aer_error_resume(struct pci_dev *dev)

{

	int pos;

	u32 status, mask;

	u16 reg16;



	/* Clean up Root device status */

	pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &reg16);

	pcie_capability_write_word(dev, PCI_EXP_DEVSTA, reg16);



	/* Clean AER Root Error Status */

	pos = dev->aer_cap;

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

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

	status &= ~mask; /* Clear corresponding nonfatal bits */

	pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);

	pci_cleanup_aer_uncorrect_error_status(dev);

}



static struct pcie_port_service_driver aerdriver = {