Commit 791b7d23 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pc, pci, virtio: new features, cleanups, fixes

iommus can not be added with -device.
cleanups and fixes all over the place

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

# gpg: Signature made Tue 05 Jul 2016 11:18:32 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# 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: (30 commits)
  vmw_pvscsi: remove unnecessary internal msi state flag
  e1000e: remove unnecessary internal msi state flag
  vmxnet3: remove unnecessary internal msi state flag
  mptsas: remove unnecessary internal msi state flag
  megasas: remove unnecessary megasas_use_msi()
  pci: Convert msi_init() to Error and fix callers to check it
  pci bridge dev: change msi property type
  megasas: change msi/msix property type
  mptsas: change msi property type
  intel-hda: change msi property type
  usb xhci: change msi/msix property type
  change pvscsi_init_msi() type to void
  tests: add APIC.cphp and DSDT.cphp blobs
  tests: acpi: add CPU hotplug testcase
  log: Permit -dfilter 0..0xffffffffffffffff
  range: Replace internal representation of Range
  range: Eliminate direct Range member access
  log: Clean up misuse of Range for -dfilter
  pci_register_bar: cleanup
  Revert "virtio-net: unbreak self announcement and guest offloads after migration"
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 60a0f1af 269fe4c3

hw/audio/intel-hda.c

+23 −6
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct IntelHDAState { 


    /* properties */

    uint32_t debug;

    uint32_t msi;

    OnOffAuto msi;

    bool old_msi_addr;

};
@@ -256,7 +256,7 @@ static void intel_hda_update_int_sts(IntelHDAState *d) 


static void intel_hda_update_irq(IntelHDAState *d)

{

    int msi = d->msi && msi_enabled(&d->pci);

    bool msi = msi_enabled(&d->pci);

    int level;



    intel_hda_update_int_sts(d);
@@ -1132,6 +1132,8 @@ static void intel_hda_realize(PCIDevice *pci, Error **errp) 
{

    IntelHDAState *d = INTEL_HDA(pci);

    uint8_t *conf = d->pci.config;

    Error *err = NULL;

    int ret;



    d->name = object_get_typename(OBJECT(d));
@@ -1140,12 +1142,27 @@ static void intel_hda_realize(PCIDevice *pci, Error **errp) 
    /* HDCTL off 0x40 bit 0 selects signaling mode (1-HDA, 0 - Ac97) 18.1.19 */

    conf[0x40] = 0x01;



    if (d->msi != ON_OFF_AUTO_OFF) {

        ret = msi_init(&d->pci, d->old_msi_addr ? 0x50 : 0x60,

                       1, true, false, &err);

        /* Any error other than -ENOTSUP(board's MSI support is broken)

         * is a programming error */

        assert(!ret || ret == -ENOTSUP);

        if (ret && d->msi == ON_OFF_AUTO_ON) {

            /* Can't satisfy user's explicit msi=on request, fail */

            error_append_hint(&err, "You have to use msi=auto (default) or "

                    "msi=off with this machine type.\n");

            error_propagate(errp, err);

            return;

        }

        assert(!err || d->msi == ON_OFF_AUTO_AUTO);

        /* With msi=auto, we fall back to MSI off silently */

        error_free(err);

    }



    memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d,

                          "intel-hda", 0x4000);

    pci_register_bar(&d->pci, 0, 0, &d->mmio);

    if (d->msi) {

        msi_init(&d->pci, d->old_msi_addr ? 0x50 : 0x60, 1, true, false);

    }



    hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs),

                       intel_hda_response, intel_hda_xfer);
