Commit 894020fd authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by Bjorn Helgaas
Browse files

PCI/AER: Rationalize error status register clearing 

The AER interfaces to clear error status registers were a confusing mess:

  - pci_cleanup_aer_uncorrect_error_status() cleared non-fatal errors
    from the Uncorrectable Error Status register.

  - pci_aer_clear_fatal_status() cleared fatal errors from the
    Uncorrectable Error Status register.

  - pci_cleanup_aer_error_status_regs() cleared the Root Error Status
    register (for Root Ports), the Uncorrectable Error Status register,
    and the Correctable Error Status register.

Rename them to make them consistent:

  From                                     To
  ---------------------------------------- -------------------------------
  pci_cleanup_aer_uncorrect_error_status() pci_aer_clear_nonfatal_status()
  pci_aer_clear_fatal_status()             pci_aer_clear_fatal_status()
  pci_cleanup_aer_error_status_regs()      pci_aer_clear_status()

Since pci_cleanup_aer_error_status_regs() (renamed to
pci_aer_clear_status()) is only used within drivers/pci/, move the
declaration from <linux/aer.h> to drivers/pci/pci.h.

[bhelgaas: commit log, add renames]
Link: https://lore.kernel.org/r/d1310a75dc3d28f7e8da4e99c45fbd3e60fe238e.1585000084.git.sathyanarayanan.kuppuswamy@linux.intel.com


Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ac1c8e35

Documentation/PCI/pcieaer-howto.rst

+2 −2
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ messages to root port when an error is detected. 


::



  int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);`

  int pci_aer_clear_nonfatal_status(struct pci_dev *dev);`



pci_cleanup_aer_uncorrect_error_status cleanups the uncorrectable

pci_aer_clear_nonfatal_status clears non-fatal errors in the uncorrectable

error status register.



Frequent Asked Questions

drivers/net/ethernet/intel/ice/ice_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3495,10 +3495,10 @@ static pci_ers_result_t ice_pci_err_slot_reset(struct pci_dev *pdev) 
			result = PCI_ERS_RESULT_DISCONNECT;

	}



	err = pci_cleanup_aer_uncorrect_error_status(pdev);

	err = pci_aer_clear_nonfatal_status(pdev);

	if (err)

		dev_dbg(&pdev->dev,

			"pci_cleanup_aer_uncorrect_error_status failed, error %d\n",

			"pci_aer_clear_nonfatal_status() failed, error %d\n",

			err);

		/* non-fatal, continue */

drivers/ntb/hw/idt/ntb_hw_idt.c

+2 −2
Original line number Diff line number Diff line
@@ -2674,8 +2674,8 @@ static int idt_init_pci(struct idt_ntb_dev *ndev) 
	ret = pci_enable_pcie_error_reporting(pdev);

	if (ret != 0)

		dev_warn(&pdev->dev, "PCIe AER capability disabled\n");

	else /* Cleanup uncorrectable error status before getting to init */

		pci_cleanup_aer_uncorrect_error_status(pdev);

	else /* Cleanup nonfatal error status before getting to init */

		pci_aer_clear_nonfatal_status(pdev);



	/* First enable the PCI device */

	ret = pcim_enable_device(pdev);

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ void pci_restore_state(struct pci_dev *dev) 
	pci_restore_rebar_state(dev);

	pci_restore_dpc_state(dev);



	pci_cleanup_aer_error_status_regs(dev);

	pci_aer_clear_status(dev);

	pci_restore_aer_state(dev);



	pci_restore_config_space(dev);

drivers/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ 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);

void pci_aer_clear_device_status(struct pci_dev *dev);

int pci_aer_clear_status(struct pci_dev *dev);

int pci_aer_raw_clear_status(struct pci_dev *dev);

#else

static inline void pci_no_aer(void) { }
@@ -663,6 +664,7 @@ static inline void pci_aer_init(struct pci_dev *d) { } 
static inline void pci_aer_exit(struct pci_dev *d) { }

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

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

static inline int pci_aer_clear_status(struct pci_dev *dev) { return -EINVAL; }

static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVAL; }

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE