aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Morse <james.morse@arm.com>2017-06-05 18:31:23 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2017-06-06 13:10:04 +0100
commit7f4b18750f00722f1d795033bb00dcc6d754e615 (patch)
tree30b79c570713b1b3cbdf4c3bd14c34260f86c78d
parent03aa6d0266876884a6ba2b6346f68bc11bd015f3 (diff)
Platforms/FVP: Correct PMU IRQ and GTDT timer offsetmangle-HEST
Linux v4.12 has started using the PMU IRQ and GTDT timer offset, discovering that this old version of edk2 is missing these values. Use the PMU IRQ values from the upstream kernel DT, and fix the GTDT: Platform timer offset to point at the time records. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: James Morse <james.morse@arm.com> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
-rw-r--r--Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/apic.asl8
-rw-r--r--Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/gtdt.asl2
2 files changed, 5 insertions, 5 deletions
diff --git a/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/apic.asl b/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/apic.asl
index 7d91562..ac1bfa8 100644
--- a/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/apic.asl
+++ b/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/apic.asl
@@ -58,7 +58,7 @@
Performance Interrupt Trigger Mode : 0
Virtual GIC Interrupt Trigger Mode : 0
[0004] Parking Protocol Version : 00000000
-[0004] Performance Interrupt : 00000000
+[0004] Performance Interrupt : 00000060
[0008] Parked Address : 0000000000000000
[0008] Base Address : 000000002C000000 /* armv8 FVP Base GIC address */
[0008] Virtual GIC Base Address : 000000002C02F000
@@ -79,7 +79,7 @@
Performance Interrupt Trigger Mode : 0
Virtual GIC Interrupt Trigger Mode : 0
[0004] Parking Protocol Version : 00000000
-[0004] Performance Interrupt : 00000000
+[0004] Performance Interrupt : 00000061
[0008] Parked Address : 0000000000000000
[0008] Base Address : 000000002C000000
[0008] Virtual GIC Base Address : 000000002C02F000
@@ -100,7 +100,7 @@
Performance Interrupt Trigger Mode : 0
Virtual GIC Interrupt Trigger Mode : 0
[0004] Parking Protocol Version : 00000000
-[0004] Performance Interrupt : 00000000
+[0004] Performance Interrupt : 00000062
[0008] Parked Address : 0000000000000000
[0008] Base Address : 000000002C000000
[0008] Virtual GIC Base Address : 000000002C02F000
@@ -121,7 +121,7 @@
Performance Interrupt Trigger Mode : 0
Virtual GIC Interrupt Trigger Mode : 0
[0004] Parking Protocol Version : 00000000
-[0004] Performance Interrupt : 00000000
+[0004] Performance Interrupt : 00000063
[0008] Parked Address : 0000000000000000
[0008] Base Address : 000000002C000000
[0008] Virtual GIC Base Address : 000000002C02F000
diff --git a/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/gtdt.asl b/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/gtdt.asl
index d304243..0cb24c5 100644
--- a/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/gtdt.asl
+++ b/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/gtdt.asl
@@ -86,7 +86,7 @@
[0008] CntReadBase Physical address : 0000000000000000
[0004] Platform Timer Count : 00000001
-[0004] Platform Timer Offset : 0000005C
+[0004] Platform Timer Offset : 00000060
/* Memory-mapped GT (Generic Timer) structures */
[0001] Subtable Type : 00