[PATCH] acpi: acpitables: add GTDT checking (LP: #1433641)

Colin Ian King colin.king at canonical.com
Thu Mar 26 13:00:51 UTC 2015


On 26/03/15 09:06, ivanhu wrote:
> 
> 
> On 2015年03月26日 08:14, Colin King wrote:
>> From: Colin Ian King <colin.king at canonical.com>
>>
>> Add some simple verification of GTDT.
>>
>> Signed-off-by: Colin Ian King <colin.king at canonical.com>
>> ---
>>   src/acpi/acpitables/acpitables.c | 128
>> ++++++++++++++++++++++++++++++++++++++-
>>   src/lib/include/fwts_acpi.h      |  36 +++++++++++
>>   2 files changed, 162 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/acpi/acpitables/acpitables.c
>> b/src/acpi/acpitables/acpitables.c
>> index ab75aca..c477c73 100644
>> --- a/src/acpi/acpitables/acpitables.c
>> +++ b/src/acpi/acpitables/acpitables.c
>> @@ -526,9 +526,132 @@ static void acpi_table_check_mcfg(fwts_framework
>> *fw, fwts_acpi_table_info *tabl
>>   {
>>       FWTS_UNUSED(fw);
>>       FWTS_UNUSED(table);
>> +}
>>   -    /* FIXME */
>> -    /*fwts_acpi_table_mcfg *mcfg = (fwts_acpi_table_mcfg*)table->data;*/
>> +static void acpi_table_check_gtdt(fwts_framework *fw,
>> fwts_acpi_table_info *table)
>> +{
>> +    uint8_t *ptr, *end_ptr;
>> +    uint32_t i = 0, n;
>> +    fwts_acpi_table_gtdt *gtdt = (fwts_acpi_table_gtdt*)table->data;
>> +
>> +    if (gtdt->virtual_timer_flags & ~3)
>> +        fwts_failed(fw, LOG_LEVEL_LOW, "GTDTFlagReservedNonZero",
>> +            "GTDT flag reserved bits 2 to 31 are non-zero, "
>> +            "instead got 0x%" PRIx32 ".", gtdt->virtual_timer_flags);
>> +
>> +    ptr = (uint8_t *)table->data + gtdt->platform_timer_offset;
>> +    n = gtdt->platform_timer_count;
>> +    end_ptr = (uint8_t *)table->data + table->length;
>> +
>> +    while ((i < n) && (ptr < end_ptr)) {
>> +        uint32_t len, j;
>> +        fwts_acpi_table_gtdt_block *block;
>> +        fwts_acpi_table_gtdt_block_timer *block_timer;
>> +        fwts_acpi_table_gtdt_watchdog *watchdog;
>> +
>> +        switch (*ptr) {
>> +        case 0x00:
>> +            /* GT Block Structure */
>> +            block = (fwts_acpi_table_gtdt_block *)ptr;
>> +            if (ptr + 20 < end_ptr) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH, "GTDTShortBlock",
>> +                    "GTDT block is too short");
>> +                return;
>> +            }
>> +            if (block->length < 20) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidBlockLength",
>> +                    "GTDT block length has in invalid length: %"
>> PRIu32 " bytes",
>> +                    block->length);
>> +                return;
>> +            }
>> +            if (block->reserved)
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidBlockReserved",
>> +                    "GTDT block reserved is non-zero, got 0x%" PRIx8,
>> +                    block->reserved);
>> +            if (block->block_timer_count > 8) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidBlockTimerCount",
>> +                    "GTDT block timer count is too large, %"
>> +                    PRIu32 ". must be <= 8",
>> +                    block->block_timer_count);
>> +                break;
>> +            }
>> +            len = (block->block_timer_count * 40) + 20;
>> +            if (len != block->length) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidTimerCountOrLength",
>> +                    "GTDT block timer count  %" PRIu32 " and block
>> length %" PRIu32 ", "
>> +                    "expected length of %" PRIu32,
>> +                    block->block_timer_count,
>> +                    block->length, len);
>> +                /* length may be inconsistent, don't trust it so stop
>> here */
>> +                return;
>> +            }
>> +            block_timer = &block->block_timers[0];
>> +
>> +            for (j = 0; j < block->block_timer_count; j++) {
>> +                if (((uint8_t *)block_timer + sizeof(*block_timer)) >
>> end_ptr)
>> +                    break;
>> +                if (block_timer->frame_number > 7) {
>> +                    fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidGTFrameNumber",
>> +                        "GTDT block frame number is %" PRIu8 ",
>> expecting 0..7",
>> +                        block_timer->frame_number);
>> +                }
>> +                if (block_timer->reserved[0] |
>> +                    block_timer->reserved[1] |
>> +                    block_timer->reserved[2])
>> +                    fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTBlockTimerReservedNotZero",
>> +                        "GTDT block timer reserved space is not zero,
>> got 0x"
>> +                        "%" PRIx8 "%" PRIx8 "%" PRIx8
>> +                        " instead",
>> +                        block_timer->reserved[0],
>> +                        block_timer->reserved[1],
>> +                        block_timer->reserved[2]);
>> +                if (block_timer->phys_timer_flags & ~0x3)
>> +                    fwts_failed(fw, LOG_LEVEL_LOW,
>> "GTDTFBlockPhysTimerFlagReservedNonZero",
>> +                        "GTDT block physical timer flag reserved bits
>> 2 to 31 are "
>> +                        "non-zero, instead got 0x%" PRIx32 ".",
>> +                        block_timer->phys_timer_flags);
>> +                if (block_timer->virt_timer_flags & ~0x3)
>> +                    fwts_failed(fw, LOG_LEVEL_LOW,
>> "GTDTFBlockVirtTimerFlagReservedNonZero",
>> +                        "GTDT Block virtual timer flag reserved bits
>> 2 to 31 are "
>> +                        "non-zero, instead got 0x%" PRIx32 ".",
>> +                        block_timer->virt_timer_flags);
> Thanks Colin,
> Could we also check GTx common flags here?

