Skip to contentSkip to conversation

acpi unit-test: resolved iasl crash

PATCH In review Marcel Apfelbaum 2 participants 5 messages Dec 29, 2013 – Jan 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 acpi unit-test: resolved iasl crash

It seems that iasl has an issue when disassembles some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
I opened a bug on iasl project:
https://github.com/acpica/acpica/issues/20

Modified the iasl command line to "iasl -d HPET" until the problem is solved. The command line remained the same for DSDT and SSDT tables.

---
 tests/acpi-test.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +9 -7
index 2d32b69..26d2e26 100644
@@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild)
     }
 }
 
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
@@ -419,9 +419,11 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 
     /* build command line */
     g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
-    for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
-        temp = &g_array_index(sdts, AcpiSdtTable, i);
-        g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+    if (referenceDsdt) {
+        for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
+            temp = &g_array_index(sdts, AcpiSdtTable, i);
+            g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+        }
     }
     g_string_append_printf(command_line, "-d %s", sdt->aml_file);
 
@@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data)
     dump_aml_files(data, false);
     for (i = 0; i < data->ssdt_tables->len; ++i) {
         GString *asl, *exp_asl;
-
+        bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */
         sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i);
         exp_sdt = &g_array_index(exp_data.ssdt_tables, AcpiSdtTable, i);
 
-        load_asl(data->ssdt_tables, sdt);
+        load_asl(data->ssdt_tables, sdt, referenceDsdt);
         asl = normalize_asl(sdt->asl);
 
-        load_asl(exp_data.ssdt_tables, exp_sdt);
+        load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt);
         exp_asl = normalize_asl(exp_sdt->asl);
 
         g_assert(!g_strcmp0(asl->str, exp_asl->str));
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 11 lines · Marcel Apfelbaum

It seems that iasl has an issue when disassembles
some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
I opened a bug on iasl project:
https://github.com/acpica/acpica/issues/20

Modified the iasl command line to "iasl -d HPET"
until the problem is solved. The command line
remained the same for DSDT and SSDT tables.

space needed after :

Quoted 34 lines
---
 tests/acpi-test.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +6 -4
index 2d32b69..26d2e26 100644
@@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild)
     }
 }
 
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
@@ -419,9 +419,11 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 
     /* build command line */
     g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
-    for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
-        temp = &g_array_index(sdts, AcpiSdtTable, i);
-        g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+    if (referenceDsdt) {
+        for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
+            temp = &g_array_index(sdts, AcpiSdtTable, i);
+            g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+        }
     }
     g_string_append_printf(command_line, "-d %s", sdt->aml_file);
 

tests/acpi-test.c static void test_acpi_asl(test_data *data) · line 515

Quoted 5 lines
tests/acpi-test.c +1 -1
@@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data)
     dump_aml_files(data, false);
     for (i = 0; i < data->ssdt_tables->len; ++i) {
         GString *asl, *exp_asl;
-
+        bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */

Please don't use camelCase for variables.
Can we check the table signature instead of looking at the index?

Quoted 14 lines
tests/acpi-test.c +2 -2
         sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i);
         exp_sdt = &g_array_index(exp_data.ssdt_tables, AcpiSdtTable, i);
 
-        load_asl(data->ssdt_tables, sdt);
+        load_asl(data->ssdt_tables, sdt, referenceDsdt);
         asl = normalize_asl(sdt->asl);
 
-        load_asl(exp_data.ssdt_tables, exp_sdt);
+        load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt);
         exp_asl = normalize_asl(exp_sdt->asl);
 
         g_assert(!g_strcmp0(asl->str, exp_asl->str));
Signature · 1 line
1.8.3.1
#2 lore raw
Quoted 7 lines · Michael S. Tsirkin
Quoted 6 lines · Marcel Apfelbaum

It seems that iasl has an issue when disassembles
some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
I opened a bug on iasl project:
https://github.com/acpica/acpica/issues/20

Quoted 7 lines
Quoted 5 lines

Modified the iasl command line to "iasl -d HPET"
until the problem is solved. The command line
remained the same for DSDT and SSDT tables.

