Message ID | 1503360773-17369-1-git-send-email-alex.hung@canonical.com |
---|---|
State | Superseded |
Headers | show |
On 22/08/17 01:12, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/Makefile.am | 1 + > src/acpi/rasf/rasf.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ > src/lib/include/fwts_acpi.h | 3 +- > 3 files changed, 84 insertions(+), 1 deletion(-) > create mode 100644 src/acpi/rasf/rasf.c > > diff --git a/src/Makefile.am b/src/Makefile.am > index 43c398e..c752682 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -98,6 +98,7 @@ fwts_SOURCES = main.c \ > acpi/plddump/plddump.c \ > acpi/pmtt/pmtt.c \ > acpi/pptt/pptt.c \ > + acpi/rasf/rasf.c \ > acpi/rsdp/rsdp.c \ > acpi/rsdt/rsdt.c \ > acpi/s3/s3.c \ > diff --git a/src/acpi/rasf/rasf.c b/src/acpi/rasf/rasf.c > new file mode 100644 > index 0000000..616af15 > --- /dev/null > +++ b/src/acpi/rasf/rasf.c > @@ -0,0 +1,81 @@ > +/* > + * 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. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > + * > + */ > +#include "fwts.h" > + > +#if defined(FWTS_HAS_ACPI) > + > +#include <stdlib.h> > +#include <stdio.h> > +#include <unistd.h> > +#include <inttypes.h> > +#include <string.h> > + > +static fwts_acpi_table_info *table; > + > +static int rasf_init(fwts_framework *fw) > +{ > + if (fwts_acpi_find_table(fw, "RASF", 0, &table) != FWTS_OK) { > + fwts_log_error(fw, "Cannot read ACPI tables"); > + return FWTS_ERROR; > + } > + if (table == NULL || (table && table->length == 0)) { > + fwts_log_error(fw, "ACPI RASF table does not exist, skipping test"); > + return FWTS_SKIP; > + } > + > + return FWTS_OK; > +} > + > +static int rasf_test1(fwts_framework *fw) > +{ > + fwts_acpi_table_rasf *rasf = (fwts_acpi_table_rasf *) table->data; > + bool passed = true; > + uint8_t i; > + > + fwts_log_info_verbatim(fw, "RASF (RAS Feature) Table:"); > + if (rasf->header.length == sizeof(fwts_acpi_table_rasf)) { > + for (i = 0; i < 12; i++) > + fwts_log_info_verbatim(fw, " Channel Identifier[%2.2" PRId8 "]: 0x%2.2" PRIx8, i, rasf->platform_cc_id[i]); Minor quibble, should there be a space after Identifier, it looks cramped otherwise. How about: fwts_log_info_verbatim(fw, " Channel Identifier [%2.2" PRId8 "]: 0x%2.2" PRIx8, i, rasf->platform_cc_id[i]); > + } else { > + passed = false; > + fwts_failed(fw, LOG_LEVEL_CRITICAL, "RASFBadLength", > + "RASF structure must have length 0x%8.8" PRIx32 ", got " > + "0x%8.8" PRIx32, (uint32_t)sizeof(fwts_acpi_table_rasf), rasf->header.length); > + } > + > + if (passed) > + fwts_passed(fw, "No issues found in RASF table."); > + > + return FWTS_OK; > +} > + > +static fwts_framework_minor_test rasf_tests[] = { > + { rasf_test1, "Validate RASF table." }, > + { NULL, NULL } > +}; > + > +static fwts_framework_ops rasf_ops = { > + .description = "RASF RAS Feature Table test", > + .init = rasf_init, > + .minor_tests = rasf_tests > +}; > + > +FWTS_REGISTER("rasf", &rasf_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 5484cf3..4387efd 100644 > --- a/src/lib/include/fwts_acpi.h > +++ b/src/lib/include/fwts_acpi.h > @@ -1032,7 +1032,8 @@ typedef struct { > * ACPI RASF (RAS Feature Table), 5.2.20 > */ > typedef struct { > - uint8_t platform_cc_id[12]; > + fwts_acpi_table_header header; > + uint8_t platform_cc_id[12]; > } __attribute__ ((packed)) fwts_acpi_table_rasf; > > /* >
diff --git a/src/Makefile.am b/src/Makefile.am index 43c398e..c752682 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,6 +98,7 @@ fwts_SOURCES = main.c \ acpi/plddump/plddump.c \ acpi/pmtt/pmtt.c \ acpi/pptt/pptt.c \ + acpi/rasf/rasf.c \ acpi/rsdp/rsdp.c \ acpi/rsdt/rsdt.c \ acpi/s3/s3.c \ diff --git a/src/acpi/rasf/rasf.c b/src/acpi/rasf/rasf.c new file mode 100644 index 0000000..616af15 --- /dev/null +++ b/src/acpi/rasf/rasf.c @@ -0,0 +1,81 @@ +/* + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +#include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <inttypes.h> +#include <string.h> + +static fwts_acpi_table_info *table; + +static int rasf_init(fwts_framework *fw) +{ + if (fwts_acpi_find_table(fw, "RASF", 0, &table) != FWTS_OK) { + fwts_log_error(fw, "Cannot read ACPI tables"); + return FWTS_ERROR; + } + if (table == NULL || (table && table->length == 0)) { + fwts_log_error(fw, "ACPI RASF table does not exist, skipping test"); + return FWTS_SKIP; + } + + return FWTS_OK; +} + +static int rasf_test1(fwts_framework *fw) +{ + fwts_acpi_table_rasf *rasf = (fwts_acpi_table_rasf *) table->data; + bool passed = true; + uint8_t i; + + fwts_log_info_verbatim(fw, "RASF (RAS Feature) Table:"); + if (rasf->header.length == sizeof(fwts_acpi_table_rasf)) { + for (i = 0; i < 12; i++) + fwts_log_info_verbatim(fw, " Channel Identifier[%2.2" PRId8 "]: 0x%2.2" PRIx8, i, rasf->platform_cc_id[i]); + } else { + passed = false; + fwts_failed(fw, LOG_LEVEL_CRITICAL, "RASFBadLength", + "RASF structure must have length 0x%8.8" PRIx32 ", got " + "0x%8.8" PRIx32, (uint32_t)sizeof(fwts_acpi_table_rasf), rasf->header.length); + } + + if (passed) + fwts_passed(fw, "No issues found in RASF table."); + + return FWTS_OK; +} + +static fwts_framework_minor_test rasf_tests[] = { + { rasf_test1, "Validate RASF table." }, + { NULL, NULL } +}; + +static fwts_framework_ops rasf_ops = { + .description = "RASF RAS Feature Table test", + .init = rasf_init, + .minor_tests = rasf_tests +}; + +FWTS_REGISTER("rasf", &rasf_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 5484cf3..4387efd 100644 --- a/src/lib/include/fwts_acpi.h +++ b/src/lib/include/fwts_acpi.h @@ -1032,7 +1032,8 @@ typedef struct { * ACPI RASF (RAS Feature Table), 5.2.20 */ typedef struct { - uint8_t platform_cc_id[12]; + fwts_acpi_table_header header; + uint8_t platform_cc_id[12]; } __attribute__ ((packed)) fwts_acpi_table_rasf; /*
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/Makefile.am | 1 + src/acpi/rasf/rasf.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ src/lib/include/fwts_acpi.h | 3 +- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/acpi/rasf/rasf.c