Thanks for spotting that Ivan, I overlooked that. I'll fix that up

>> +            }
>> +            ptr += block->length;
>> +            break;
>> +        case 0x01:
>> +            /* SBSA Generic Watchdog Timer Structure */
>> +            watchdog = (fwts_acpi_table_gtdt_watchdog *)ptr;
>> +            if (ptr + 28 < end_ptr) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTShortWatchDogTimer",
>> +                    "GTDT SBSA generic watchdog timer is too short");
>> +                return;
>> +            }
>> +            if (watchdog->length != 28) {
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidWatchDogTimeLength",
>> +                    "GTDT SBSA generic watchdog timer length has in
>> invalid length: %" PRIu32 " bytes",
>> +                    watchdog->length);
>> +                return;
>> +            }
>> +            if (watchdog->reserved)
>> +                fwts_failed(fw, LOG_LEVEL_HIGH,
>> "GTDTInvalidWatchDogReserved",
>> +                    "GTDT SBSA generic watchdog timer reserved is
>> non-zero, got 0x%" PRIx8,
>> +                    watchdog->reserved);
>> +            if (watchdog->watchdog_timer_flags & ~0x7)
>> +                fwts_failed(fw, LOG_LEVEL_LOW,
>> "GTDTWatchDogTimerFlagReservedNonZero",
>> +                    "GTDT SBSA generic watchdog timer flag reserved
>> bits 3 to 31 are "
>> +                    "non-zero, instead got 0x%" PRIx8 ".",
>> +                    watchdog->watchdog_timer_flags);
>> +            ptr += watchdog->length;
>> +            break;
>> +        default:
>> +            fwts_failed(fw, LOG_LEVEL_HIGH, "GTDTInvalidType",
>> +                "GTDT platform timer strucuture has an invalid type:
>> 0x%" PRIx8,
>> +                *ptr);
>> +            /* Can't determine field length, so end of parsing */
>> +            return;
>> +        }
>> +        i++;
>> +    }
>>   }
>>     typedef void (*check_func)(fwts_framework *fw,
>> fwts_acpi_table_info *table);
>> @@ -542,6 +665,7 @@ static acpi_table_check_table check_table[] = {
>>       { "APIC", acpi_table_check_madt },
>>       { "ECDT", acpi_table_check_ecdt },
>>       { "FACP", acpi_table_check_fadt },
>> +    { "GTDT", acpi_table_check_gtdt },
>>       { "HPET", acpi_table_check_hpet },
>>       { "MCFG", acpi_table_check_mcfg },
>>       { "RSDT", acpi_table_check_rsdt },
>> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
>> index 33f1dc0..c1fc913 100644
>> --- a/src/lib/include/fwts_acpi.h
>> +++ b/src/lib/include/fwts_acpi.h
>> @@ -683,6 +683,7 @@ typedef struct {
>>     /* 5.2.24 Generic Timer Description Table (GTDT) ACPI 5.0 Spec */
>>   typedef struct {
>> +    fwts_acpi_table_header header;
>>       uint64_t    cnt_control_base_phys_addr;
>>       uint32_t    reserved;
>>       uint32_t    secure_EL1_timer_GSIV;
>> @@ -703,6 +704,41 @@ typedef struct {
>>       uint32_t    timer_flags;
>>   } __attribute__ ((packed)) fwts_acpi_table_gtdt_platform_timer;
>>   +typedef struct {
>> +    uint8_t        frame_number;        /* 0..7 */
>> +    uint8_t        reserved[3];        /* 0 */
>> +    uint64_t    cntbase;
>> +    uint64_t    cntel0base;
>> +    uint32_t    gsiv;
>> +    uint32_t    phys_timer_gsiv;
>> +    uint32_t    phys_timer_flags;
>> +    uint32_t    virt_timer_gsiv;
>> +    uint32_t    virt_timer_flags;
>> +    uint32_t    common_flags;
>> +} __attribute__ ((packed)) fwts_acpi_table_gtdt_block_timer;
>> +
>> +/* 5.2.24.1.1 GT Block Structure */
>> +typedef struct {
>> +    uint8_t        type;            /* 0x00 */
>> +    uint16_t    length;            /* 20 + n * 40 */
>> +    uint8_t        reserved;        /* 0x00 */
>> +    uint64_t    physical_address;
>> +    uint32_t    block_timer_count;    /* 0..8 */
>> +    uint32_t    block_timer_offset;
>> +    fwts_acpi_table_gtdt_block_timer    block_timers[0];
>> +} __attribute__ ((packed)) fwts_acpi_table_gtdt_block;
>> +
>> +/* 5.2.24.0.1 SBSA Generic Watchdog Structure */
>> +typedef struct {
>> +    uint8_t        type;            /* 0x01 */
>> +    uint16_t    length;            /* 28 */
>> +    uint8_t        reserved;        /* 0x00 */
>> +    uint64_t    refresh_frame_addr;
>> +    uint64_t    watchdog_control_frame_addr;
>> +    uint32_t    watchdog_timer_gsiv;
>> +    uint32_t    watchdog_timer_flags;
>> +} __attribute__ ((packed)) fwts_acpi_table_gtdt_watchdog;
>> +
>>   /* 5.2.20 ACPI RAS FeatureTable (RASF) */
>>   typedef struct {
>>           uint8_t         platform_cc_id[12];
> 
> 




More information about the fwts-devel mailing list