Commit 821e3227 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

acpi: fix endian-ness for table ids 



when using signature for table ID, we forgot to byte-swap it.
signatures are really ASCII strings, let's treat them as such.
While at it, get rid of most of _SIGNATURE macros.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c225aa3c

hw/i386/acpi-build.c

+16 −15
Original line number Diff line number Diff line
@@ -226,14 +226,14 @@ static void acpi_get_pci_info(PcPciInfo *info) 


static void

build_header(GArray *linker, GArray *table_data,

             AcpiTableHeader *h, uint32_t sig, int len, uint8_t rev)

             AcpiTableHeader *h, const char *sig, int len, uint8_t rev)

{

    h->signature = cpu_to_le32(sig);

    memcpy(&h->signature, sig, 4);

    h->length = cpu_to_le32(len);

    h->revision = rev;

    memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);

    memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4);

    memcpy(h->oem_table_id + 4, (void *)&sig, 4);

    memcpy(h->oem_table_id + 4, sig, 4);

    h->oem_revision = cpu_to_le32(1);

    memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4);

    h->asl_compiler_revision = cpu_to_le32(1);
@@ -495,7 +495,7 @@ static void 
build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info)

{

    AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);

    facs->signature = cpu_to_le32(ACPI_FACS_SIGNATURE);

    memcpy(&facs->signature, "FACS", 4);

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

}
@@ -552,7 +552,7 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm, 
    fadt_setup(fadt, pm);



    build_header(linker, table_data,

                 (void *)fadt, ACPI_FACP_SIGNATURE, sizeof(*fadt), 1);

                 (void *)fadt, "FACP", sizeof(*fadt), 1);

}



static void
@@ -621,7 +621,7 @@ build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, 
    local_nmi->lint         = 1; /* ACPI_LINT1 */



    build_header(linker, table_data,

                 (void *)(table_data->data + madt_start), ACPI_APIC_SIGNATURE,

                 (void *)(table_data->data + madt_start), "APIC",

                 table_data->len - madt_start, 1);

}
@@ -1098,7 +1098,7 @@ build_ssdt(GArray *table_data, GArray *linker, 


    build_header(linker, table_data,

                 (void *)(table_data->data + ssdt_start),

                 ACPI_SSDT_SIGNATURE, table_data->len - ssdt_start, 1);

                 "SSDT", table_data->len - ssdt_start, 1);

}



static void
@@ -1113,7 +1113,7 @@ build_hpet(GArray *table_data, GArray *linker) 
    hpet->timer_block_id = cpu_to_le32(0x8086a201);

    hpet->addr.address = cpu_to_le64(HPET_BASE);

    build_header(linker, table_data,

                 (void *)hpet, ACPI_HPET_SIGNATURE, sizeof(*hpet), 1);

                 (void *)hpet, "HPET", sizeof(*hpet), 1);

}



static void
@@ -1205,7 +1205,7 @@ build_srat(GArray *table_data, GArray *linker, 


    build_header(linker, table_data,

                 (void *)(table_data->data + srat_start),

                 ACPI_SRAT_SIGNATURE,

                 "SRAT",

                 table_data->len - srat_start, 1);

}
@@ -1213,7 +1213,7 @@ static void 
build_mcfg_q35(GArray *table_data, GArray *linker, AcpiMcfgInfo *info)

{

    AcpiTableMcfg *mcfg;

    uint32_t sig;

    const char *sig;

    int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]);



    mcfg = acpi_data_push(table_data, len);
@@ -1230,9 +1230,10 @@ build_mcfg_q35(GArray *table_data, GArray *linker, AcpiMcfgInfo *info) 
     * ACPI spec requires OSPMs to ignore such tables.

     */

    if (info->mcfg_base == PCIE_BASE_ADDR_UNMAPPED) {

        sig = ACPI_RSRV_SIGNATURE;

        /* Reserved signature: ignored by OSPM */

        sig = "QEMU";

    } else {

        sig = ACPI_MCFG_SIGNATURE;

        sig = "MCFG";

    }

    build_header(linker, table_data, (void *)mcfg, sig, len, 1);

}
@@ -1248,7 +1249,7 @@ build_dsdt(GArray *table_data, GArray *linker, AcpiMiscInfo *misc) 
    memcpy(dsdt, misc->dsdt_code, misc->dsdt_size);



    memset(dsdt, 0, sizeof *dsdt);

    build_header(linker, table_data, dsdt, ACPI_DSDT_SIGNATURE,

    build_header(linker, table_data, dsdt, "DSDT",

                 misc->dsdt_size, 1);

}
@@ -1273,7 +1274,7 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets) 
                                       sizeof(uint32_t));

    }

    build_header(linker, table_data,

                 (void *)rsdt, ACPI_RSDT_SIGNATURE, rsdt_len, 1);

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

}



