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

Commit b07461a8 authored by Taku Izumi's avatar Taku Izumi Committed by Bjorn Helgaas
Browse files

PCI/AER: Clear error status registers during enumeration and restore 



AER errors might be recorded when powering-on devices.  These errors can be
ignored, so firmware usually clears them before the OS enumerates devices.
However, firmware is not involved when devices are added via hotplug, so
the OS may discover power-up errors that should be ignored.  The same may
happen when powering up devices when resuming after suspend.

Clear the AER error status registers during enumeration and resume.

[bhelgaas: changelog, remove repetitive comments]
Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 6ff33f39

drivers/pci/pci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/pci_hotplug.h>

#include <linux/pci_hotplug.h>

#include <asm-generic/pci-bridge.h>

#include <asm-generic/pci-bridge.h>

#include <asm/setup.h>

#include <asm/setup.h>

#include <linux/aer.h>

#include "pci.h"

#include "pci.h"





const char *pci_power_names[] = {

const char *pci_power_names[] = {
@@ -1099,6 +1100,8 @@ void pci_restore_state(struct pci_dev *dev) 
	pci_restore_ats_state(dev);

	pci_restore_ats_state(dev);

	pci_restore_vc_state(dev);

	pci_restore_vc_state(dev);





	pci_cleanup_aer_error_status_regs(dev);



	pci_restore_config_space(dev);

	pci_restore_config_space(dev);





	pci_restore_pcix_state(dev);

	pci_restore_pcix_state(dev);

drivers/pci/pcie/aer/aerdrv_core.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,34 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 
}

}

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);





int pci_cleanup_aer_error_status_regs(struct pci_dev *dev)

{

	int pos;

	u32 status;

	int port_type;



	if (!pci_is_pcie(dev))

		return -ENODEV;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	if (!pos)

		return -EIO;



	port_type = pci_pcie_type(dev);

	if (port_type == PCI_EXP_TYPE_ROOT_PORT) {

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

		pci_write_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, status);

	}



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

	pci_write_config_dword(dev, pos + PCI_ERR_COR_STATUS, status);



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

	pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);



	return 0;

}



/**

/**

 * add_error_device - list device to be handled

 * add_error_device - list device to be handled

 * @e_info: pointer to error info

 * @e_info: pointer to error info

drivers/pci/probe.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/cpumask.h>

#include <linux/cpumask.h>

#include <linux/pci-aspm.h>

#include <linux/pci-aspm.h>

#include <linux/aer.h>

#include <asm-generic/pci-bridge.h>

#include <asm-generic/pci-bridge.h>

#include "pci.h"

#include "pci.h"
@@ -1621,6 +1622,8 @@ static void pci_init_capabilities(struct pci_dev *dev) 




	/* Enable ACS P2P upstream forwarding */

	/* Enable ACS P2P upstream forwarding */

	pci_enable_acs(dev);

	pci_enable_acs(dev);



	pci_cleanup_aer_error_status_regs(dev);

}

}





static void pci_set_msi_domain(struct pci_dev *dev)

static void pci_set_msi_domain(struct pci_dev *dev)

include/linux/aer.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ struct aer_capability_regs { 
int pci_enable_pcie_error_reporting(struct pci_dev *dev);

int pci_enable_pcie_error_reporting(struct pci_dev *dev);

int pci_disable_pcie_error_reporting(struct pci_dev *dev);

int pci_disable_pcie_error_reporting(struct pci_dev *dev);

int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

int pci_cleanup_aer_error_status_regs(struct pci_dev *dev);

#else

#else

static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)

static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)

{

{
@@ -55,6 +56,10 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 
{

{

	return -EINVAL;

	return -EINVAL;

}

}

static inline int pci_cleanup_aer_error_status_regs(struct pci_dev *dev)

{

	return -EINVAL;

}

#endif

#endif





void cper_print_aer(struct pci_dev *dev, int cper_severity,

void cper_print_aer(struct pci_dev *dev, int cper_severity,