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

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



ppc patch queue for 2019-03-10

This pull requests supersedes ppc-for-4.0-20190310.  Changes are:
 * Fixed a bunch of minor style problems
 * Suppressed warnings about Spectre/Meltdown mitigations with TCG
 * Added one more patch, a preliminary fix towards the not-quite-ready
   support for NVLink VFIO passthrough.

This is a final pull request before the 4.0 soft freeze.  Changes
include:
  * A Great Renaming to use camel case properly in spapr code
  * Optimization of some vector instructions
  * Support for POWER9 cpus in the powernv machine
  * Fixes a regression from the last pull request in handling VSX
    instructions with mixed operands from the FPR and VMX parts of the
    register array
  * Optimization hack to avoid scanning all the (empty) entries on a
    new IOMMU window
  * Add FSL I2C controller model for E500
  * Support for KVM acceleration of the H_PAGE_INIT hypercall on spapr
  * Update u-boot image for E500
  * Enable Specre/Meltdown mitigations by default on the new machine type
  * Enable large decrementer support for POWER9

# gpg: Signature made Tue 12 Mar 2019 08:14:51 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-20190312: (62 commits)
  vfio: Make vfio_get_region_info_cap public
  Suppress test warnings about missing Spectre/Meltdown mitigations with TCG
  spapr: Use CamelCase properly
  target/ppc: Optimize x[sv]xsigdp using deposit_i64()
  target/ppc: Optimize xviexpdp() using deposit_i64()
  target/ppc: add HV support for POWER9
  ppc/pnv: add a "ibm,opal/power-mgt" device tree node on POWER9
  ppc/pnv: add more dummy XSCOM addresses
  ppc/pnv: activate XSCOM tests for POWER9
  ppc/pnv: POWER9 XSCOM quad support
  ppc/pnv: extend XSCOM core support for POWER9
  ppc/pnv: add a OCC model for POWER9
  ppc/pnv: add a OCC model class
  ppc/pnv: add SerIRQ routing registers
  ppc/pnv: add a LPC Controller model for POWER9
  ppc/pnv: add a 'dt_isa_nodename' to the chip
  ppc/pnv: add a LPC Controller class model
  ppc/pnv: lpc: fix OPB address ranges
  ppc/pnv: add a PSI bridge model for POWER9
  ppc/pnv: add a PSI bridge class model
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 377b155b 013002f0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ L: qemu-ppc@nongnu.org 
S: Odd Fixes

F: hw/ppc/e500*

F: hw/gpio/mpc8xxx.c

F: hw/i2c/mpc_i2c.c

F: hw/net/fsl_etsec/

F: hw/pci-host/ppce500.c

F: include/hw/ppc/ppc_e500.h

default-configs/ppc-softmmu.mak

+2 −0
Original line number Diff line number Diff line 
# Default configuration for ppc-softmmu



# For embedded PPCs:

CONFIG_MPC_I2C=y

CONFIG_DS1338=y

CONFIG_E500=y

CONFIG_PPC405=y

CONFIG_PPC440=y

hw/char/spapr_vty.c

+29 −29
Original line number Diff line number Diff line
@@ -10,27 +10,27 @@ 


#define VTERM_BUFSIZE   16



typedef struct VIOsPAPRVTYDevice {

    VIOsPAPRDevice sdev;

typedef struct SpaprVioVty {

    SpaprVioDevice sdev;

    CharBackend chardev;

    uint32_t in, out;

    uint8_t buf[VTERM_BUFSIZE];

} VIOsPAPRVTYDevice;

} SpaprVioVty;



#define TYPE_VIO_SPAPR_VTY_DEVICE "spapr-vty"

#define VIO_SPAPR_VTY_DEVICE(obj) \

     OBJECT_CHECK(VIOsPAPRVTYDevice, (obj), TYPE_VIO_SPAPR_VTY_DEVICE)

     OBJECT_CHECK(SpaprVioVty, (obj), TYPE_VIO_SPAPR_VTY_DEVICE)



static int vty_can_receive(void *opaque)

{

    VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque);

    SpaprVioVty *dev = VIO_SPAPR_VTY_DEVICE(opaque);



    return VTERM_BUFSIZE - (dev->in - dev->out);

}



static void vty_receive(void *opaque, const uint8_t *buf, int size)

{

    VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque);

    SpaprVioVty *dev = VIO_SPAPR_VTY_DEVICE(opaque);

    int i;



    if ((dev->in == dev->out) && size) {
@@ -51,9 +51,9 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size) 
    }

}



static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max)

static int vty_getchars(SpaprVioDevice *sdev, uint8_t *buf, int max)

{

    VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);

    SpaprVioVty *dev = VIO_SPAPR_VTY_DEVICE(sdev);

    int n = 0;



    while ((n < max) && (dev->out != dev->in)) {
@@ -83,18 +83,18 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) 
    return n;

}



void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len)

void vty_putchars(SpaprVioDevice *sdev, uint8_t *buf, int len)

{

    VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);

    SpaprVioVty *dev = VIO_SPAPR_VTY_DEVICE(sdev);



    /* XXX this blocks entire thread. Rewrite to use

     * qemu_chr_fe_write and background I/O callbacks */

    qemu_chr_fe_write_all(&dev->chardev, buf, len);

}