static GArray *
@@ -1284,7 +1285,7 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) 
    bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, 1,

                             true /* fseg memory */);



    rsdp->signature = cpu_to_le64(ACPI_RSDP_SIGNATURE);

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

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

    rsdp->rsdt_physical_address = cpu_to_le32(rsdt);

    /* Address to be filled by Guest linker */

hw/i386/acpi-defs.h

+0 −14
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ struct Acpi20GenericAddress { 
} QEMU_PACKED;

typedef struct Acpi20GenericAddress Acpi20GenericAddress;



#define ACPI_RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "



struct AcpiRsdpDescriptor {        /* Root System Descriptor Pointer */

    uint64_t signature;              /* ACPI signature, contains "RSD PTR " */

    uint8_t  checksum;               /* To make sum of struct == 0 */
@@ -92,7 +90,6 @@ typedef struct AcpiTableHeader AcpiTableHeader; 
/*

 * ACPI 1.0 Fixed ACPI Description Table (FADT)

 */

#define ACPI_FACP_SIGNATURE 0x50434146 // FACP

struct AcpiFadtDescriptorRev1

{

    ACPI_TABLE_HEADER_DEF     /* ACPI common table header */
@@ -141,7 +138,6 @@ typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1; 
/*

 * ACPI 1.0 Root System Description Table (RSDT)

 */

#define ACPI_RSDT_SIGNATURE 0x54445352 // RSDT

struct AcpiRsdtDescriptorRev1

{

    ACPI_TABLE_HEADER_DEF       /* ACPI common table header */
@@ -153,7 +149,6 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1; 
/*

 * ACPI 1.0 Firmware ACPI Control Structure (FACS)

 */

#define ACPI_FACS_SIGNATURE 0x53434146 // FACS

struct AcpiFacsDescriptorRev1

{

    uint32_t signature;           /* ACPI Signature */
@@ -169,7 +164,6 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1; 
/*

 * Differentiated System Description Table (DSDT)

 */

#define ACPI_DSDT_SIGNATURE 0x54445344 // DSDT



/*

 * MADT values and structures
@@ -182,7 +176,6 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1; 


/* Master MADT */



#define ACPI_APIC_SIGNATURE 0x43495041 // APIC

struct AcpiMultipleApicTable

{

    ACPI_TABLE_HEADER_DEF     /* ACPI common table header */
@@ -253,7 +246,6 @@ typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi; 
/*

 * HPET Description Table

 */

#define ACPI_HPET_SIGNATURE 0x54455048 // HPET

struct Acpi20Hpet {

    ACPI_TABLE_HEADER_DEF                    /* ACPI common table header */

    uint32_t           timer_block_id;
@@ -268,7 +260,6 @@ typedef struct Acpi20Hpet Acpi20Hpet; 
 * SRAT (NUMA topology description) table

 */



#define ACPI_SRAT_SIGNATURE 0x54415253 // SRAT

struct AcpiSystemResourceAffinityTable

{

    ACPI_TABLE_HEADER_DEF
@@ -316,11 +307,6 @@ struct AcpiMcfgAllocation { 
} QEMU_PACKED;

typedef struct AcpiMcfgAllocation AcpiMcfgAllocation;



#define ACPI_MCFG_SIGNATURE 0x4746434d       // MCFG



/* Reserved signature: ignored by OSPM */

#define ACPI_RSRV_SIGNATURE 0x554d4551       // QEMU



struct AcpiTableMcfg {

    ACPI_TABLE_HEADER_DEF;

    uint8_t reserved[8];