space needed after :

Sure, missed that

Quoted 34 lines
Quoted 34 lines
---
 tests/acpi-test.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +6 -4
index 2d32b69..26d2e26 100644
@@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild)
     }
 }
 
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
@@ -419,9 +419,11 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 
     /* build command line */
     g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
-    for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
-        temp = &g_array_index(sdts, AcpiSdtTable, i);
-        g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+    if (referenceDsdt) {
+        for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
+            temp = &g_array_index(sdts, AcpiSdtTable, i);
+            g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+        }
     }
     g_string_append_printf(command_line, "-d %s", sdt->aml_file);
 
Quoted 9 lines

tests/acpi-test.c static void test_acpi_asl(test_data *data) · line 515

Quoted 6 lines
tests/acpi-test.c +1 -1
@@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data)
     dump_aml_files(data, false);
     for (i = 0; i < data->ssdt_tables->len; ++i) {
         GString *asl, *exp_asl;
-
+        bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */

Please don't use camelCase for variables.

Sure, no idea why I did that in the first place...

Quoted 1 line

Can we check the table signature instead of looking at the index?

It is possible, but not really necessary because:
1. The array of expected tables it is created as a shadow of the original tables. (We load the expected tables in the exact order as the originals)
2. The loading is done based on table signatures.
So going over the index in *this* case it means going over the signatures.

Thanks for the review,
Marcel

Quoted 15 lines
Quoted 15 lines
tests/acpi-test.c +2 -2
         sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i);
         exp_sdt = &g_array_index(exp_data.ssdt_tables, AcpiSdtTable, i);
 
-        load_asl(data->ssdt_tables, sdt);
+        load_asl(data->ssdt_tables, sdt, referenceDsdt);
         asl = normalize_asl(sdt->asl);
 
-        load_asl(exp_data.ssdt_tables, exp_sdt);
+        load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt);
         exp_asl = normalize_asl(exp_sdt->asl);
 
         g_assert(!g_strcmp0(asl->str, exp_asl->str));
Signature · 1 line
1.8.3.1
#3 lore raw
Quoted 59 lines · Marcel Apfelbaum
Quoted 7 lines · Michael S. Tsirkin
Quoted 6 lines · Marcel Apfelbaum

It seems that iasl has an issue when disassembles
some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
I opened a bug on iasl project:
https://github.com/acpica/acpica/issues/20

Quoted 7 lines
Quoted 5 lines

Modified the iasl command line to "iasl -d HPET"
until the problem is solved. The command line
remained the same for DSDT and SSDT tables.

space needed after :

Sure, missed that

Quoted 34 lines
Quoted 34 lines
---
 tests/acpi-test.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +6 -4
index 2d32b69..26d2e26 100644
@@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild)
     }
 }
 
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
@@ -419,9 +419,11 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 
     /* build command line */
     g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
-    for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
-        temp = &g_array_index(sdts, AcpiSdtTable, i);
-        g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+    if (referenceDsdt) {
+        for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
+            temp = &g_array_index(sdts, AcpiSdtTable, i);
+            g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+        }
     }
     g_string_append_printf(command_line, "-d %s", sdt->aml_file);
 
Quoted 9 lines

tests/acpi-test.c static void test_acpi_asl(test_data *data) · line 515

Quoted 6 lines
tests/acpi-test.c +1 -1
@@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data)
     dump_aml_files(data, false);
     for (i = 0; i < data->ssdt_tables->len; ++i) {
         GString *asl, *exp_asl;
-
+        bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */

Please don't use camelCase for variables.

Quoted 8 lines

Sure, no idea why I did that in the first place...

Quoted 1 line

Can we check the table signature instead of looking at the index?

It is possible, but not really necessary because:
1. The array of expected tables it is created as a shadow of the original tables. (We load the expected tables in the exact order as the originals)
2. The loading is done based on table signatures.
So going over the index in *this* case it means going over the signatures.

Yes but it's really not a good idea to assume that there's a single SSDT, the fact you need a comment shows that it's fragile.
How about a simple API like
compare_signature(GArray *, const char *signature)

We should also probably rename ssdt_tables to something else if it holds other tables besides ssdt. all_tables?

Quoted 20 lines

Thanks for the review,
Marcel

Quoted 15 lines
Quoted 15 lines
tests/acpi-test.c +2 -2
         sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i);
         exp_sdt = &g_array_index(exp_data.ssdt_tables, AcpiSdtTable, i);
 
