Commit b00c92e3 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio fixes and cleanups

A bunch of fixes all over the place.  Also, beginning to generalize acpi build
code for reuse by ARM.

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

# gpg: Signature made Tue 27 Jan 2015 13:12:25 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  pc-dimm: Add Error argument to pc_existing_dimms_capacity
  pc-dimm: Make pc_existing_dimms_capacity global
  pc: Fix DIMMs capacity calculation
  smbios: Don't report unknown CPU speed (fix SVVP regression)
  smbios: Fix dimm size calculation when RAM is multiple of 16GB
  bios-linker-loader: move source to common location
  bios-linker-loader: move header to common location
  virtio: fix feature bit checks
  bios-tables-test: split piix4 and q35 tests
  acpi: build_append_nameseg(): add padding if necessary
  acpi: update generated hex files
  acpi-test: update expected DSDT
  pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled
  pci: Split pcie_host_mmcfg_map()
  Add some trace calls to pci.c.
  ich9: add disable_s3, disable_s4, s4_val properties

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7baef630 37153450

hw/acpi/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o

common-obj-$(CONFIG_ACPI) += memory_hotplug.o

common-obj-$(CONFIG_ACPI) += acpi_interface.o

common-obj-$(CONFIG_ACPI) += bios-linker-loader.o

hw/i386/bios-linker-loader.c→hw/acpi/bios-linker-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 */



#include "qemu-common.h"

#include "bios-linker-loader.h"

#include "hw/acpi/bios-linker-loader.h"

#include "hw/nvram/fw_cfg.h"



#include "qemu/bswap.h"

hw/acpi/ich9.c

+97 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, 


    acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);

    acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);

    acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, 2);

    acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->s4_val);



    acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);

    memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm,
@@ -269,10 +269,94 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value, 
    s->pm.acpi_memory_hotplug.is_enabled = value;

}



static void ich9_pm_get_disable_s3(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->disable_s3;



    visit_type_uint8(v, &value, name, errp);

}



static void ich9_pm_set_disable_s3(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;

    uint8_t value;



    visit_type_uint8(v, &value, name, &local_err);

    if (local_err) {

        goto out;

    }

    pm->disable_s3 = value;

out:

    error_propagate(errp, local_err);

}



static void ich9_pm_get_disable_s4(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->disable_s4;



    visit_type_uint8(v, &value, name, errp);

}



static void ich9_pm_set_disable_s4(Object *obj, Visitor *v,

                                   void *opaque, const char *name,

                                   Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;

    uint8_t value;



    visit_type_uint8(v, &value, name, &local_err);

    if (local_err) {

        goto out;

    }

    pm->disable_s4 = value;

out:

    error_propagate(errp, local_err);

}



static void ich9_pm_get_s4_val(Object *obj, Visitor *v,

                               void *opaque, const char *name,

                               Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    uint8_t value = pm->s4_val;



    visit_type_uint8(v, &value, name, errp);

}



static void ich9_pm_set_s4_val(Object *obj, Visitor *v,

                               void *opaque, const char *name,

                               Error **errp)

{

    ICH9LPCPMRegs *pm = opaque;

    Error *local_err = NULL;

    uint8_t value;



    visit_type_uint8(v, &value, name, &local_err);

    if (local_err) {

        goto out;

    }

    pm->s4_val = value;

out:

    error_propagate(errp, local_err);

}



void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)

{

    static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;

    pm->acpi_memory_hotplug.is_enabled = true;

    pm->disable_s3 = 0;

    pm->disable_s4 = 0;

    pm->s4_val = 2;



    object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,

                                   &pm->pm_io_base, errp);
