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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180121' into staging 



ppc patch queue 2018-01-21

This request supersedes the one from 2018-01-19.  The only difference
is that the patch deprecating ppcemb-softmmu, and thereby creating
many annying warnings from make check has been removed.

Highlights are:
  * Significant TCG speedup by optimizing cmp generation
  * Fix a regression caused by recent change to set compat mode on
    hotplugged cpus
  * Cleanup of default configs
  * Some implementation of msgsnd/msgrcv instructions for server chips

# gpg: Signature made Sun 21 Jan 2018 05:30:54 GMT
# gpg:                using RSA key 0x6C38CACA20D9B392
# 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-2.12-20180121:
  target/ppc/spapr_caps: Add macro to generate spapr_caps migration vmstate
  target/ppc: add support for hypervisor doorbells on book3s CPUs
  sii3112: Add explicit type casts to avoid unintended sign extension
  sm501: Add missing break to case
  target-ppc: optimize cmp translation
  spapr: fix device tree properties when using compatibility mode
  spapr: drop duplicate variable in spapr_core_plug()
  target/ppc: msgsnd and msgclr instructions need hypervisor privilege
  target/ppc: fix doorbell and hypervisor doorbell definitions
  hw/ppc/Makefile: Add a way to disable the PPC4xx boards
  default-configs/ppc-softmmu: Restructure the switches according to the machines
  default-configs/ppc64-softmmu: Include 32-bit configs instead of copying them

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6df55517 1f63ebaa

default-configs/ppc-softmmu.mak

+32 −27
Original line number Diff line number Diff line
@@ -3,52 +3,57 @@ 
include pci.mak

include sound.mak

include usb.mak



# For embedded PPCs:

CONFIG_PPC4XX=y

CONFIG_ESCC=y

CONFIG_M48T59=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y

CONFIG_PCKBD=y

CONFIG_FDC=y

CONFIG_I8257=y

CONFIG_I82374=y

CONFIG_OPENPIC=y

CONFIG_PREP_PCI=y

CONFIG_I82378=y

CONFIG_PC87312=y

CONFIG_MACIO=y

CONFIG_SUNGEM=y

CONFIG_PCSPK=y

CONFIG_CS4231A=y

CONFIG_CUDA=y

CONFIG_ADB=y

CONFIG_MAC_NVRAM=y

CONFIG_MAC_DBDMA=y

CONFIG_HEATHROW_PIC=y

CONFIG_GRACKLE_PCI=y

CONFIG_UNIN_PCI=y

CONFIG_DEC_PCI=y

CONFIG_PPCE500_PCI=y

CONFIG_IDE_ISA=y

CONFIG_IDE_CMD646=y

CONFIG_IDE_MACIO=y

CONFIG_NE2000_ISA=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_XILINX_ETHLITE=y

CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))

CONFIG_PLATFORM_BUS=y

CONFIG_ETSEC=y

CONFIG_SM501=y

CONFIG_IDE_SII3112=y



# For Macs

CONFIG_MAC=y

CONFIG_ESCC=y

CONFIG_MACIO=y

CONFIG_SUNGEM=y

CONFIG_CUDA=y

CONFIG_ADB=y

CONFIG_MAC_NVRAM=y

CONFIG_MAC_DBDMA=y

CONFIG_HEATHROW_PIC=y

CONFIG_GRACKLE_PCI=y

CONFIG_UNIN_PCI=y

CONFIG_DEC_PCI=y

CONFIG_IDE_MACIO=y



# For PReP

CONFIG_PREP=y

CONFIG_PREP_PCI=y

CONFIG_SERIAL_ISA=y

CONFIG_MC146818RTC=y

CONFIG_ISA_TESTDEV=y

CONFIG_RS6000_MC=y

CONFIG_PARALLEL=y

CONFIG_I82374=y

CONFIG_I82378=y

CONFIG_I8254=y

CONFIG_PCKBD=y

CONFIG_FDC=y

CONFIG_NE2000_ISA=y

CONFIG_PC87312=y

CONFIG_PCSPK=y

CONFIG_IDE_ISA=y

CONFIG_CS4231A=y

default-configs/ppc64-softmmu.mak

+8 −53
Original line number Diff line number Diff line 
# Default configuration for ppc64-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_PPC4XX=y

CONFIG_VIRTIO_VGA=y

CONFIG_ESCC=y

CONFIG_M48T59=y

