Commit 90c49ef1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



acpi,pc,test bug fixes

More small fixes all over the place.
Notably fixes for big-endian hosts by Marcel.

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

# gpg: Signature made Mon 24 Mar 2014 10:41:07 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  tests/acpi-test: do not fail if iasl is broken
  vl.c: Use MAX_CPUMASK_BITS macro instead of hardcoded constant
  sysemu.h: Document what MAX_CPUMASK_BITS really limits
  acpi: fix endian-ness for table ids
  acpi-test: signature endian-ness fixes
  i386/acpi-build: support hotplug of VCPU with APIC ID 0xFF
  acpi-test: rebuild SSDT
  i386/acpi-build: allow more than 255 elements in CPON
  pc: Refuse max_cpus if it results in too large APIC ID
  acpi: Don't use MAX_CPUMASK_BITS for APIC ID bitmap
  acpi: Assert sts array limit on AcpiCpuHotplug_add()
  pc: Refuse CPU hotplug if the resulting APIC ID is too large
  acpi: Add ACPI_CPU_HOTPLUG_ID_LIMIT macro
  acpi-test: update expected SSDT files
  acpi-build: fix misaligned access

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e12b2a4f dac23a6c

hw/acpi/cpu_hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) 


    *gpe->sts = *gpe->sts | ACPI_CPU_HOTPLUG_STATUS;

    cpu_id = k->get_arch_id(CPU(cpu));

    g_assert((cpu_id / 8) < ACPI_GPE_PROC_LEN);

    g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));

}

hw/i386/acpi-build.c

+28 −22
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include "qom/qom-qobject.h"



typedef struct AcpiCpuInfo {

    DECLARE_BITMAP(found_cpus, MAX_CPUMASK_BITS + 1);

    DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);

} AcpiCpuInfo;



typedef struct AcpiMcfgInfo {
@@ -117,7 +117,7 @@ int acpi_add_cpu_info(Object *o, void *opaque) 


    if (object_dynamic_cast(o, TYPE_CPU)) {

        apic_id = object_property_get_int(o, "apic-id", NULL);

        assert(apic_id <= MAX_CPUMASK_BITS);

        assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT);



        set_bit(apic_id, cpu->found_cpus);

    }
@@ -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);

}
@@ -999,11 +999,16 @@ build_ssdt(GArray *table_data, GArray *linker, 
           AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc,

           PcPciInfo *pci, PcGuestInfo *guest_info)

{

    int acpi_cpus = MIN(0xff, guest_info->apic_id_limit);

    unsigned acpi_cpus = guest_info->apic_id_limit;

    int ssdt_start = table_data->len;

    uint8_t *ssdt_ptr;

    int i;



    /* The current AML generator can cover the APIC ID range [0..255],

     * inclusive, for VCPU hotplug. */

    QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256);

    g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT);



    /* Copy header and patch values in the S3_ / S4_ / S5_ packages */

    ssdt_ptr = acpi_data_push(table_data, sizeof(ssdp_misc_aml));

    memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml));
@@ -1019,8 +1024,8 @@ build_ssdt(GArray *table_data, GArray *linker, 


    patch_pci_windows(pci, ssdt_ptr, sizeof(ssdp_misc_aml));



    *(uint16_t *)(ssdt_ptr + *ssdt_isa_pest) =

        cpu_to_le16(misc->pvpanic_port);

    ACPI_BUILD_SET_LE(ssdt_ptr, sizeof(ssdp_misc_aml),

                      ssdt_isa_pest[0], 16, misc->pvpanic_port);



    {

        GArray *sb_scope = build_alloc_array();
@@ -1050,9 +1055,9 @@ build_ssdt(GArray *table_data, GArray *linker, 


        {

            GArray *package = build_alloc_array();

            uint8_t op = 0x12; /* PackageOp */

            uint8_t op = 0x13; /* VarPackageOp */



            build_append_byte(package, acpi_cpus); /* NumElements */

            build_append_int(package, acpi_cpus); /* VarNumElements */

            for (i = 0; i < acpi_cpus; i++) {

                uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00;

                build_append_byte(package, b);
@@ -1093,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
@@ -1108,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
@@ -1200,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);

}
@@ -1208,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);
@@ -1225,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);

}
@@ -1243,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);

}
@@ -1268,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 *
@@ -1279,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];

hw/i386/pc.c

+16 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include "qemu/bitmap.h"

#include "qemu/config-file.h"

#include "hw/acpi/acpi.h"

#include "hw/acpi/cpu_hotplug.h"

#include "hw/cpu/icc_bus.h"

#include "hw/boards.h"

#include "hw/pci/pci_host.h"
@@ -974,6 +975,13 @@ void pc_hot_add_cpu(const int64_t id, Error **errp) 
        return;

    }



    if (apic_id >= ACPI_CPU_HOTPLUG_ID_LIMIT) {

        error_setg(errp, "Unable to add CPU: %" PRIi64

                   ", resulting APIC ID (%" PRIi64 ") is too large",

                   id, apic_id);

        return;

    }



    icc_bridge = DEVICE(object_resolve_path_type("icc-bridge",

                                                 TYPE_ICC_BRIDGE, NULL));

    pc_new_cpu(current_cpu_model, apic_id, icc_bridge, errp);
@@ -984,6 +992,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) 
    int i;

    X86CPU *cpu = NULL;

    Error *error = NULL;

    unsigned long apic_id_limit;



    /* init CPUs */

    if (cpu_model == NULL) {
@@ -995,6 +1004,13 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) 
    }

    current_cpu_model = cpu_model;



    apic_id_limit = pc_apic_id_limit(max_cpus);

    if (apic_id_limit > ACPI_CPU_HOTPLUG_ID_LIMIT) {

        error_report("max_cpus is too large. APIC ID of last CPU is %lu",

                     apic_id_limit - 1);

        exit(1);

    }



    for (i = 0; i < smp_cpus; i++) {

        cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),

                         icc_bridge, &error);

include/hw/acpi/cpu_hotplug_defs.h

+8 −0
Original line number Diff line number Diff line
@@ -17,7 +17,15 @@ 
 * between C and ASL code.

 */

#define ACPI_CPU_HOTPLUG_STATUS 4



/* Limit for CPU arch IDs for CPU hotplug. All hotpluggable CPUs should

 * have CPUClass.get_arch_id() < ACPI_CPU_HOTPLUG_ID_LIMIT.

 */

#define ACPI_CPU_HOTPLUG_ID_LIMIT 256



/* 256 CPU IDs, 8 bits per entry: */

#define ACPI_GPE_PROC_LEN 32



#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8

#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00