ACK: [PATCH][V3] acpi: pptt: add ACPI PPTT test
Colin Ian King
colin.king at canonical.com
Tue Aug 22 15:20:32 UTC 2017
On 31/07/17 21:13, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung at canonical.com>
> ---
> src/Makefile.am | 1 +
> src/acpi/pptt/pptt.c | 231 ++++++++++++++++++++++++++++++++++++++++++++
> src/lib/include/fwts_acpi.h | 53 ++++++++++
> 3 files changed, 285 insertions(+)
> create mode 100644 src/acpi/pptt/pptt.c
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index ca0a449..11862c9 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -96,6 +96,7 @@ fwts_SOURCES = main.c \
> acpi/powerbutton/powerbutton.c \
> acpi/plddump/plddump.c \
> acpi/pmtt/pmtt.c \
> + acpi/pptt/pptt.c \
> acpi/rsdp/rsdp.c \
> acpi/rsdt/rsdt.c \
> acpi/s3/s3.c \
> diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c
> new file mode 100644
> index 0000000..083ef02
> --- /dev/null
> +++ b/src/acpi/pptt/pptt.c
> @@ -0,0 +1,231 @@
> +/*
> + * Copyright (C) 2017 Canonical
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +#include "fwts.h"
> +
> +#if defined(FWTS_HAS_ACPI)
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <unistd.h>
> +#include <inttypes.h>
> +#include <stdbool.h>
> +
> +static fwts_acpi_table_info *table;
> +
> +static int pptt_init(fwts_framework *fw)
> +{
> + if (fwts_acpi_find_table(fw, "PPTT", 0, &table) != FWTS_OK) {
> + fwts_log_error(fw, "Cannot load ACPI table");
> + return FWTS_ERROR;
> + }
> + if (table == NULL) {
> + fwts_log_error(fw, "ACPI PPTT table does not exist, skipping test");
> + return FWTS_SKIP;
> + }
> +
> + return FWTS_OK;
> +}
> +
> +static void pptt_processor_test(fwts_framework *fw, const fwts_acpi_table_pptt_processor *entry, bool *passed)
> +{
> + uint32_t i;
> +
> + fwts_log_info_verbatim(fw, " Processor hierarchy node structure (Type 0):");
> + fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, entry->header.type);
> + fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, entry->header.length);
> + fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, entry->reserved);
> + fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, entry->flags);
> + fwts_log_info_verbatim(fw, " Parent: 0x%8.8" PRIx32, entry->parent);
> + fwts_log_info_verbatim(fw, " ACPI Processor ID: 0x%8.8" PRIx32, entry->acpi_processor_id);
> + fwts_log_info_verbatim(fw, " Number of Private Resources: 0x%8.8" PRIx32, entry->number_priv_resources);
> +
> + if ((entry->header.length - sizeof(fwts_acpi_table_pptt_processor)) / 4 == entry->number_priv_resources) {
> + for (i = 0; i < entry->number_priv_resources; i++)
> + fwts_log_info_verbatim(fw, " Private Resources[%d]: 0x%8.8" PRIx32, i, entry->private_resource[i]);
> + } else {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_CRITICAL,
> + "PPTTBadProcessorLength",
> + "PPTT Processor length does not match "
> + "0x%8.8" PRIx32 " private resources",
> + entry->number_priv_resources);
> + }
> +
> + if (entry->reserved != 0) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_LOW,
> + "PPTTReservedNonZero",
> + "PPTT reserved field must be zero, got "
> + "0x%4.4" PRIx16 " instead", entry->reserved);
> + }
> +
> + if (entry->flags & ~0x03) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_HIGH,
> + "PPTTBadFlags",
> + "PPTT Flags's Bits[31..2] must be zero, got "
> + "0x%8.8" PRIx32 " instead", entry->flags);
> + }
> +}
> +
> +static void pptt_cache_test(fwts_framework *fw, const fwts_acpi_table_pptt_cache *entry, bool *passed)
> +{
> +
> + fwts_log_info_verbatim(fw, " Cache Type Structure (Type 1):");
> + fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, entry->header.type);
> + fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, entry->header.length);
> + fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, entry->reserved);
> + fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, entry->flags);
> + fwts_log_info_verbatim(fw, " Next Level of Cache: 0x%8.8" PRIx32, entry->next_level_cache);
> + fwts_log_info_verbatim(fw, " Size: 0x%8.8" PRIx32, entry->size);
> + fwts_log_info_verbatim(fw, " Number of sets: 0x%8.8" PRIx32, entry->number_sets);
> + fwts_log_info_verbatim(fw, " Associativity: 0x%2.2" PRIx8, entry->associativity);
> + fwts_log_info_verbatim(fw, " Attributes: 0x%2.2" PRIx8, entry->attributes);
> + fwts_log_info_verbatim(fw, " Line size: 0x%4.4" PRIx16, entry->line_size);
> +
> + if (entry->reserved != 0) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_LOW,
> + "PPTTReservedNonZero",
> + "PPTT reserved field must be zero, got "
> + "0x%4.4" PRIx16 " instead", entry->reserved);
> + }
> +
> + if (entry->flags & ~0x7f) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_HIGH,
> + "PPTTBadFlags",
> + "PPTT Flags's Bits[31..7] must be zero, got "
> + "0x%8.8" PRIx32 " instead", entry->flags);
> + }
> +
> + if (entry->attributes & ~0x1f) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_HIGH,
> + "PPTTBadAttributes",
> + "PPTT attributes's Bits[7..5] must be zero, got "
> + "0x%2.2" PRIx8 " instead", entry->attributes);
> + }
> +}
> +
> +static void pptt_id_test(fwts_framework *fw, const fwts_acpi_table_pptt_id *entry, bool *passed)
> +{
> + char vendor_id[5];
> +
> + memcpy(vendor_id, &entry->vendor_id, sizeof(uint32_t));
> + vendor_id[4] = 0;
> +
> + fwts_log_info_verbatim(fw, " ID structure (Type 2):");
> + fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, entry->header.type);
> + fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, entry->header.length);
> + fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, entry->reserved);
> + fwts_log_info_verbatim(fw, " VENDOR_ID: %4.4s", vendor_id);
> + fwts_log_info_verbatim(fw, " LEVEL_1_ID: 0x%16.16" PRIx64, entry->level1_id);
> + fwts_log_info_verbatim(fw, " LEVEL_2_ID: 0x%16.16" PRIx64, entry->level2_id);
> + fwts_log_info_verbatim(fw, " MAJOR_REV: 0x%4.4" PRIx16, entry->major_rev);
> + fwts_log_info_verbatim(fw, " MINOR_REV: 0x%4.4" PRIx16, entry->minor_rev);
> + fwts_log_info_verbatim(fw, " SPIN_REV: 0x%4.4" PRIx16, entry->spin_rev);
> +
> + if (entry->reserved != 0) {
> + *passed = false;
> + fwts_failed(fw, LOG_LEVEL_LOW,
> + "PPTTReservedNonZero",
> + "PPTT reserved field must be zero, got "
> + "0x%4.4" PRIx16 " instead", entry->reserved);
> + }
> +}
> +
> +static int pptt_test1(fwts_framework *fw)
> +{
> + fwts_acpi_table_pptt_header *entry;
> + uint32_t offset;
> + bool passed = true;
> +
> + fwts_log_info_verbatim(fw, "PPTT Processor Properties Topology Table:");
> +
> + entry = (fwts_acpi_table_pptt_header *) (table->data + sizeof(fwts_acpi_table_pptt));
> + offset = sizeof(fwts_acpi_table_pptt);
> + while (offset < table->length) {
> + uint32_t type_length;
> +
> + if (entry->length == 0) {
> + passed = false;
> + fwts_failed(fw, LOG_LEVEL_HIGH, "PPTTStructLengthZero",
> + "PPTT structure (offset 0x%4.4" PRIx32 ") "
> + "length cannot be 0", offset);
> + break;
> + }
> +
> + if (entry->type == FWTS_ACPI_PPTT_PROCESSOR) {
> + pptt_processor_test(fw, (fwts_acpi_table_pptt_processor *) entry, &passed);
> + type_length = sizeof(fwts_acpi_table_pptt_processor) +
> + ((fwts_acpi_table_pptt_processor *) entry)->number_priv_resources * 4;
> + } else if (entry->type == FWTS_ACPI_PPTT_CACHE) {
> + pptt_cache_test(fw, (fwts_acpi_table_pptt_cache *) entry, &passed);
> + type_length = sizeof(fwts_acpi_table_pptt_cache);
> + } else if (entry->type == FWTS_ACPI_PPTT_ID) {
> + pptt_id_test(fw, (fwts_acpi_table_pptt_id *) entry, &passed);
> + type_length = sizeof(fwts_acpi_table_pptt_id);
> + } else {
> + passed = false;
> + fwts_failed(fw, LOG_LEVEL_HIGH,
> + "PPTTBadSubtableType",
> + "PPTT must have subtable with Type 0..2, got "
> + "0x%2.2" PRIx8 " instead", entry->type);
> + break;
> + }
> +
> + if (entry->length != type_length) {
> + passed = false;
> + fwts_failed(fw, LOG_LEVEL_CRITICAL,
> + "PPTTBadSubtableLength",
> + "PPTT subtable Type 0x%2.2" PRIx8 " should have "
> + "length 0x%2.2" PRIx8 ", got 0x%2.2" PRIx8,
> + entry->type, entry->length, type_length);
> + break;
> + }
> +
> + if ((offset += entry->length) > table->length) {
> + passed = false;
> + fwts_failed(fw, LOG_LEVEL_CRITICAL,
> + "PPTTBadTableLength",
> + "PPTT has more subtypes than its size can handle");
> + break;
> + }
> + entry = (fwts_acpi_table_pptt_header *) (table->data + offset);
> + fwts_log_nl(fw);
> + }
> +
> + if (passed)
> + fwts_passed(fw, "No issues found in PPTT table.");
> +
> + return FWTS_OK;
> +}
> +
> +static fwts_framework_minor_test pptt_tests[] = {
> + { pptt_test1, "Validate PPTT table." },
> + { NULL, NULL }
> +};
> +
> +static fwts_framework_ops pptt_ops = {
> + .description = "PPTT Processor Properties Topology Table test.",
> + .init = pptt_init,
> + .minor_tests = pptt_tests
> +};
> +
> +FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI)
> +
> +#endif
> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
> index bf318c2..bbedea3 100644
> --- a/src/lib/include/fwts_acpi.h
> +++ b/src/lib/include/fwts_acpi.h
> @@ -1247,6 +1247,59 @@ typedef struct {
> uint64_t hint_address[];
> } __attribute__ ((packed)) fwts_acpi_table_nfit_flush_addr;
>
> +
> +/*
> + * ACPI PPTT (Processor Properties Topology Table), 5.2.29
> + */
> +typedef struct {
> + fwts_acpi_table_header header;
> +} __attribute__ ((packed)) fwts_acpi_table_pptt;
> +
> +typedef enum {
> + FWTS_ACPI_PPTT_PROCESSOR = 0,
> + FWTS_ACPI_PPTT_CACHE = 1,
> + FWTS_ACPI_PPTT_ID = 2,
> +} fwts_acpi_pptt_type;
> +
> +typedef struct {
> + uint8_t type;
> + uint8_t length;
> +} __attribute__ ((packed)) fwts_acpi_table_pptt_header;
> +
> +typedef struct {
> + fwts_acpi_table_pptt_header header;
> + uint16_t reserved;
> + uint32_t flags;
> + uint32_t parent;
> + uint32_t acpi_processor_id;
> + uint32_t number_priv_resources;
> + uint32_t private_resource[];
> +} __attribute__ ((packed)) fwts_acpi_table_pptt_processor;
> +
> +typedef struct {
> + fwts_acpi_table_pptt_header header;
> + uint16_t reserved;
> + uint32_t flags;
> + uint32_t next_level_cache;
> + uint32_t size;
> + uint32_t number_sets;
> + uint8_t associativity;
> + uint8_t attributes;
> + uint16_t line_size;
> +} __attribute__ ((packed)) fwts_acpi_table_pptt_cache;
> +
> +typedef struct {
> + fwts_acpi_table_pptt_header header;
> + uint16_t reserved;
> + uint32_t vendor_id;
> + uint64_t level1_id;
> + uint64_t level2_id;
> + uint16_t major_rev;
> + uint16_t minor_rev;
> + uint16_t spin_rev;
> +} __attribute__ ((packed)) fwts_acpi_table_pptt_id;
> +
> +
> /*
> * ACPI PCCT (Platform Communications Channel Table), 14.1
> */
>
Thanks Alex,
Acked-by: Colin Ian King <colin.king at canonical.com>
More information about the fwts-devel
mailing list