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

Commit 270c66be authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes
Browse files

PCI: fix AER capability check 



The 'use pci_find_ext_capability everywhere' cleanup brought a new bug,
which makes the AER stop working.  Fix it by actually using find_ext_cap
instead of just find_cap.  Drop the unused config space size define while
we're at it.

Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0927678f

Documentation/PCI/pcieaer-howto.txt

+3 −8
Original line number Diff line number Diff line
@@ -203,22 +203,17 @@ to mmio_enabled. 


3.3 helper functions



3.3.1 int pci_find_aer_capability(struct pci_dev *dev);

pci_find_aer_capability locates the PCI Express AER capability

in the device configuration space. If the device doesn't support

PCI-Express AER, the function returns 0.



3.3.2 int pci_enable_pcie_error_reporting(struct pci_dev *dev);

3.3.1 int pci_enable_pcie_error_reporting(struct pci_dev *dev);

pci_enable_pcie_error_reporting enables the device to send error

messages to root port when an error is detected. Note that devices

don't enable the error reporting by default, so device drivers need

call this function to enable it.



3.3.3 int pci_disable_pcie_error_reporting(struct pci_dev *dev);

3.3.2 int pci_disable_pcie_error_reporting(struct pci_dev *dev);

pci_disable_pcie_error_reporting disables the device to send error

messages to root port when an error is detected.



3.3.4 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

3.3.3 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

pci_cleanup_aer_uncorrect_error_status cleanups the uncorrectable

error status register.

drivers/pci/pcie/aer/aerdrv_core.c

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev) 
	u16 reg16 = 0;

	int pos;



	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	if (!pos)

		return -EIO;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	if (!pos)

		return -EIO;

drivers/pci/pcie/portdrv.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#define PCIE_CAPABILITIES_REG		0x2

#define PCIE_SLOT_CAPABILITIES_REG	0x14

#define PCIE_PORT_DEVICE_MAXSERVICES	4

#define PCI_CFG_SPACE_SIZE		256



#define get_descriptor_id(type, service) (((type - 4) << 4) | service)

include/linux/aer.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#if defined(CONFIG_PCIEAER)

/* pci-e port driver needs this function to enable aer */

extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);

extern int pci_find_aer_capability(struct pci_dev *dev);

extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);

extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

#else