ACK: [PATCH] ACPI: change GTDT field names in ACPI 5.1 (LP: #1350170)

[Colin Ian King]

On 30/07/14 04:33, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung at canonical.com>
> ---
>  src/acpi/acpidump/acpidump.c | 12 ++++++------
>  src/lib/include/fwts_acpi.h  | 12 ++++++------
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
> index 02a0d23..dee4015 100644
> --- a/src/acpi/acpidump/acpidump.c
> +++ b/src/acpi/acpidump/acpidump.c
> @@ -1564,14 +1564,14 @@ static void acpidump_gtdt(fwts_framework *fw, const fwts_acpi_table_info *table)
>  	static const fwts_acpidump_field gtdt_fields[] = {
>  		FIELD_UINT("Physical Address", 		fwts_acpi_table_gtdt, phys_addr),
>  		FIELD_UINT("Global Flags", 		fwts_acpi_table_gtdt, global_flags),
> -		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_END
>  	};
>  
> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
> index de7a889..613755d 100644
> --- a/src/lib/include/fwts_acpi.h
> +++ b/src/lib/include/fwts_acpi.h
> @@ -684,14 +684,14 @@ typedef struct {
>  typedef struct {
>  	uint64_t	phys_addr;
>  	uint32_t	global_flags;
> -	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;
>  } __attribute__ ((packed)) fwts_acpi_table_gtdt;
>  
>  /* 5.2.20 ACPI RAS FeatureTable (RASF) */
> 
Thanks for the update.  I think we also need an update on the acpidump
test too.

Acked-by: Colin Ian King <colin.king at canonical.com>