@@ -1566,14 +1566,14 @@ static void acpidump_gtdt(fwts_framework *fw, const fwts_acpi_table_info *table)
static const fwts_acpidump_field gtdt_fields[] = {
FIELD_UINT("Count Ctrl Physical Addr", fwts_acpi_table_gtdt, cnt_control_base_phys_addr),
FIELD_UINT("Reserved", fwts_acpi_table_gtdt, reserved),
- FIELD_UINT("Secure PL1 Timer GSIV", fwts_acpi_table_gtdt, secure_PL1_timer_GSIV),
- FIELD_UINT("Secure PL1 Timer Flags", fwts_acpi_table_gtdt, secure_PL1_timer_flags),
- FIELD_UINT("Non-Secure PL1 Timer GSIV", fwts_acpi_table_gtdt, non_secure_PL1_timer_GSIV),
- FIELD_UINT("Non-Secure PL1 Timer Flags",fwts_acpi_table_gtdt, non_secure_PL1_timer_flags),
+ FIELD_UINT("Secure EL1 Timer GSIV", fwts_acpi_table_gtdt, secure_EL1_timer_GSIV),
+ FIELD_UINT("Secure EL1 Timer Flags", fwts_acpi_table_gtdt, secure_EL1_timer_flags),
+ FIELD_UINT("Non-Secure EL1 Timer GSIV", fwts_acpi_table_gtdt, non_secure_EL1_timer_GSIV),
+ FIELD_UINT("Non-Secure EL1 Timer Flags",fwts_acpi_table_gtdt, non_secure_EL1_timer_flags),
FIELD_UINT("Virtual Timer GSIV", fwts_acpi_table_gtdt, virtual_timer_GSIV),
FIELD_UINT("Virtual Timer flags", fwts_acpi_table_gtdt, virtual_timer_flags),
- FIELD_UINT("Non-Secure PL2 Timer GSIV", fwts_acpi_table_gtdt, non_secure_PL2_timer_GSIV),
- FIELD_UINT("Non-Secure PL2 Timer Flags",fwts_acpi_table_gtdt, non_secure_PL2_timer_flags),
+ FIELD_UINT("Non-Secure EL2 Timer GSIV", fwts_acpi_table_gtdt, non_secure_EL2_timer_GSIV),
+ FIELD_UINT("Non-Secure EL2 Timer Flags",fwts_acpi_table_gtdt, non_secure_EL2_timer_flags),
FIELD_UINT("Count Read Physical Addr", fwts_acpi_table_gtdt, cnt_read_base_phys_addr),
FIELD_UINT("Platform Timer Count", fwts_acpi_table_gtdt, platform_timer_count),
FIELD_UINT("Platform Timer Offset", fwts_acpi_table_gtdt, platform_timer_offset),
@@ -684,14 +684,14 @@ typedef struct {
typedef struct {
uint64_t cnt_control_base_phys_addr;
uint32_t reserved;
- uint32_t secure_PL1_timer_GSIV;
- uint32_t secure_PL1_timer_flags;
- uint32_t non_secure_PL1_timer_GSIV;
- uint32_t non_secure_PL1_timer_flags;
+ uint32_t secure_EL1_timer_GSIV;
+ uint32_t secure_EL1_timer_flags;
+ uint32_t non_secure_EL1_timer_GSIV;
+ uint32_t non_secure_EL1_timer_flags;
uint32_t virtual_timer_GSIV;
uint32_t virtual_timer_flags;
- uint32_t non_secure_PL2_timer_GSIV;
- uint32_t non_secure_PL2_timer_flags;
+ uint32_t non_secure_EL2_timer_GSIV;
+ uint32_t non_secure_EL2_timer_flags;
uint64_t cnt_read_base_phys_addr;
uint32_t platform_timer_count;
uint32_t platform_timer_offset;