@@ -285,6 +369,18 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) 
                             ich9_pm_get_memory_hotplug_support,

                             ich9_pm_set_memory_hotplug_support,

                             NULL);

    object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",

                        ich9_pm_get_disable_s3,

                        ich9_pm_set_disable_s3,

                        NULL, pm, NULL);

    object_property_add(obj, ACPI_PM_PROP_S4_DISABLED, "uint8",

                        ich9_pm_get_disable_s4,

                        ich9_pm_set_disable_s4,

                        NULL, pm, NULL);

    object_property_add(obj, ACPI_PM_PROP_S4_VAL, "uint8",

                        ich9_pm_get_s4_val,

                        ich9_pm_set_s4_val,

                        NULL, pm, NULL);

}



void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp)

hw/i386/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ 


obj-y += kvmvapic.o

obj-y += acpi-build.o

obj-y += bios-linker-loader.o

hw/i386/acpi-build.o: hw/i386/acpi-build.c hw/i386/acpi-dsdt.hex \

	hw/i386/ssdt-proc.hex hw/i386/ssdt-pcihp.hex hw/i386/ssdt-misc.hex \

	hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex \

hw/i386/acpi-build.c

+11 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "hw/i386/acpi-defs.h"

#include "hw/acpi/acpi.h"

#include "hw/nvram/fw_cfg.h"

#include "bios-linker-loader.h"

#include "hw/acpi/bios-linker-loader.h"

#include "hw/loader.h"

#include "hw/isa/isa.h"

#include "hw/acpi/memory_hotplug.h"
@@ -305,6 +305,8 @@ static inline void build_append_array(GArray *array, GArray *val) 
    g_array_append_vals(array, val->data, val->len);

}



#define ACPI_NAMESEG_LEN 4



static void GCC_FMT_ATTR(2, 3)

build_append_nameseg(GArray *array, const char *format, ...)

{
@@ -317,8 +319,11 @@ build_append_nameseg(GArray *array, const char *format, ...) 
    len = vsnprintf(s, sizeof s, format, args);

    va_end(args);



    assert(len == 4);

    assert(len <= ACPI_NAMESEG_LEN);



    g_array_append_vals(array, s, len);

    /* Pad up to ACPI_NAMESEG_LEN characters if necessary. */

    g_array_append_vals(array, "____", ACPI_NAMESEG_LEN - len);

}



/* 5.4 Definition Block Encoding */
@@ -859,7 +864,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 


    if (bus->parent_dev) {

        op = 0x82; /* DeviceOp */

        build_append_nameseg(bus_table, "S%.02X_",

        build_append_nameseg(bus_table, "S%.02X",

                             bus->parent_dev->devfn);

        build_append_byte(bus_table, 0x08); /* NameOp */

        build_append_nameseg(bus_table, "_SUN");
@@ -979,7 +984,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 
            build_append_int(notify, 0x1U << i);

            build_append_byte(notify, 0x00); /* NullName */

            build_append_byte(notify, 0x86); /* NotifyOp */

            build_append_nameseg(notify, "S%.02X_", PCI_DEVFN(i, 0));

            build_append_nameseg(notify, "S%.02X", PCI_DEVFN(i, 0));

            build_append_byte(notify, 0x69); /* Arg1Op */



            /* Pack it up */
@@ -1036,7 +1041,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 
        if (bus->parent_dev) {

            build_append_byte(parent->notify_table, '^'); /* ParentPrefixChar */

            build_append_byte(parent->notify_table, 0x2E); /* DualNamePrefix */

            build_append_nameseg(parent->notify_table, "S%.02X_",

            build_append_nameseg(parent->notify_table, "S%.02X",

                                 bus->parent_dev->devfn);

            build_append_nameseg(parent->notify_table, "PCNT");

        }
@@ -1106,7 +1111,7 @@ build_ssdt(GArray *table_data, GArray *linker, 
        GArray *sb_scope = build_alloc_array();

        uint8_t op = 0x10; /* ScopeOp */



        build_append_nameseg(sb_scope, "_SB_");

        build_append_nameseg(sb_scope, "_SB");



        /* build Processor object for each processor */

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