PCI/AER: Remove duplicate AER severity translation (95c35491) · Commits · 戴 / test

Currently the AER severity is being translated twice in the code flow for PCIe errors. It is first translated in ghes_do_proc() before calling into the AER driver. Then it is translated again when the AER driver calls cper_print_aer(). This causes the severity that is used in cper_print_aer() to be incorrect. Remove the second translation that is in cper_print_aer() since this function is already receiving the correct AER severity. Signed-off-by:

Tyler Baicar <tbaicar@codeaurora.org> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com> Reviewed-by:

Borislav Petkov <bp@suse.de>

drivers/pci/pcie/aer/aerdrv_errprint.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -219,15 +219,13 @@ int cper_severity_to_aer(int cper_severity)
		}
		EXPORT_SYMBOL_GPL(cper_severity_to_aer);

		void cper_print_aer(struct pci_dev *dev, int cper_severity,
		void cper_print_aer(struct pci_dev *dev, int aer_severity,
		struct aer_capability_regs *aer)
		{
		int aer_severity, layer, agent, status_strs_size, tlp_header_valid = 0;
		int layer, agent, status_strs_size, tlp_header_valid = 0;
		u32 status, mask;
		const char **status_strs;

		aer_severity = cper_severity_to_aer(cper_severity);

		if (aer_severity == AER_CORRECTABLE) {
		status = aer->cor_status;
		mask = aer->cor_mask;

include/linux/aer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ static inline int pci_cleanup_aer_error_status_regs(struct pci_dev *dev)
		}
		#endif

		void cper_print_aer(struct pci_dev *dev, int cper_severity,
		void cper_print_aer(struct pci_dev *dev, int aer_severity,
		struct aer_capability_regs *aer);
		int cper_severity_to_aer(int cper_severity);
		void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,

Admin message