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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200317' into staging 



ppc patch queue 2020-03-17

Here's my final pull request for the qemu-5.0 soft freeze.  Sorry this
is just under the wire - I hit some last minute problems that took a
while to fix up and retest.

Highlights are:
 * Numerous fixes for the FWNMI feature
 * A handful of cleanups to the device tree construction code
 * Numerous fixes for the spapr-vscsi device
 * A number of fixes and cleanups for real mode (MMU off) softmmu
   handling
 * Fixes for handling of the PAPR RMA
 * Better handling of hotplug/unplug events during boot
 * Assorted other fixes

# gpg: Signature made Tue 17 Mar 2020 09:55:07 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-5.0-20200317: (45 commits)
  pseries: Update SLOF firmware image
  ppc/spapr: Ignore common "ibm,nmi-interlock" Linux bug
  ppc/spapr: Implement FWNMI System Reset delivery
  target/ppc: allow ppc_cpu_do_system_reset to take an alternate vector
  ppc/spapr: Allow FWNMI on TCG
  ppc/spapr: Fix FWNMI machine check interrupt delivery
  ppc/spapr: Add FWNMI System Reset state
  ppc/spapr: Change FWNMI names
  ppc/spapr: Fix FWNMI machine check failure handling
  spapr: Rename DT functions to newer naming convention
  spapr: Move creation of ibm,architecture-vec-5 property
  spapr: Move creation of ibm,dynamic-reconfiguration-memory dt node
  spapr/rtas: Reserve space for RTAS blob and log
  pseries: Update SLOF firmware image
  ppc/spapr: Move GPRs setup to one place
  target/ppc: Fix rlwinm on ppc64
  spapr/xive: use SPAPR_IRQ_IPI to define IPI ranges exposed to the guest
  hw/scsi/spapr_vscsi: Convert debug fprintf() to trace event
  hw/scsi/spapr_vscsi: Prevent buffer overflow
  hw/scsi/spapr_vscsi: Do not mix SRP IU size with DMA buffer size
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d649689a 6961eae7

docs/system/deprecated.rst

+7 −0
Original line number Diff line number Diff line
@@ -289,6 +289,13 @@ The RISC-V no MMU cpus have been depcreated. The two CPUs: ``rv32imacu-nommu`` a 
``rv64imacu-nommu`` should no longer be used. Instead the MMU status can be specified

via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` CPUs.



``compat`` property of server class POWER CPUs (since 5.0)

''''''''''''''''''''''''''''''''''''''''''''''''''''''''''



The ``compat`` property used to set backwards compatibility modes for

the processor has been deprecated. The ``max-cpu-compat`` property of

the ``pseries`` machine type should be used instead.



System emulator devices

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

hw/intc/spapr_xive.c

+2 −2
Original line number Diff line number Diff line
@@ -677,8 +677,8 @@ static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_servers, 
    uint64_t timas[2 * 2];

    /* Interrupt number ranges for the IPIs */

    uint32_t lisn_ranges[] = {

        cpu_to_be32(0),

        cpu_to_be32(nr_servers),

        cpu_to_be32(SPAPR_IRQ_IPI),

        cpu_to_be32(SPAPR_IRQ_IPI + nr_servers),

    };

    /*

     * EQ size - the sizes of pages supported by the system 4K, 64K,

hw/ppc/pnv_lpc.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp) 
    bool hostboot_mode = !!pnv->fw_load_addr;



    /* let isa_bus_new() create its own bridge on SysBus otherwise

     * devices speficied on the command line won't find the bus and

     * devices specified on the command line won't find the bus and

     * will fail to create.

     */

    isa_bus = isa_bus_new(NULL, &lpc->isa_mem, &lpc->isa_io, &local_err);

hw/ppc/spapr.c

+509 −471

File changed.

Preview size limit exceeded, changes collapsed.

hw/ppc/spapr_caps.c

+8 −11
Original line number Diff line number Diff line
@@ -509,17 +509,14 @@ static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val, 
    }

}



static void cap_fwnmi_mce_apply(SpaprMachineState *spapr, uint8_t val,

static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val,

                                Error **errp)

{

    if (!val) {

        return; /* Disabled by default */

    }



    if (tcg_enabled()) {

        warn_report("Firmware Assisted Non-Maskable Interrupts(FWNMI) not "

                    "supported in TCG");

    } else if (kvm_enabled()) {

    if (kvm_enabled()) {

        if (kvmppc_set_fwnmi() < 0) {

            error_setg(errp, "Firmware Assisted Non-Maskable Interrupts(FWNMI) "

                             "not supported by KVM");
@@ -626,14 +623,14 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { 
        .type = "bool",

        .apply = cap_ccf_assist_apply,

    },

    [SPAPR_CAP_FWNMI_MCE] = {

        .name = "fwnmi-mce",

        .description = "Handle fwnmi machine check exceptions",

        .index = SPAPR_CAP_FWNMI_MCE,

    [SPAPR_CAP_FWNMI] = {

        .name = "fwnmi",

        .description = "Implements PAPR FWNMI option",

        .index = SPAPR_CAP_FWNMI,

        .get = spapr_cap_get_bool,

        .set = spapr_cap_set_bool,

        .type = "bool",

        .apply = cap_fwnmi_mce_apply,

        .apply = cap_fwnmi_apply,

    },

};
@@ -774,7 +771,7 @@ SPAPR_CAP_MIG_STATE(hpt_maxpagesize, SPAPR_CAP_HPT_MAXPAGESIZE); 
SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);

SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER);

SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST);

SPAPR_CAP_MIG_STATE(fwnmi, SPAPR_CAP_FWNMI_MCE);

SPAPR_CAP_MIG_STATE(fwnmi, SPAPR_CAP_FWNMI);



void spapr_caps_init(SpaprMachineState *spapr)

{