Commit 7360be89 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.1-20181108' into staging 



ppc patch queue 2018-11-08

Here's another patch of accumulated ppc patches for qemu-3.1.
Highlights are:
  * Support for nested HV KVM on POWER9 hosts
  * Remove Alex Graf as ppc maintainer
  * Emulation of external PID instructions

# gpg: Signature made Thu 08 Nov 2018 12:14:27 GMT
# gpg:                using RSA key 6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-3.1-20181108: (22 commits)
  ppc/spapr_caps: Add SPAPR_CAP_NESTED_KVM_HV
  target/ppc: Add one reg id for ptcr
  This patch fixes processing of rfi instructions in icount mode.
  hw/ppc/ppc440_uc: Remove dead code in sdram_size()
  MAINTAINERS: PPC: Remove myself
  ppc/pnv: check size before data buffer access
  target/ppc: fix mtmsr instruction for icount
  hw/ppc/mac_newworld: Free openpic_irqs array after use
  macio/pmu: Fix missing vmsd terminator
  spapr_pci: convert g_malloc() to g_new()
  target/ppc: Split out float_invalid_cvt
  target/ppc: Split out float_invalid_op_div
  target/ppc: Split out float_invalid_op_mul
  target/ppc: Split out float_invalid_op_addsub
  target/ppc: Introduce fp number classification
  target/ppc: Remove float_check_status
  target/ppc: Split up float_invalid_op_excp
  hw/ppc/spapr_rng: Introduce CONFIG_SPAPR_RNG switch for spapr_rng.c
  PPC: e500: convert SysBus init method to a realize method
  ppc4xx_pci: convert SysBus init method to a realize method
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0b570077 b9a477b7

MAINTAINERS

+14 −16
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ F: tests/tcg/openrisc/ 


PowerPC

M: David Gibson <david@gibson.dropbear.id.au>

M: Alexander Graf <agraf@suse.de>

L: qemu-ppc@nongnu.org

S: Maintained

F: target/ppc/
@@ -341,7 +340,7 @@ S: Maintained 
F: target/mips/kvm.c



PPC

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

S: Maintained

F: target/ppc/kvm.c
@@ -779,21 +778,21 @@ F: hw/openrisc/openrisc_sim.c 
PowerPC Machines

----------------

405

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/ppc405_boards.c



Bamboo

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/ppc440_bamboo.c



e500

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Supported

S: Odd Fixes

F: hw/ppc/e500.[hc]

F: hw/ppc/e500plat.c

F: include/hw/ppc/ppc_e500.h
@@ -801,16 +800,16 @@ F: include/hw/pci-host/ppce500.h 
F: pc-bios/u-boot.e500



mpc8544ds

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Supported

S: Odd Fixes

F: hw/ppc/mpc8544ds.c

F: hw/ppc/mpc8544_guts.c



New World

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Maintained

S: Odd Fixes

F: hw/ppc/mac_newworld.c

F: hw/pci-host/uninorth.c

F: hw/pci-bridge/dec.[hc]
@@ -822,9 +821,9 @@ F: include/hw/misc/mos6522.h 
F: include/hw/ppc/mac_dbdma.h



Old World

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Maintained

S: Odd Fixes

F: hw/ppc/mac_oldworld.c

F: hw/pci-host/grackle.c

F: hw/misc/macio/
@@ -849,7 +848,6 @@ F: pc-bios/ppc_rom.bin 


sPAPR

M: David Gibson <david@gibson.dropbear.id.au>

M: Alexander Graf <agraf@suse.de>

L: qemu-ppc@nongnu.org

S: Supported

F: hw/*/spapr*
@@ -1124,7 +1122,7 @@ F: tests/acpi-test-data/* 
F: tests/acpi-test-data/*/*



ppc4xx

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Odd Fixes

F: hw/ppc/ppc4*.c
@@ -1133,9 +1131,9 @@ F: include/hw/ppc/ppc4xx.h 
F: include/hw/i2c/ppc4xx_i2c.h



ppce500

M: Alexander Graf <agraf@suse.de>

M: David Gibson <david@gibson.dropbear.id.au>

L: qemu-ppc@nongnu.org

S: Supported

S: Odd Fixes

F: hw/ppc/e500*

F: hw/pci-host/ppce500.c

F: hw/net/fsl_etsec/

default-configs/ppc64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ CONFIG_XICS_SPAPR=$(CONFIG_PSERIES) 
CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))

CONFIG_MEM_DEVICE=y

CONFIG_DIMM=y

CONFIG_SPAPR_RNG=y

hw/misc/macio/pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { 
        VMSTATE_TIMER_PTR(adb_poll_timer, PMUState),

        VMSTATE_UINT8(adb_reply_size, PMUState),

        VMSTATE_BUFFER(adb_reply, PMUState),

        VMSTATE_END_OF_LIST()

    }

};

hw/pci-host/ppce500.c

+6 −8
Original line number Diff line number Diff line
@@ -436,8 +436,9 @@ static AddressSpace *e500_pcihost_set_iommu(PCIBus *bus, void *opaque, 
    return &s->bm_as;

}



static int e500_pcihost_initfn(SysBusDevice *dev)

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

{

    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

    PCIHostState *h;

    PPCE500PCIState *s;

    PCIBus *b;
@@ -447,7 +448,7 @@ static int e500_pcihost_initfn(SysBusDevice *dev) 
    s = PPC_E500_PCI_HOST_BRIDGE(dev);



    for (i = 0; i < ARRAY_SIZE(s->irq); i++) {

        sysbus_init_irq(dev, &s->irq[i]);

        sysbus_init_irq(sbd, &s->irq[i]);

    }



    for (i = 0; i < PCI_NUM_PINS; i++) {
@@ -460,7 +461,7 @@ static int e500_pcihost_initfn(SysBusDevice *dev) 
    /* PIO lives at the bottom of our bus space */

    memory_region_add_subregion_overlap(&s->busmem, 0, &s->pio, -2);



    b = pci_register_root_bus(DEVICE(dev), NULL, mpc85xx_pci_set_irq,

    b = pci_register_root_bus(dev, NULL, mpc85xx_pci_set_irq,

                              mpc85xx_pci_map_irq, s, &s->busmem, &s->pio,

                              PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS);

    h->bus = b;
@@ -483,10 +484,8 @@ static int e500_pcihost_initfn(SysBusDevice *dev) 
    memory_region_add_subregion(&s->container, PCIE500_CFGADDR, &h->conf_mem);

    memory_region_add_subregion(&s->container, PCIE500_CFGDATA, &h->data_mem);

    memory_region_add_subregion(&s->container, PCIE500_REG_BASE, &s->iomem);

    sysbus_init_mmio(dev, &s->container);

    sysbus_init_mmio(sbd, &s->container);

    pci_bus_set_route_irq_fn(b, e500_route_intx_pin_to_irq);



    return 0;

}



static void e500_host_bridge_class_init(ObjectClass *klass, void *data)
@@ -526,9 +525,8 @@ static Property pcihost_properties[] = { 
static void e500_pcihost_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = e500_pcihost_initfn;

    dc->realize = e500_pcihost_realize;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

    dc->props = pcihost_properties;

    dc->vmsd = &vmstate_ppce500_pci;

hw/ppc/Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ obj-y += ppc.o ppc_booke.o fdt.o 
# IBM pSeries (sPAPR)

obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o

obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o

obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o spapr_rng.o

obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o

obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o

obj-$(CONFIG_SPAPR_RNG) +=  spapr_rng.o

# IBM PowerNV

obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o

ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy)