Commit 2e68b862 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20190219' into staging 



ppc patch queue 2019-02-19

Here's the next batch of ppc and spapr patches.  Higlights are:

 * A bunch of improvements to TCG handling of vector instructions from
   Richard Henderson and Marc Cave-Ayland

 * Cleanup to the XICS interrupt controller from Greg Kurz, removing
   the special KVM subclasses which were a bad idea

 * Some refinements to the XIVE interrupt controller from Cédric Le
   Goater

 * Fix from Fabiano Rosas for a really dumb buffer overflow in the
   device tree code for memory hotplug

 * Code for allowing access to SPRs from the gdb stub from Fabiano
   Rosas

 * Assorted minor fixes and cleanups

# gpg: Signature made Mon 18 Feb 2019 13:47:54 GMT
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-4.0-20190219: (43 commits)
  target/ppc: convert vmin* and vmax* to vector operations
  target/ppc: convert vadd*s and vsub*s to vector operations
  target/ppc: Split out VSCR_SAT to a vector field
  target/ppc: Add set_vscr_sat
  target/ppc: Use mtvscr/mfvscr for vmstate
  target/ppc: Add helper_mfvscr
  target/ppc: Remove vscr_nj and vscr_sat
  target/ppc: Use helper_mtvscr for reset and gdb
  target/ppc: Pass integer to helper_mtvscr
  target/ppc: convert xxsel to vector operations
  target/ppc: convert xxspltw to vector operations
  target/ppc: convert xxspltib to vector operations
  target/ppc: convert VSX logical operations to vector operations
  target/ppc: convert vsplt[bhw] to use vector operations
  target/ppc: convert vspltis[bhw] to use vector operations
  target/ppc: convert vaddu[b,h,w,d] and vsubu[b,h,w,d] over to use vector operations
  target/ppc: convert VMX logical instructions to use vector operations
  xics: Drop the KVM ICS class
  spapr/irq: Use the "simple" ICS class for KVM
  xics: Handle KVM interrupt presentation from "simple" ICS code
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a0430dd8 73e14c6a

hw/acpi/pcihp.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
            object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {

            PCIBus *sec = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev));



            qbus_set_hotplug_handler(BUS(sec), DEVICE(hotplug_dev),

            qbus_set_hotplug_handler(BUS(sec), OBJECT(hotplug_dev),

                                     &error_abort);

            /* We don't have to overwrite any other hotplug handler yet */

            assert(QLIST_EMPTY(&sec->child));

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) 


    piix4_acpi_system_hot_add_init(pci_address_space_io(dev),

                                   pci_get_bus(dev), s);

    qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), DEVICE(s), &error_abort);

    qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s), &error_abort);



    piix4_pm_add_propeties(s);

}

hw/char/virtio-serial-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp) 
    /* Spawn a new virtio-serial bus on which the ports will ride as devices */

    qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS,

                        dev, vdev->bus_name);

    qbus_set_hotplug_handler(BUS(&vser->bus), DEVICE(vser), errp);

    qbus_set_hotplug_handler(BUS(&vser->bus), OBJECT(vser), errp);

    vser->bus.vser = vser;

    QTAILQ_INIT(&vser->ports);

hw/core/bus.c

+2 −9
Original line number Diff line number Diff line
@@ -22,22 +22,15 @@ 
#include "hw/qdev.h"

#include "qapi/error.h"



static void qbus_set_hotplug_handler_internal(BusState *bus, Object *handler,

                                              Error **errp)

void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp)

{



    object_property_set_link(OBJECT(bus), OBJECT(handler),

                             QDEV_HOTPLUG_HANDLER_PROPERTY, errp);

}



void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler, Error **errp)

{

    qbus_set_hotplug_handler_internal(bus, OBJECT(handler), errp);

}



void qbus_set_bus_hotplug_handler(BusState *bus, Error **errp)

{

    qbus_set_hotplug_handler_internal(bus, OBJECT(bus), errp);

    qbus_set_hotplug_handler(bus, OBJECT(bus), errp);

}



int qbus_walk_children(BusState *bus,

hw/intc/spapr_xive.c

+3 −4
Original line number Diff line number Diff line
@@ -489,20 +489,19 @@ bool spapr_xive_irq_claim(sPAPRXive *xive, uint32_t lisn, bool lsi) 
    }



    xive->eat[lisn].w |= cpu_to_be64(EAS_VALID);

    xive_source_irq_set(xsrc, lisn, lsi);

    if (lsi) {

        xive_source_irq_set_lsi(xsrc, lisn);

    }

    return true;

}



bool spapr_xive_irq_free(sPAPRXive *xive, uint32_t lisn)

{

    XiveSource *xsrc = &xive->source;



    if (lisn >= xive->nr_irqs) {

        return false;

    }



    xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);

    xive_source_irq_set(xsrc, lisn, false);

    return true;

}