From ab923361ee9569ef325f45e9d6989d111bac763c Mon Sep 17 00:00:00 2001 From: Hongbo Yao Date: Mon, 19 Aug 2019 17:29:10 +0800 Subject: [PATCH] Revert "ACPICA: ACPI 6.3: Add MADT/GICC/SPE extensions." hulk inclusion category: feature bugzilla: 16072 CVE: NA --------------------------- This reverts commit 18f4cb589de0851b04a7632ee72bdbb8f1a7463e. In Linux 5.3.0, SPE ACPI enablement has been upstreamed. SPE patches in hulk-4.19-next are the old version, and they need to be reverted to the mainline version. Signed-off-by: Hongbo Yao Reviewed-by: Hanjun Guo Signed-off-by: Yang Yingliang --- include/acpi/actbl2.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index e053b7f57568..c50ef7e6b942 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -623,7 +623,7 @@ struct acpi_madt_local_x2apic_nmi { u8 reserved[3]; /* reserved - must be zero */ }; -/* 11: Generic Interrupt (ACPI 5.0 + 6.0 + 6.3 changes) */ +/* 11: Generic Interrupt (ACPI 5.0 + ACPI 6.0 changes) */ struct acpi_madt_generic_interrupt { struct acpi_subtable_header header; @@ -641,8 +641,7 @@ struct acpi_madt_generic_interrupt { u64 gicr_base_address; u64 arm_mpidr; u8 efficiency_class; - u8 reserved2; - u16 spe_overflow_interrupt; /* added in ACPI 6.3 */ + u8 reserved2[3]; }; /* Masks for Flags field above */ @@ -650,7 +649,6 @@ struct acpi_madt_generic_interrupt { /* 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 */ -#define ACPI_MADT_SPE_EDGE_TRIGGERED (1) /* 00: SPE edge triggered */ /* 12: Generic Distributor (ACPI 5.0 + ACPI 6.0 changes) */ -- GitLab