| Message ID | 20200506214635.448354-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] lib: fwts_acpi_object_eval: add a function to check reserved bits | expand |
On 5/7/20 5:46 AM, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/include/fwts_acpi_object_eval.h | 1 + > src/lib/src/fwts_acpi_object_eval.c | 28 +++++++++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/src/lib/include/fwts_acpi_object_eval.h b/src/lib/include/fwts_acpi_object_eval.h > index 8922b154..32bba493 100644 > --- a/src/lib/include/fwts_acpi_object_eval.h > +++ b/src/lib/include/fwts_acpi_object_eval.h > @@ -126,6 +126,7 @@ void fwts_method_test_reference_return(fwts_framework *fw, char *name, ACPI_BUFF > void fwts_method_test_NULL_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_buffer_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj,void *private); > void fwts_method_test_all_reference_package_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > +void fwts_method_test_integer_reserved_bits_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_passed_failed_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_polling_return( fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > > diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c > index b78ca3af..d4613012 100644 > --- a/src/lib/src/fwts_acpi_object_eval.c > +++ b/src/lib/src/fwts_acpi_object_eval.c > @@ -823,6 +823,34 @@ void fwts_method_test_all_reference_package_return( > fwts_passed(fw, "%s returned a sane package of %" PRIu32 " references.", name, obj->Package.Count); > } > > +/* > + * fwts_method_test_integer_reserved_bits_return > + * check if reserved bits are zero'ed in a returned integer > + */ > +void fwts_method_test_integer_reserved_bits_return( > + fwts_framework *fw, > + char *name, > + ACPI_BUFFER *buf, > + ACPI_OBJECT *obj, > + void *private) > +{ > + uint64_t *mask = (uint64_t *) private; > + bool failed = false; > + > + if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_INTEGER) != FWTS_OK) > + return; > + > + if (obj->Integer.Value & *mask) { > + failed = true; > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "MethodIllegalReserved", > + "%s returned value 0x%8.8" PRIx64 " and some of the " > + "reserved bits are set when they should be zero.", > + name, (uint64_t) obj->Integer.Value); > + } > + > + if (!failed) > + fwts_passed(fw, "%s correctly returned an integer.", name); > +} > > /* > * fwts_method_test_passed_failed_return > Acked-by: Ivan Hu <ivan.hu@canonical.com>
On 06/05/2020 22:46, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/include/fwts_acpi_object_eval.h | 1 + > src/lib/src/fwts_acpi_object_eval.c | 28 +++++++++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/src/lib/include/fwts_acpi_object_eval.h b/src/lib/include/fwts_acpi_object_eval.h > index 8922b154..32bba493 100644 > --- a/src/lib/include/fwts_acpi_object_eval.h > +++ b/src/lib/include/fwts_acpi_object_eval.h > @@ -126,6 +126,7 @@ void fwts_method_test_reference_return(fwts_framework *fw, char *name, ACPI_BUFF > void fwts_method_test_NULL_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_buffer_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj,void *private); > void fwts_method_test_all_reference_package_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > +void fwts_method_test_integer_reserved_bits_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_passed_failed_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > void fwts_method_test_polling_return( fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); > > diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c > index b78ca3af..d4613012 100644 > --- a/src/lib/src/fwts_acpi_object_eval.c > +++ b/src/lib/src/fwts_acpi_object_eval.c > @@ -823,6 +823,34 @@ void fwts_method_test_all_reference_package_return( > fwts_passed(fw, "%s returned a sane package of %" PRIu32 " references.", name, obj->Package.Count); > } > > +/* > + * fwts_method_test_integer_reserved_bits_return > + * check if reserved bits are zero'ed in a returned integer > + */ > +void fwts_method_test_integer_reserved_bits_return( > + fwts_framework *fw, > + char *name, > + ACPI_BUFFER *buf, > + ACPI_OBJECT *obj, > + void *private) > +{ > + uint64_t *mask = (uint64_t *) private; > + bool failed = false; > + > + if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_INTEGER) != FWTS_OK) > + return; > + > + if (obj->Integer.Value & *mask) { > + failed = true; > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "MethodIllegalReserved", > + "%s returned value 0x%8.8" PRIx64 " and some of the " > + "reserved bits are set when they should be zero.", > + name, (uint64_t) obj->Integer.Value); > + } > + > + if (!failed) > + fwts_passed(fw, "%s correctly returned an integer.", name); > +} > > /* > * fwts_method_test_passed_failed_return > Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/src/lib/include/fwts_acpi_object_eval.h b/src/lib/include/fwts_acpi_object_eval.h index 8922b154..32bba493 100644 --- a/src/lib/include/fwts_acpi_object_eval.h +++ b/src/lib/include/fwts_acpi_object_eval.h @@ -126,6 +126,7 @@ void fwts_method_test_reference_return(fwts_framework *fw, char *name, ACPI_BUFF void fwts_method_test_NULL_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); void fwts_method_test_buffer_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj,void *private); void fwts_method_test_all_reference_package_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); +void fwts_method_test_integer_reserved_bits_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); void fwts_method_test_passed_failed_return(fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); void fwts_method_test_polling_return( fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private); diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c index b78ca3af..d4613012 100644 --- a/src/lib/src/fwts_acpi_object_eval.c +++ b/src/lib/src/fwts_acpi_object_eval.c @@ -823,6 +823,34 @@ void fwts_method_test_all_reference_package_return( fwts_passed(fw, "%s returned a sane package of %" PRIu32 " references.", name, obj->Package.Count); } +/* + * fwts_method_test_integer_reserved_bits_return + * check if reserved bits are zero'ed in a returned integer + */ +void fwts_method_test_integer_reserved_bits_return( + fwts_framework *fw, + char *name, + ACPI_BUFFER *buf, + ACPI_OBJECT *obj, + void *private) +{ + uint64_t *mask = (uint64_t *) private; + bool failed = false; + + if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_INTEGER) != FWTS_OK) + return; + + if (obj->Integer.Value & *mask) { + failed = true; + fwts_failed(fw, LOG_LEVEL_MEDIUM, "MethodIllegalReserved", + "%s returned value 0x%8.8" PRIx64 " and some of the " + "reserved bits are set when they should be zero.", + name, (uint64_t) obj->Integer.Value); + } + + if (!failed) + fwts_passed(fw, "%s correctly returned an integer.", name); +} /* * fwts_method_test_passed_failed_return
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/lib/include/fwts_acpi_object_eval.h | 1 + src/lib/src/fwts_acpi_object_eval.c | 28 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+)