[PATCH] fwts_acpi_tables: fix fwts_get_acpi_version helper

Alex Hung alex.hung at canonical.com
Fri May 22 23:47:37 UTC 2020


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 at 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 ||
-- 
2.25.1




More information about the fwts-devel mailing list