Commit 6b9bd1e3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aer' into next 

* pci/aer:
  PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0
  ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
parents 96702be5 339c0fc5

drivers/pci/pcie/aer/aerdrv_acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
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 &&

	return   ACPI_HEST_SEGMENT(p->bus) == pci_domain_nr(pci->bus) &&

		 ACPI_HEST_BUS(p->bus)     == pci->bus->number &&

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

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

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

}



static inline bool hest_match_type(struct acpi_hest_header *hest_hdr,

include/acpi/actbl1.h

+9 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ struct acpi_hest_aer_common { 
	u8 enabled;

	u32 records_to_preallocate;

	u32 max_sections_per_record;

	u32 bus;

	u32 bus;		/* Bus and Segment numbers */

	u16 device;

	u16 function;

	u16 device_control;
@@ -473,6 +473,14 @@ struct acpi_hest_aer_common { 
#define ACPI_HEST_FIRMWARE_FIRST        (1)

#define ACPI_HEST_GLOBAL                (1<<1)



/*

 * Macros to access the bus/segment numbers in Bus field above:

 *  Bus number is encoded in bits 7:0

 *  Segment number is encoded in bits 23:8

 */

#define ACPI_HEST_BUS(bus)              ((bus) & 0xFF)

#define ACPI_HEST_SEGMENT(bus)          (((bus) >> 8) & 0xFFFF)



/* Hardware Error Notification */



struct acpi_hest_notify {