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

Commit d0c383e4 authored by Tomasz Nowicki's avatar Tomasz Nowicki Committed by Rafael J. Wysocki
Browse files

ACPICA/ARM: ACPI 5.1: Update for MADT changes. 



New subtables and changes to other subtables. Tomasz Nowicki.

Signed-off-by: default avatarTomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9eb1105b

include/acpi/actbl1.h

+41 −3
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ enum acpi_madt_type { 
	ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10,

	ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11,

	ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12,

	ACPI_MADT_TYPE_RESERVED = 13	/* 13 and greater are reserved */

	ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13,

	ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,

	ACPI_MADT_TYPE_RESERVED = 15	/* 15 and greater are reserved */

};



/*
@@ -797,15 +799,26 @@ struct acpi_madt_local_x2apic_nmi { 
struct acpi_madt_generic_interrupt {

	struct acpi_subtable_header header;

	u16 reserved;		/* reserved - must be zero */

	u32 gic_id;

	u32 cpu_interface_number;

	u32 uid;

	u32 flags;

	u32 parking_version;

	u32 performance_interrupt;

	u64 parked_address;

	u64 base_address;

	u64 gicv_base_address;

	u64 gich_base_address;

	u32 vgic_interrupt;

	u64 gicr_base_address;

	u64 arm_mpidr;

};



/* Masks for Flags field above */



/* ACPI_MADT_ENABLED                    (1)      Processor is usable if set */

#define ACPI_MADT_PERFORMANCE_IRQ_MODE  (1<<1)	/* 01: Performance Interrupt Mode */

#define ACPI_MADT_VGIC_IRQ_MODE         (1<<2)	/* 02: VGIC Maintenance Interrupt mode */



/* 12: Generic Distributor (ACPI 5.0) */



struct acpi_madt_generic_distributor {
@@ -817,11 +830,36 @@ struct acpi_madt_generic_distributor { 
	u32 reserved2;		/* reserved - must be zero */

};



/* 13: Generic MSI Frame (ACPI 5.1) */



struct acpi_madt_generic_msi_frame {

	struct acpi_subtable_header header;

	u16 reserved;		/* reserved - must be zero */

	u32 msi_frame_id;

	u64 base_address;

	u32 flags;

	u16 spi_count;

	u16 spi_base;

};



/* Masks for Flags field above */



#define ACPI_MADT_OVERRIDE_SPI_VALUES   (1)



/* 14: Generic Redistributor (ACPI 5.1) */



struct acpi_madt_generic_redistributor {

	struct acpi_subtable_header header;

	u16 reserved;		/* reserved - must be zero */

	u64 base_address;

	u32 length;

};



/*

 * Common flags fields for MADT subtables

 */



/* MADT Local APIC flags (lapic_flags) and GIC flags */

/* MADT Local APIC flags */



#define ACPI_MADT_ENABLED           (1)	/* 00: Processor is usable if set */