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: NHongbo Yao <yaohongbo@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

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) */