# Include all 32-bit boards

include ppc-softmmu.mak



# For PowerNV

CONFIG_POWERNV=y

CONFIG_IPMI=y

CONFIG_IPMI_LOCAL=y

CONFIG_IPMI_EXTERN=y

CONFIG_ISA_IPMI_BT=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y

CONFIG_PCKBD=y

CONFIG_FDC=y

CONFIG_I8257=y

CONFIG_I82374=y

CONFIG_OPENPIC=y

CONFIG_PREP_PCI=y

CONFIG_I82378=y

CONFIG_PC87312=y

CONFIG_MACIO=y

CONFIG_PCSPK=y

CONFIG_CUDA=y

CONFIG_ADB=y

CONFIG_MAC_NVRAM=y

CONFIG_MAC_DBDMA=y

CONFIG_HEATHROW_PIC=y

CONFIG_GRACKLE_PCI=y

CONFIG_UNIN_PCI=y

CONFIG_DEC_PCI=y

CONFIG_PPCE500_PCI=y

CONFIG_IDE_ISA=y

CONFIG_IDE_CMD646=y

CONFIG_IDE_MACIO=y

CONFIG_NE2000_ISA=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_XILINX_ETHLITE=y

CONFIG_PSERIES=y

CONFIG_POWERNV=y

CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))

CONFIG_PLATFORM_BUS=y

CONFIG_ETSEC=y

CONFIG_SM501=y



# For pSeries

CONFIG_PSERIES=y

CONFIG_VIRTIO_VGA=y

CONFIG_XICS=$(CONFIG_PSERIES)

CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)

CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))

# For PReP

CONFIG_SERIAL_ISA=y

CONFIG_MC146818RTC=y

CONFIG_ISA_TESTDEV=y

CONFIG_MEM_HOTPLUG=y
 
CONFIG_RS6000_MC=y

hw/display/sm501.c

+1 −0
Original line number Diff line number Diff line
@@ -797,6 +797,7 @@ static uint64_t sm501_system_config_read(void *opaque, hwaddr addr, 
        break;

    case SM501_COMMAND_LIST_STATUS:

        ret = 0x00180002; /* FIFOs are empty, everything idle */

        break;

    case SM501_IRQ_MASK:

        ret = s->irq_mask;

        break;

hw/ide/sii3112.c

+5 −5
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr addr, 
        val |= (d->regs[0].confstat & (1UL << 11) ? (1 << 4) : 0); /*SATAINT0*/

        val |= (d->regs[1].confstat & (1UL << 11) ? (1 << 6) : 0); /*SATAINT1*/

        val |= (d->i.bmdma[1].status & BM_STATUS_INT ? (1 << 14) : 0);

        val |= d->i.bmdma[0].status << 16;

        val |= d->i.bmdma[1].status << 24;

        val |= (uint32_t)d->i.bmdma[0].status << 16;

        val |= (uint32_t)d->i.bmdma[1].status << 24;

        break;

    case 0x18:

        val = d->i.bmdma[1].cmd;

        val |= (d->regs[1].confstat & (1UL << 11) ? (1 << 4) : 0);

        val |= d->i.bmdma[1].status << 16;

        val |= (uint32_t)d->i.bmdma[1].status << 16;

        break;

    case 0x80 ... 0x87:

        if (size == 1) {
@@ -128,7 +128,7 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr addr, 
        val = (d->i.bus[0].ifs[0].blk) ? 0x113 : 0;

        break;

    case 0x148:

        val = d->regs[0].sien << 16;

        val = (uint32_t)d->regs[0].sien << 16;

        break;

    case 0x180:

        val = d->regs[1].scontrol;
@@ -137,7 +137,7 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr addr, 
        val = (d->i.bus[1].ifs[0].blk) ? 0x113 : 0;

        break;

    case 0x1c8:

        val = d->regs[1].sien << 16;

        val = (uint32_t)d->regs[1].sien << 16;

        break;

    default:

        val = 0;

hw/ppc/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ obj-y += spapr_pci_vfio.o 
endif

obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o

# PowerPC 4xx boards

obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o

obj-y += ppc4xx_pci.o

obj-y += ppc4xx_devs.o ppc405_uc.o

obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o ppc440_bamboo.o

# PReP

obj-$(CONFIG_PREP) += prep.o

obj-$(CONFIG_PREP) += prep_systemio.o