static void spapr_vty_realize(VIOsPAPRDevice *sdev, Error **errp)

static void spapr_vty_realize(SpaprVioDevice *sdev, Error **errp)

{

    VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);

    SpaprVioVty *dev = VIO_SPAPR_VTY_DEVICE(sdev);



    if (!qemu_chr_fe_backend_connected(&dev->chardev)) {

        error_setg(errp, "chardev property not set");
@@ -106,14 +106,14 @@ static void spapr_vty_realize(VIOsPAPRDevice *sdev, Error **errp) 
}



/* Forward declaration */

static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr,

static target_ulong h_put_term_char(PowerPCCPU *cpu, SpaprMachineState *spapr,

                                    target_ulong opcode, target_ulong *args)

{

    target_ulong reg = args[0];

    target_ulong len = args[1];

    target_ulong char0_7 = args[2];

    target_ulong char8_15 = args[3];

    VIOsPAPRDevice *sdev;

    SpaprVioDevice *sdev;

    uint8_t buf[16];



    sdev = vty_lookup(spapr, reg);
@@ -133,14 +133,14 @@ static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    return H_SUCCESS;

}



static target_ulong h_get_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr,

static target_ulong h_get_term_char(PowerPCCPU *cpu, SpaprMachineState *spapr,

                                    target_ulong opcode, target_ulong *args)

{

    target_ulong reg = args[0];

    target_ulong *len = args + 0;

    target_ulong *char0_7 = args + 1;

    target_ulong *char8_15 = args + 2;

    VIOsPAPRDevice *sdev;

    SpaprVioDevice *sdev;

    uint8_t buf[16];



    sdev = vty_lookup(spapr, reg);
@@ -159,7 +159,7 @@ static target_ulong h_get_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    return H_SUCCESS;

}



void spapr_vty_create(VIOsPAPRBus *bus, Chardev *chardev)

void spapr_vty_create(SpaprVioBus *bus, Chardev *chardev)

{

    DeviceState *dev;
@@ -169,8 +169,8 @@ void spapr_vty_create(VIOsPAPRBus *bus, Chardev *chardev) 
}



static Property spapr_vty_properties[] = {

    DEFINE_SPAPR_PROPERTIES(VIOsPAPRVTYDevice, sdev),

    DEFINE_PROP_CHR("chardev", VIOsPAPRVTYDevice, chardev),

    DEFINE_SPAPR_PROPERTIES(SpaprVioVty, sdev),

    DEFINE_PROP_CHR("chardev", SpaprVioVty, chardev),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -179,11 +179,11 @@ static const VMStateDescription vmstate_spapr_vty = { 
    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVTYDevice),

        VMSTATE_SPAPR_VIO(sdev, SpaprVioVty),



        VMSTATE_UINT32(in, VIOsPAPRVTYDevice),

        VMSTATE_UINT32(out, VIOsPAPRVTYDevice),

        VMSTATE_BUFFER(buf, VIOsPAPRVTYDevice),

        VMSTATE_UINT32(in, SpaprVioVty),

        VMSTATE_UINT32(out, SpaprVioVty),

        VMSTATE_BUFFER(buf, SpaprVioVty),

        VMSTATE_END_OF_LIST()

    },

};
@@ -191,7 +191,7 @@ static const VMStateDescription vmstate_spapr_vty = { 
static void spapr_vty_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VIOsPAPRDeviceClass *k = VIO_SPAPR_DEVICE_CLASS(klass);

    SpaprVioDeviceClass *k = VIO_SPAPR_DEVICE_CLASS(klass);



    k->realize = spapr_vty_realize;

    k->dt_name = "vty";
@@ -205,13 +205,13 @@ static void spapr_vty_class_init(ObjectClass *klass, void *data) 
static const TypeInfo spapr_vty_info = {

    .name          = TYPE_VIO_SPAPR_VTY_DEVICE,

    .parent        = TYPE_VIO_SPAPR_DEVICE,

    .instance_size = sizeof(VIOsPAPRVTYDevice),

    .instance_size = sizeof(SpaprVioVty),

    .class_init    = spapr_vty_class_init,

};



VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus)

SpaprVioDevice *spapr_vty_get_default(SpaprVioBus *bus)

{

    VIOsPAPRDevice *sdev, *selected;

    SpaprVioDevice *sdev, *selected;

    BusChild *kid;



    /*
@@ -246,9 +246,9 @@ VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus) 
    return selected;

}



VIOsPAPRDevice *vty_lookup(sPAPRMachineState *spapr, target_ulong reg)

SpaprVioDevice *vty_lookup(SpaprMachineState *spapr, target_ulong reg)

{

    VIOsPAPRDevice *sdev;

    SpaprVioDevice *sdev;



    sdev = spapr_vio_find_by_reg(spapr->vio_bus, reg);

    if (!sdev && reg == 0) {

hw/i2c/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -25,3 +25,7 @@ config BITBANG_I2C 
config IMX_I2C

    bool

    select I2C



config MPC_I2C

    bool

    select I2C

hw/i2c/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o 
common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o

common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o

common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o

common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o

obj-$(CONFIG_OMAP) += omap_i2c.o

obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o