Commit 5c5fce1a authored by Samuel Ortiz's avatar Samuel Ortiz Committed by Michael S. Tsirkin
Browse files

hw: arm: Carry RSDP specific data through AcpiRsdpData 



That will allow us to generalize the ARM build_rsdp() routine to support
both legacy RSDP (The current i386 implementation) and extended RSDP
(The ARM implementation).

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3bb3006a

hw/arm/virt-acpi-build.c

+13 −5
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static void acpi_dsdt_add_power_button(Aml *scope) 


/* RSDP */

static void

build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset)

build_rsdp(GArray *rsdp_table, BIOSLinker *linker, AcpiRsdpData *rsdp_data)

{

    AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);

    unsigned xsdt_pa_size = sizeof(rsdp->xsdt_physical_address);
@@ -379,14 +379,14 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) 
                             true /* fseg memory */);



    memcpy(&rsdp->signature, "RSD PTR ", sizeof(rsdp->signature));

    memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, sizeof(rsdp->oem_id));

    memcpy(rsdp->oem_id, rsdp_data->oem_id, sizeof(rsdp->oem_id));

    rsdp->length = cpu_to_le32(sizeof(*rsdp));

    rsdp->revision = 0x02;

    rsdp->revision = rsdp_data->revision;



    /* Address to be filled by Guest linker */

    bios_linker_loader_add_pointer(linker,

        ACPI_BUILD_RSDP_FILE, xsdt_pa_offset, xsdt_pa_size,

        ACPI_BUILD_TABLE_FILE, xsdt_tbl_offset);

        ACPI_BUILD_TABLE_FILE, *rsdp_data->xsdt_tbl_offset);



    /* Checksum to be filled by Guest linker */

    bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
@@ -857,7 +857,15 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) 
    build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);



    /* RSDP is in FSEG memory, so allocate it separately */

    build_rsdp(tables->rsdp, tables->linker, xsdt);

    {

        AcpiRsdpData rsdp_data = {

            .revision = 2,

            .oem_id = ACPI_BUILD_APPNAME6,

            .xsdt_tbl_offset = &xsdt,

            .rsdt_tbl_offset = NULL,

        };

        build_rsdp(tables->rsdp, tables->linker, &rsdp_data);

    }



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

    g_array_free(table_offsets, true);

include/hw/acpi/acpi-defs.h

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */ 
} QEMU_PACKED;

typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor;



typedef struct AcpiRsdpData {

    uint8_t oem_id[6]; /* OEM identification */

    uint8_t revision;  /* Must be 0 for 1.0, 2 for 2.0 */



    unsigned *rsdt_tbl_offset;

    unsigned *xsdt_tbl_offset;

} AcpiRsdpData;



/* Table structure from Linux kernel (the ACPI tables are under the

   BSD license) */