acpi: set creator_revision in acpi_fill_header

We should have a single place where we write the default value to the
creator revision field. If we ever will have any table created by another
tool, we can overwrite the value afterwards.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index a42a7e6bbd65a90b813f6741d5aee7e4a4d963ac..e38ce19ff7cebc2385dd545807d8389d7c3c1863 100644 (file)
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -478,7 +478,6 @@ static int acpi_create_hpet(struct acpi_hpet *hpet)
        /* Fill out header fields. */
        acpi_fill_header(header, "HPET");
 
-       header->creator_revision = ASL_REVISION;
        header->length = sizeof(struct acpi_hpet);
        header->revision = acpi_get_table_revision(ACPITAB_HPET);
 
@@ -569,7 +568,6 @@ void acpi_fadt_common(struct acpi_fadt *fadt, struct acpi_facs *facs,
        memcpy(header->oem_id, OEM_ID, 6);
        memcpy(header->oem_table_id, OEM_TABLE_ID, 8);
        memcpy(header->creator_id, ASLC_ID, 4);
-       header->creator_revision = 1;
 
        fadt->x_firmware_ctrl = map_to_sysmem(facs);
        fadt->x_dsdt = map_to_sysmem(dsdt);

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index c16ead6a6ec0800b51d4e03f7449bce9faf7fd74..6dbfdb22decfcabfe257ee7b54bb11ac42e26423 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -117,6 +117,7 @@ void acpi_fill_header(struct acpi_table_header *header, char *signature)
        memcpy(header->oem_table_id, OEM_TABLE_ID, 8);
        header->oem_revision = OEM_REVISION;
        memcpy(header->creator_id, ASLC_ID, 4);
+       header->creator_revision = ASL_REVISION;
 }
 
 void acpi_align(struct acpi_ctx *ctx)
@@ -219,7 +220,6 @@ void acpi_create_dbg2(struct acpi_dbg2_header *dbg2,
 
        header->revision = acpi_get_table_revision(ACPITAB_DBG2);
        acpi_fill_header(header, "DBG2");
-       header->creator_revision = ASL_REVISION;
 
        /* One debug device defined */
        dbg2->devices_offset = sizeof(struct acpi_dbg2_header);

diff --git a/lib/acpi/ssdt.c b/lib/acpi/ssdt.c
index e032e266b3cf25800f36996db9f16eba827c88e7..df1d739d11704f1166a58b20e7ee5e47613a3138 100644 (file)
--- a/lib/acpi/ssdt.c
+++ b/lib/acpi/ssdt.c
@@ -23,7 +23,6 @@ int acpi_write_ssdt(struct acpi_ctx *ctx, const struct acpi_writer *entry)
 
        acpi_fill_header(ssdt, "SSDT");
        ssdt->revision = acpi_get_table_revision(ACPITAB_SSDT);
-       ssdt->creator_revision = 1;
        ssdt->length = sizeof(struct acpi_table_header);
 
        acpi_inc(ctx, sizeof(struct acpi_table_header));

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 4db2171a4b170e63789ef6903c8f5431fc894885..7da381f1a54288c5f9b8b179885e3f8bcf2c7064 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -236,7 +236,6 @@ static int dm_test_acpi_fill_header(struct unit_test_state *uts)
        hdr.length = 0x11;
        hdr.revision = 0x22;
        hdr.checksum = 0x33;
-       hdr.creator_revision = 0x44;
        acpi_fill_header(&hdr, "ABCD");
 
        ut_asserteq_mem("ABCD", hdr.signature, sizeof(hdr.signature));
@@ -248,7 +247,7 @@ static int dm_test_acpi_fill_header(struct unit_test_state *uts)
                        sizeof(hdr.oem_table_id));
        ut_asserteq(OEM_REVISION, hdr.oem_revision);
        ut_asserteq_mem(ASLC_ID, hdr.creator_id, sizeof(hdr.creator_id));
-       ut_asserteq(0x44, hdr.creator_revision);
+       ut_asserteq(ASL_REVISION, hdr.creator_revision);
 
        return 0;
 }