Commit 243bdb79 authored by Shannon Zhao's avatar Shannon Zhao Committed by Peter Maydell
Browse files

hw/arm/virt-acpi-build: Generate RSDT table 



RSDT points to other tables FADT, MADT, GTDT. This code is shared with x86.

Here we still use RSDT as UEFI puts ACPI tables below 4G address space,
and UEFI ignore the RSDT or XSDT.

Signed-off-by: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 1432522520-8068-12-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent ee246400

hw/acpi/aml-build.c

+24 −0
Original line number Diff line number Diff line
@@ -1006,3 +1006,27 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) 
    g_array_free(tables->table_data, true);

    g_array_free(tables->tcpalog, mfre);

}



/* Build rsdt table */

void

build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets)

{

    AcpiRsdtDescriptorRev1 *rsdt;

    size_t rsdt_len;

    int i;

    const int table_data_len = (sizeof(uint32_t) * table_offsets->len);



    rsdt_len = sizeof(*rsdt) + table_data_len;

    rsdt = acpi_data_push(table_data, rsdt_len);

    memcpy(rsdt->table_offset_entry, table_offsets->data, table_data_len);

    for (i = 0; i < table_offsets->len; ++i) {

        /* rsdt->table_offset_entry to be filled by Guest linker */

        bios_linker_loader_add_pointer(linker,

                                       ACPI_BUILD_TABLE_FILE,

                                       ACPI_BUILD_TABLE_FILE,

                                       table_data, &rsdt->table_offset_entry[i],

                                       sizeof(uint32_t));

    }

    build_header(linker, table_data,

                 (void *)rsdt, "RSDT", rsdt_len, 1);

}

hw/arm/virt-acpi-build.c

+3 −0
Original line number Diff line number Diff line
@@ -321,6 +321,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) 
    acpi_add_table(table_offsets, tables_blob);

    build_gtdt(tables_blob, tables->linker);



    /* RSDT is pointed to by RSDP */

    build_rsdt(tables_blob, tables->linker, table_offsets);



    /* Cleanup memory that's no longer used. */

    g_array_free(table_offsets, true);

}

hw/i386/acpi-build.c

+0 −24
Original line number Diff line number Diff line
@@ -1208,30 +1208,6 @@ build_dsdt(GArray *table_data, GArray *linker, AcpiMiscInfo *misc) 
                 misc->dsdt_size, 1);

}



/* Build final rsdt table */

static void

build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets)

{

    AcpiRsdtDescriptorRev1 *rsdt;

    size_t rsdt_len;

    int i;



    rsdt_len = sizeof(*rsdt) + sizeof(uint32_t) * table_offsets->len;

    rsdt = acpi_data_push(table_data, rsdt_len);

    memcpy(rsdt->table_offset_entry, table_offsets->data,

           sizeof(uint32_t) * table_offsets->len);

    for (i = 0; i < table_offsets->len; ++i) {

        /* rsdt->table_offset_entry to be filled by Guest linker */

        bios_linker_loader_add_pointer(linker,

                                       ACPI_BUILD_TABLE_FILE,

                                       ACPI_BUILD_TABLE_FILE,

                                       table_data, &rsdt->table_offset_entry[i],

                                       sizeof(uint32_t));

    }

    build_header(linker, table_data,

                 (void *)rsdt, "RSDT", rsdt_len, 1);

}



static GArray *

build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt)

{

include/hw/acpi/aml-build.h

+2 −0
Original line number Diff line number Diff line
@@ -266,5 +266,7 @@ unsigned acpi_data_len(GArray *table); 
void acpi_add_table(GArray *table_offsets, GArray *table_data);

void acpi_build_tables_init(AcpiBuildTables *tables);

void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);

void

build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets);



#endif