| Message ID | 20200522234737.248163-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fwts_acpi_tables: fix fwts_get_acpi_version helper | expand |
On 23/05/2020 00:47, Alex Hung wrote: > The correct format is in fwts.acpi.h such as following > > FWTS_ACPI_VERSION_63 (0x630) > FWTS_ACPI_VERSION_62 (0x620) > > This leaves room for erreta like 6.3a (0x63a). > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_acpi_tables.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c > index 3749c56a..3b1d7887 100644 > --- a/src/lib/src/fwts_acpi_tables.c > +++ b/src/lib/src/fwts_acpi_tables.c > @@ -1618,7 +1618,7 @@ uint32_t fwts_get_acpi_version(fwts_framework *fw) > } > > fadt = (fwts_acpi_table_fadt *) table->data; > - acpi_version = (fadt->header.revision << 8) + fadt->minor_version; > + acpi_version = (fadt->header.revision << 8) + (fadt->minor_version << 4); > > /* check FACP returns an invalid value */ > if (acpi_version > FWTS_ACPI_VERSION_NEXT || > Good catch! Acked-by: Colin Ian King <colin.king@canonical.com>
On 5/23/20 7:47 AM, Alex Hung wrote: > The correct format is in fwts.acpi.h such as following > > FWTS_ACPI_VERSION_63 (0x630) > FWTS_ACPI_VERSION_62 (0x620) > > This leaves room for erreta like 6.3a (0x63a). > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_acpi_tables.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c > index 3749c56a..3b1d7887 100644 > --- a/src/lib/src/fwts_acpi_tables.c > +++ b/src/lib/src/fwts_acpi_tables.c > @@ -1618,7 +1618,7 @@ uint32_t fwts_get_acpi_version(fwts_framework *fw) > } > > fadt = (fwts_acpi_table_fadt *) table->data; > - acpi_version = (fadt->header.revision << 8) + fadt->minor_version; > + acpi_version = (fadt->header.revision << 8) + (fadt->minor_version << 4); > > /* check FACP returns an invalid value */ > if (acpi_version > FWTS_ACPI_VERSION_NEXT || > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c index 3749c56a..3b1d7887 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c @@ -1618,7 +1618,7 @@ uint32_t fwts_get_acpi_version(fwts_framework *fw) } fadt = (fwts_acpi_table_fadt *) table->data; - acpi_version = (fadt->header.revision << 8) + fadt->minor_version; + acpi_version = (fadt->header.revision << 8) + (fadt->minor_version << 4); /* check FACP returns an invalid value */ if (acpi_version > FWTS_ACPI_VERSION_NEXT ||
The correct format is in fwts.acpi.h such as following FWTS_ACPI_VERSION_63 (0x630) FWTS_ACPI_VERSION_62 (0x620) This leaves room for erreta like 6.3a (0x63a). Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/lib/src/fwts_acpi_tables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)