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

Commit 8e7f8d0b authored by Betty Dall's avatar Betty Dall Committed by Bjorn Helgaas
Browse files

PCI/AER: Ignore non-PCIe AER error sources in aer_hest_parse() 



aer_set_firmware_first() searches the HEST for an error source descriptor
matching the specified PCI device.  It uses the apei_hest_parse() iterator
to call aer_hest_parse() for every descriptor in the HEST.

Previously, aer_hest_parse() incorrectly assumed every descriptor was for a
PCIe error source.  This patch adds a check to avoid that error.

[bhelgaas: factor check into helper, use in aer_hest_parse_aff(), changelog]
Signed-off-by: default avatarBetty Dall <betty.dall@hp.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 1c38108a

drivers/pci/pcie/aer/aerdrv_acpi.c

+17 −8
Original line number Diff line number Diff line
@@ -50,12 +50,24 @@ struct aer_hest_parse_info { 
	int firmware_first;

};



static int hest_source_is_pcie_aer(struct acpi_hest_header *hest_hdr)

{

	if (hest_hdr->type == ACPI_HEST_TYPE_AER_ROOT_PORT ||

	    hest_hdr->type == ACPI_HEST_TYPE_AER_ENDPOINT ||

	    hest_hdr->type == ACPI_HEST_TYPE_AER_BRIDGE)

		return 1;

	return 0;

}



static int aer_hest_parse(struct acpi_hest_header *hest_hdr, void *data)

{

	struct aer_hest_parse_info *info = data;

	struct acpi_hest_aer_common *p;

	int ff;



	if (!hest_source_is_pcie_aer(hest_hdr))

		return 0;



	p = (struct acpi_hest_aer_common *)(hest_hdr + 1);

	ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	if (p->flags & ACPI_HEST_GLOBAL) {
@@ -104,16 +116,13 @@ static int aer_hest_parse_aff(struct acpi_hest_header *hest_hdr, void *data) 
	if (aer_firmware_first)

		return 0;



	switch (hest_hdr->type) {

	case ACPI_HEST_TYPE_AER_ROOT_PORT:

	case ACPI_HEST_TYPE_AER_ENDPOINT:

	case ACPI_HEST_TYPE_AER_BRIDGE:

	if (!hest_source_is_pcie_aer(hest_hdr))

		return 0;



	p = (struct acpi_hest_aer_common *)(hest_hdr + 1);

	aer_firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	default:

	return 0;

}

}



/**

 * aer_acpi_firmware_first - Check if APEI should control AER.