@@ -1235,7 +1252,7 @@ static const VMStateDescription vmstate_intel_hda = { 


static Property intel_hda_properties[] = {

    DEFINE_PROP_UINT32("debug", IntelHDAState, debug, 0),

    DEFINE_PROP_UINT32("msi", IntelHDAState, msi, 1),

    DEFINE_PROP_ON_OFF_AUTO("msi", IntelHDAState, msi, ON_OFF_AUTO_AUTO),

    DEFINE_PROP_BOOL("old_msi_addr", IntelHDAState, old_msi_addr, false),

    DEFINE_PROP_END_OF_LIST(),

};

hw/core/machine.c

+0 −20
Original line number Diff line number Diff line
@@ -300,20 +300,6 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp) 
    ms->firmware = g_strdup(value);

}



static bool machine_get_iommu(Object *obj, Error **errp)

{

    MachineState *ms = MACHINE(obj);



    return ms->iommu;

}



static void machine_set_iommu(Object *obj, bool value, Error **errp)

{

    MachineState *ms = MACHINE(obj);



    ms->iommu = value;

}



static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp)

{

    MachineState *ms = MACHINE(obj);
@@ -493,12 +479,6 @@ static void machine_initfn(Object *obj) 
    object_property_set_description(obj, "firmware",

                                    "Firmware image",

                                    NULL);

    object_property_add_bool(obj, "iommu",

                             machine_get_iommu,

                             machine_set_iommu, NULL);

    object_property_set_description(obj, "iommu",

                                    "Set on/off to enable/disable Intel IOMMU (VT-d)",

                                    NULL);

    object_property_add_bool(obj, "suppress-vmdesc",

                             machine_get_suppress_vmdesc,

                             machine_set_suppress_vmdesc, NULL);

hw/i386/acpi-build.c

+24 −20
Original line number Diff line number Diff line
@@ -229,26 +229,27 @@ static Object *acpi_get_i386_pci_host(void) 
    return OBJECT(host);

}



static void acpi_get_pci_info(PcPciInfo *info)

static void acpi_get_pci_holes(Range *hole, Range *hole64)

{

    Object *pci_host;





    pci_host = acpi_get_i386_pci_host();

    g_assert(pci_host);



    info->w32.begin = object_property_get_int(pci_host,

    range_set_bounds1(hole,

                      object_property_get_int(pci_host,

                                              PCI_HOST_PROP_PCI_HOLE_START,

                                              NULL);

    info->w32.end = object_property_get_int(pci_host,

                                              NULL),

                      object_property_get_int(pci_host,

                                              PCI_HOST_PROP_PCI_HOLE_END,

                                            NULL);

    info->w64.begin = object_property_get_int(pci_host,

                                              NULL));

    range_set_bounds1(hole64,

                      object_property_get_int(pci_host,

                                              PCI_HOST_PROP_PCI_HOLE64_START,

                                              NULL);

    info->w64.end = object_property_get_int(pci_host,

                                              NULL),

                      object_property_get_int(pci_host,

                                              PCI_HOST_PROP_PCI_HOLE64_END,

                                            NULL);

                                              NULL));

}



#define ACPI_PORT_SMI_CMD           0x00b2 /* TODO: this is APM_CNT_IOPORT */
@@ -1890,7 +1891,7 @@ static Aml *build_q35_osc_method(void) 
static void

build_dsdt(GArray *table_data, BIOSLinker *linker,

           AcpiPmInfo *pm, AcpiMiscInfo *misc,

           PcPciInfo *pci, MachineState *machine)

           Range *pci_hole, Range *pci_hole64, MachineState *machine)

