Commit affb72c3 authored by Huang Ying's avatar Huang Ying Committed by Len Brown
Browse files

ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup 



Now, a dedicated HEST tabling parsing code is used for PCIE AER
firmware_first setup. It is rebased on general HEST tabling parsing
code of APEI. The firmware_first setup code is moved from PCI core to
AER driver too, because it is only AER related.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Reviewed-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ea8c071c

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ obj-y += acpi.o \ 
# All the builtin files are in the "acpi." module_param namespace.

acpi-y				+= osl.o utils.o reboot.o

acpi-y				+= atomicio.o

acpi-y				+= hest.o



# sleep related files

acpi-y				+= wakeup.o

drivers/acpi/hest.c

deleted100644 → 0
+0 −139
Original line number Diff line number Diff line 
#include <linux/acpi.h>

#include <linux/pci.h>



#define PREFIX "ACPI: "



static inline unsigned long parse_acpi_hest_ia_machine_check(struct acpi_hest_ia_machine_check *p)

{

	return sizeof(*p) +

		(sizeof(struct acpi_hest_ia_error_bank) * p->num_hardware_banks);

}



static inline unsigned long parse_acpi_hest_ia_corrected(struct acpi_hest_ia_corrected *p)

{

	return sizeof(*p) +

		(sizeof(struct acpi_hest_ia_error_bank) * p->num_hardware_banks);

}



static inline unsigned long parse_acpi_hest_ia_nmi(struct acpi_hest_ia_nmi *p)

{

	return sizeof(*p);

}



static inline unsigned long parse_acpi_hest_generic(struct acpi_hest_generic *p)

{

	return sizeof(*p);

}



static inline unsigned int hest_match_pci(struct acpi_hest_aer_common *p, struct pci_dev *pci)

{

	return	(0           == pci_domain_nr(pci->bus) &&

		 p->bus      == pci->bus->number &&

		 p->device   == PCI_SLOT(pci->devfn) &&

		 p->function == PCI_FUNC(pci->devfn));

}



static unsigned long parse_acpi_hest_aer(void *hdr, int type, struct pci_dev *pci, int *firmware_first)

{

	struct acpi_hest_aer_common *p = hdr + sizeof(struct acpi_hest_header);

	unsigned long rc=0;

	u8 pcie_type = 0;

	u8 bridge = 0;

	switch (type) {

	case ACPI_HEST_TYPE_AER_ROOT_PORT:

		rc = sizeof(struct acpi_hest_aer_root);

		pcie_type = PCI_EXP_TYPE_ROOT_PORT;

		break;

	case ACPI_HEST_TYPE_AER_ENDPOINT:

		rc = sizeof(struct acpi_hest_aer);

		pcie_type = PCI_EXP_TYPE_ENDPOINT;

		break;

	case ACPI_HEST_TYPE_AER_BRIDGE:

		rc = sizeof(struct acpi_hest_aer_bridge);

		if ((pci->class >> 16) == PCI_BASE_CLASS_BRIDGE)

			bridge = 1;

		break;

	}



	if (p->flags & ACPI_HEST_GLOBAL) {

		if ((pci->is_pcie && (pci->pcie_type == pcie_type)) || bridge)

			*firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	}

	else

		if (hest_match_pci(p, pci))

			*firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	return rc;

}



static int acpi_hest_firmware_first(struct acpi_table_header *stdheader, struct pci_dev *pci)

{

	struct acpi_table_hest *hest = (struct acpi_table_hest *)stdheader;

	void *p = (void *)hest + sizeof(*hest); /* defined by the ACPI 4.0 spec */

	struct acpi_hest_header *hdr = p;



	int i;

	int firmware_first = 0;

	static unsigned char printed_unused = 0;

	static unsigned char printed_reserved = 0;



	for (i=0, hdr=p; p < (((void *)hest) + hest->header.length) && i < hest->error_source_count; i++) {

		switch (hdr->type) {

		case ACPI_HEST_TYPE_IA32_CHECK:

			p += parse_acpi_hest_ia_machine_check(p);

			break;

		case ACPI_HEST_TYPE_IA32_CORRECTED_CHECK:

			p += parse_acpi_hest_ia_corrected(p);

			break;

		case ACPI_HEST_TYPE_IA32_NMI:

			p += parse_acpi_hest_ia_nmi(p);

			break;

		/* These three should never appear */

		case ACPI_HEST_TYPE_NOT_USED3:

		case ACPI_HEST_TYPE_NOT_USED4:

		case ACPI_HEST_TYPE_NOT_USED5:

			if (!printed_unused) {

				printk(KERN_DEBUG PREFIX

				       "HEST Error Source list contains an obsolete type (%d).\n", hdr->type);

				printed_unused = 1;

			}

			break;

		case ACPI_HEST_TYPE_AER_ROOT_PORT:

		case ACPI_HEST_TYPE_AER_ENDPOINT:

		case ACPI_HEST_TYPE_AER_BRIDGE:

			p += parse_acpi_hest_aer(p, hdr->type, pci, &firmware_first);

			break;

		case ACPI_HEST_TYPE_GENERIC_ERROR:

			p += parse_acpi_hest_generic(p);

			break;

		/* These should never appear either */

		case ACPI_HEST_TYPE_RESERVED:

		default:

			if (!printed_reserved) {

				printk(KERN_DEBUG PREFIX

				       "HEST Error Source list contains a reserved type (%d).\n", hdr->type);

				printed_reserved = 1;

			}

			break;

		}

	}

	return firmware_first;

}



