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

Commit a6bd73cd authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/AER: Factor out HEST device type matching 



This factors out the matching of HEST structure type and PCIe device type
to improve readability.  No functional change.

Tested-by: default avatarBetty Dall <betty.dall@hp.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 8b8d2b65

drivers/pci/pcie/aer/aerdrv_acpi.c

+17 −18
Original line number Diff line number Diff line
@@ -29,6 +29,22 @@ static inline int hest_match_pci(struct acpi_hest_aer_common *p, 
		 p->function == PCI_FUNC(pci->devfn));

}



static inline bool hest_match_type(struct acpi_hest_header *hest_hdr,

				struct pci_dev *dev)

{

	u16 hest_type = hest_hdr->type;

	u8 pcie_type = pci_pcie_type(dev);



	if ((hest_type == ACPI_HEST_TYPE_AER_ROOT_PORT &&

		pcie_type == PCI_EXP_TYPE_ROOT_PORT) ||

	    (hest_type == ACPI_HEST_TYPE_AER_ENDPOINT &&

		pcie_type == PCI_EXP_TYPE_ENDPOINT) ||

	    (hest_type == ACPI_HEST_TYPE_AER_BRIDGE &&

		(dev->class >> 16) == PCI_BASE_CLASS_BRIDGE))

		return true;

	return false;

}



struct aer_hest_parse_info {

	struct pci_dev *pci_dev;

	int firmware_first;
@@ -38,28 +54,11 @@ 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;

	u8 pcie_type = 0;

	u8 bridge = 0;

	int ff = 0;



	switch (hest_hdr->type) {

	case ACPI_HEST_TYPE_AER_ROOT_PORT:

		pcie_type = PCI_EXP_TYPE_ROOT_PORT;

		break;

	case ACPI_HEST_TYPE_AER_ENDPOINT:

		pcie_type = PCI_EXP_TYPE_ENDPOINT;

		break;

	case ACPI_HEST_TYPE_AER_BRIDGE:

		if ((info->pci_dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)

			bridge = 1;

		break;

	default:

		return 0;

	}



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

	if (p->flags & ACPI_HEST_GLOBAL) {

		if ((pci_pcie_type(info->pci_dev) == pcie_type) || bridge)

		if (hest_match_type(hest_hdr, info->pci_dev))

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

	} else

		if (hest_match_pci(p, info->pci_dev))