{

    CrsRangeEntry *entry;

    Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs;
@@ -2047,7 +2048,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
                         AML_CACHEABLE, AML_READ_WRITE,

                         0, 0x000A0000, 0x000BFFFF, 0, 0x00020000));



    crs_replace_with_free_ranges(mem_ranges, pci->w32.begin, pci->w32.end - 1);

    crs_replace_with_free_ranges(mem_ranges,

                                 range_lob(pci_hole),

                                 range_upb(pci_hole));

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

        entry = g_ptr_array_index(mem_ranges, i);

        aml_append(crs,
@@ -2057,12 +2060,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
                             0, entry->limit - entry->base + 1));

    }



    if (pci->w64.begin) {

    if (!range_is_empty(pci_hole64)) {

        aml_append(crs,

            aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,

                             AML_CACHEABLE, AML_READ_WRITE,

                             0, pci->w64.begin, pci->w64.end - 1, 0,

                             pci->w64.end - pci->w64.begin));

                             0, range_lob(pci_hole64), range_upb(pci_hole64), 0,

                             range_upb(pci_hole64) + 1 - range_lob(pci_hole64)));

    }



    if (misc->tpm_version != TPM_VERSION_UNSPEC) {
@@ -2554,7 +2557,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
    AcpiPmInfo pm;

    AcpiMiscInfo misc;

    AcpiMcfgInfo mcfg;

    PcPciInfo pci;

    Range pci_hole, pci_hole64;

    uint8_t *u;

    size_t aml_len = 0;

    GArray *tables_blob = tables->table_data;
@@ -2562,7 +2565,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 


    acpi_get_pm_info(&pm);

    acpi_get_misc_info(&misc);

    acpi_get_pci_info(&pci);

    acpi_get_pci_holes(&pci_hole, &pci_hole64);

    acpi_get_slic_oem(&slic_oem);



    table_offsets = g_array_new(false, true /* clear */,
@@ -2584,7 +2587,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 


    /* DSDT is pointed to by FADT */

    dsdt = tables_blob->len;

    build_dsdt(tables_blob, tables->linker, &pm, &misc, &pci, machine);

    build_dsdt(tables_blob, tables->linker, &pm, &misc,

               &pci_hole, &pci_hole64, machine);



    /* Count the size of the DSDT and SSDT, we will need it for legacy

     * sizing of ACPI tables.

hw/i386/intel_iommu.c

+16 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "intel_iommu_internal.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_bus.h"

#include "hw/i386/pc.h"



/*#define DEBUG_INTEL_IOMMU*/

#ifdef DEBUG_INTEL_IOMMU
@@ -2026,8 +2027,20 @@ static void vtd_reset(DeviceState *dev) 
    vtd_init(s);

}



static AddressSpace *vtd_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)

{

    IntelIOMMUState *s = opaque;

    VTDAddressSpace *vtd_as;



    assert(0 <= devfn && devfn <= VTD_PCI_DEVFN_MAX);



    vtd_as = vtd_find_add_as(s, bus, devfn);

    return &vtd_as->as;

}



static void vtd_realize(DeviceState *dev, Error **errp)

{

    PCIBus *bus = PC_MACHINE(qdev_get_machine())->bus;

    IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);



    VTD_DPRINTF(GENERAL, "");
@@ -2041,6 +2054,8 @@ static void vtd_realize(DeviceState *dev, Error **errp) 
    s->vtd_as_by_busptr = g_hash_table_new_full(vtd_uint64_hash, vtd_uint64_equal,

                                              g_free, g_free);

    vtd_init(s);

    sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, Q35_HOST_BRIDGE_IOMMU_ADDR);

    pci_setup_iommu(bus, vtd_host_dma_iommu, dev);

}



static void vtd_class_init(ObjectClass *klass, void *data)
@@ -2051,6 +2066,7 @@ static void vtd_class_init(ObjectClass *klass, void *data) 
    dc->realize = vtd_realize;

    dc->vmsd = &vtd_vmstate;

    dc->props = vtd_properties;

    dc->hotpluggable = false;

}



static const TypeInfo vtd_info = {

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ static void pc_machine_initfn(Object *obj) 
                        pc_machine_get_hotplug_memory_region_size,

                        NULL, NULL, NULL, &error_abort);



    pcms->max_ram_below_4g = 0xe0000000; /* 3.5G */

    pcms->max_ram_below_4g = 0; /* use default */

    object_property_add(obj, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

                        pc_machine_get_max_ram_below_4g,

                        pc_machine_set_max_ram_below_4g,