-        load_asl(data->ssdt_tables, sdt);
+        load_asl(data->ssdt_tables, sdt, referenceDsdt);
         asl = normalize_asl(sdt->asl);
 
-        load_asl(exp_data.ssdt_tables, exp_sdt);
+        load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt);
         exp_asl = normalize_asl(exp_sdt->asl);
 
         g_assert(!g_strcmp0(asl->str, exp_asl->str));
Signature · 1 line
1.8.3.1
#4 lore raw
Quoted 76 lines · Michael S. Tsirkin
Quoted 59 lines · Marcel Apfelbaum
Quoted 7 lines · Michael S. Tsirkin
Quoted 6 lines · Marcel Apfelbaum

It seems that iasl has an issue when disassembles
some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
I opened a bug on iasl project:
https://github.com/acpica/acpica/issues/20

Quoted 7 lines
Quoted 5 lines

Modified the iasl command line to "iasl -d HPET"
until the problem is solved. The command line
remained the same for DSDT and SSDT tables.

space needed after :

Sure, missed that

Quoted 34 lines
Quoted 34 lines
---
 tests/acpi-test.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
tests/acpi-test.c +6 -4
index 2d32b69..26d2e26 100644
@@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild)
     }
 }
 
-static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
+static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
@@ -419,9 +419,11 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 
     /* build command line */
     g_string_append_printf(command_line, " -p %s ", sdt->asl_file);
-    for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
-        temp = &g_array_index(sdts, AcpiSdtTable, i);
-        g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+    if (referenceDsdt) {
+        for (i = 0; i < 2; ++i) { /* reference DSDT and SSDT */
+            temp = &g_array_index(sdts, AcpiSdtTable, i);
+            g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+        }
     }
     g_string_append_printf(command_line, "-d %s", sdt->aml_file);
 
Quoted 9 lines

tests/acpi-test.c static void test_acpi_asl(test_data *data) · line 515

Quoted 6 lines
tests/acpi-test.c +1 -1
@@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data)
     dump_aml_files(data, false);
     for (i = 0; i < data->ssdt_tables->len; ++i) {
         GString *asl, *exp_asl;
-
+        bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */

Please don't use camelCase for variables.

Quoted 8 lines

Sure, no idea why I did that in the first place...

Quoted 1 line

Can we check the table signature instead of looking at the index?

It is possible, but not really necessary because:
1. The array of expected tables it is created as a shadow of the original tables. (We load the expected tables in the exact order as the originals)
2. The loading is done based on table signatures.
So going over the index in *this* case it means going over the signatures.

Yes but it's really not a good idea to assume that there's a single SSDT, the fact you need a comment shows that it's fragile.
How about a simple API like
compare_signature(GArray *, const char *signature)

Quoted 2 lines

We should also probably rename ssdt_tables to something else if it holds other tables besides ssdt. all_tables?

OK, I'll follow this path

Thanks,
Marcel

Quoted 21 lines
Quoted 21 lines

Thanks for the review,
Marcel

Quoted 15 lines
Quoted 15 lines
tests/acpi-test.c +2 -2
         sdt = &g_array_index(data->ssdt_tables, AcpiSdtTable, i);
         exp_sdt = &g_array_index(exp_data.ssdt_tables, AcpiSdtTable, i);
 
-        load_asl(data->ssdt_tables, sdt);
+        load_asl(data->ssdt_tables, sdt, referenceDsdt);
         asl = normalize_asl(sdt->asl);
 
-        load_asl(exp_data.ssdt_tables, exp_sdt);
+        load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt);
         exp_asl = normalize_asl(exp_sdt->asl);
 
         g_assert(!g_strcmp0(asl->str, exp_asl->str));
Signature · 1 line
1.8.3.1