int acpi_hest_firmware_first_pci(struct pci_dev *pci)

{

	acpi_status status = AE_NOT_FOUND;

	struct acpi_table_header *hest = NULL;



	if (acpi_disabled)

		return 0;



	status = acpi_get_table(ACPI_SIG_HEST, 1, &hest);



	if (ACPI_SUCCESS(status)) {

		if (acpi_hest_firmware_first(hest, pci)) {

			return 1;

		}

	}

	return 0;

}

EXPORT_SYMBOL_GPL(acpi_hest_firmware_first_pci);

drivers/pci/pcie/aer/aerdrv.h

+17 −0
Original line number Diff line number Diff line
@@ -134,4 +134,21 @@ static inline int aer_osc_setup(struct pcie_device *pciedev) 
}

#endif



#ifdef CONFIG_ACPI_APEI

extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);

#else

static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)

{

	if (pci_dev->__aer_firmware_first_valid)

		return pci_dev->__aer_firmware_first;

	return 0;

}

#endif



static inline void pcie_aer_force_firmware_first(struct pci_dev *pci_dev,

						 int enable)

{

	pci_dev->__aer_firmware_first = !!enable;

	pci_dev->__aer_firmware_first_valid = 1;

}

#endif /* _AERDRV_H_ */

drivers/pci/pcie/aer/aerdrv_acpi.c

+77 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/acpi.h>

#include <linux/pci-acpi.h>

#include <linux/delay.h>

#include <acpi/apei.h>

#include "aerdrv.h"



/**
@@ -53,3 +54,79 @@ int aer_osc_setup(struct pcie_device *pciedev) 


	return 0;

}



#ifdef CONFIG_ACPI_APEI

static inline int hest_match_pci(struct acpi_hest_aer_common *p,

				 struct pci_dev *pci)

{

	return	(0           == pci_domain_nr(pci->bus) &&

		 p->bus      == pci->bus->number &&

		 p->device   == PCI_SLOT(pci->devfn) &&

		 p->function == PCI_FUNC(pci->devfn));

}



struct aer_hest_parse_info {

	struct pci_dev *pci_dev;

	int firmware_first;

};



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 ((info->pci_dev->is_pcie &&

		     info->pci_dev->pcie_type == pcie_type) || bridge)

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

	} else

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

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

	info->firmware_first = ff;



	return 0;

}



static void aer_set_firmware_first(struct pci_dev *pci_dev)

{

	int rc;

	struct aer_hest_parse_info info = {

		.pci_dev	= pci_dev,

		.firmware_first	= 0,

	};



	rc = apei_hest_parse(aer_hest_parse, &info);



	if (rc)

		pci_dev->__aer_firmware_first = 0;

	else

		pci_dev->__aer_firmware_first = info.firmware_first;

	pci_dev->__aer_firmware_first_valid = 1;

}



int pcie_aer_get_firmware_first(struct pci_dev *dev)

{

	if (!dev->__aer_firmware_first_valid)

		aer_set_firmware_first(dev);

	return dev->__aer_firmware_first;

}

#endif

drivers/pci/pcie/aer/aerdrv_core.c

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev) 
	u16 reg16 = 0;

	int pos;



	if (dev->aer_firmware_first)

	if (pcie_aer_get_firmware_first(dev))

		return -EIO;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
@@ -64,7 +64,7 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev) 
	u16 reg16 = 0;

	int pos;



	if (dev->aer_firmware_first)

	if (pcie_aer_get_firmware_first(dev))

		return -EIO;



	pos = pci_pcie_cap(dev);
@@ -859,7 +859,7 @@ void aer_delete_rootport(struct aer_rpc *rpc) 
 */

int aer_init(struct pcie_device *dev)

{

	if (dev->port->aer_firmware_first) {

	if (pcie_aer_get_firmware_first(dev->port)) {

		dev_printk(KERN_DEBUG, &dev->device,

			   "PCIe errors handled by platform firmware.\n");

		goto out;
@@ -873,7 +873,7 @@ out: 
	if (forceload) {

		dev_printk(KERN_DEBUG, &dev->device,

			   "aerdrv forceload requested.\n");

		dev->port->aer_firmware_first = 0;

		pcie_aer_force_firmware_first(dev->port, 0);

		return 0;

	}

	return -ENXIO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE