Commit 600a5b4f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/ERR: Rename pci_aer_clear_device_status() to pcie_clear_device_status() 

pci_aer_clear_device_status() clears the error bits in the PCIe Device
Status Register (PCI_EXP_DEVSTA).  Every PCIe device has this register,
regardless of whether it supports AER.

Rename pci_aer_clear_device_status() to pcie_clear_device_status() to make
clear that it is PCIe-specific but not AER-specific.  Move it to
drivers/pci/pci.c, again since it's not AER-specific.  No functional change
intended.

Link: https://lore.kernel.org/r/20200717195619.766662-1-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e83e2ca3

drivers/pci/pci.c

+8 −0
Original line number Diff line number Diff line
@@ -2046,6 +2046,14 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state) 
}

EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);



void pcie_clear_device_status(struct pci_dev *dev)

{

	u16 sta;



	pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &sta);

	pcie_capability_write_word(dev, PCI_EXP_DEVSTA, sta);

}



/**

 * pcie_clear_root_pme_status - Clear root port PME interrupt status.

 * @dev: PCIe root port or event collector.

drivers/pci/pci.h

+1 −2
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ void pci_refresh_power_state(struct pci_dev *dev); 
int pci_power_up(struct pci_dev *dev);

void pci_disable_enabled_device(struct pci_dev *dev);

int pci_finish_runtime_suspend(struct pci_dev *dev);

void pcie_clear_device_status(struct pci_dev *dev);

void pcie_clear_root_pme_status(struct pci_dev *dev);

bool pci_check_pme_status(struct pci_dev *dev);

void pci_pme_wakeup_bus(struct pci_bus *bus);
@@ -658,7 +659,6 @@ 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);

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
@@ -666,7 +666,6 @@ static inline void pci_no_aer(void) { } 
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

drivers/pci/pcie/aer.c

+1 −9
Original line number Diff line number Diff line
@@ -241,14 +241,6 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev) 
}

EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);



void pci_aer_clear_device_status(struct pci_dev *dev)

{

	u16 sta;



	pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &sta);

	pcie_capability_write_word(dev, PCI_EXP_DEVSTA, sta);

}



int pci_aer_clear_nonfatal_status(struct pci_dev *dev)

{

	int aer = dev->aer_cap;
@@ -947,7 +939,7 @@ static void handle_error_source(struct pci_dev *dev, struct aer_err_info *info) 
		if (aer)

			pci_write_config_dword(dev, aer + PCI_ERR_COR_STATUS,

					info->status);

		pci_aer_clear_device_status(dev);

		pcie_clear_device_status(dev);

	} else if (info->severity == AER_NONFATAL)

		pcie_do_recovery(dev, pci_channel_io_normal, aer_root_reset);

	else if (info->severity == AER_FATAL)

drivers/pci/pcie/err.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, 
	pci_dbg(dev, "broadcast resume message\n");

	pci_walk_bus(bus, report_resume, &status);



	pci_aer_clear_device_status(dev);

	pcie_clear_device_status(dev);

	pci_aer_clear_nonfatal_status(dev);

	pci_info(dev, "device recovery successful\n");

	return status;