Commit f2f616ce authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

tests: acpi: make RSDT test routine handle XSDT 



If RSDP revision is more than 0 fetch table pointed by XSDT
and fallback to legacy RSDT table otherwise.

While at it drop unused acpi_get_xsdt_address().

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1556808723-226478-4-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 4b14d543

tests/acpi-utils.c

+0 −12
Original line number Diff line number Diff line
@@ -51,18 +51,6 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) 
    return off;

}



uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table)

{

    uint64_t xsdt_physical_address;

    uint8_t revision = rsdp_table[15 /* Revision offset */];



    /* We must have revision 2 if we're looking for an XSDT pointer */

    g_assert(revision == 2);



    memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8);

    return le64_to_cpu(xsdt_physical_address);

}



void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table)

{

    uint8_t revision;

tests/acpi-utils.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ typedef struct { 


uint8_t acpi_calc_checksum(const uint8_t *data, int len);

uint32_t acpi_find_rsdp_address(QTestState *qts);

uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table);

void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table);

void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len,

                      const uint8_t *addr_ptr, int addr_size, const char *sig,

tests/bios-tables-test.c

+14 −6
Original line number Diff line number Diff line
@@ -107,21 +107,29 @@ static void test_acpi_rsdp_table(test_data *data) 
    }

}



static void test_acpi_rsdt_table(test_data *data)

static void test_acpi_rxsdt_table(test_data *data)

{

    const char *sig = "RSDT";

    AcpiSdtTable rsdt = {};

    int entry_size = 4;

    int addr_off = 16 /* RsdtAddress */;

    uint8_t *ent;



    /* read RSDT table */

    if (data->rsdp_table[15 /* Revision offset */] != 0) {

        addr_off = 24 /* XsdtAddress */;

        entry_size = 8;

        sig = "XSDT";

    }

    /* read [RX]SDT table */

    acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len,

                     &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", true);

                     &data->rsdp_table[addr_off], entry_size, sig, true);



    /* Load all tables and add to test list directly RSDT referenced tables */

    ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size */) {

    ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) {

        AcpiSdtTable ssdt_table = {};



        acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent,

                         4, NULL, true);

                         entry_size, NULL, true);

        /* Add table to ASL test tables list */

        g_array_append_val(data->tables, ssdt_table);

    }
@@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data) 
    data->tables = g_array_new(false, true, sizeof(AcpiSdtTable));

    test_acpi_rsdp_address(data);

    test_acpi_rsdp_table(data);

    test_acpi_rsdt_table(data);

    test_acpi_rxsdt_table(data);

    test_acpi_fadt_table(data);



    if (iasl) {