Commit 7ce0f7dc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging 



Patch queue for ppc - 2015-07-07

A few last minute PPC changes for 2.4:

  - spapr: Update SLOF
  - spapr: Fix a few bugs
  - spapr: Preparation for hotplug
  - spapr: Minor code cleanups
  - linux-user: Add mftb handling
  - kvm: Enable hugepage support with memory-backend-file
  - mac99: Remove nonexistent interrupt pin (Mac OS 9 fix)

# gpg: Signature made Tue Jul  7 16:48:41 2015 BST using RSA key ID 03FEDC60
# gpg: Good signature from "Alexander Graf <agraf@suse.de>"
# gpg:                 aka "Alexander Graf <alex@csgraf.de>"

* remotes/agraf/tags/signed-ppc-for-upstream: (30 commits)
  sPAPR: Clear stale MSIx table during EEH reset
  sPAPR: Reenable EEH functionality on reboot
  sPAPR: Don't enable EEH on emulated PCI devices
  spapr-vty: Use TYPE_ definition instead of hardcoding
  spapr_vty: lookup should only return valid VTY objects
  spapr_pci: drop redundant args in spapr_[populate, create]_pci_child_dt
  spapr_pci: populate ibm,loc-code
  spapr_pci: enumerate and add PCI device tree
  xics_kvm: Don't enable KVM_CAP_IRQ_XICS if already enabled
  ppc: Update cpu_model in MachineState
  spapr: Consolidate cpu init code into a routine
  spapr: Reorganize CPU dt generation code
  cpus: Add a macro to walk CPUs in reverse
  spapr: Support ibm, lrdr-capacity device tree property
  spapr: Consider max_cpus during xics initialization
  Revert "hw/ppc/spapr_pci.c: Avoid functions not in glib 2.12 (g_hash_table_iter_*)"
  spapr_iommu: translate sPAPRTCEAccess to IOMMUAccessFlags
  spapr_iommu: drop erroneous check in h_put_tce_indirect()
  spapr_pci: set device node unit address as hex
  spapr_pci: encode class code including Prog IF register
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1a632032 6319b1da

docs/specs/ppc-spapr-hotplug.txt

+18 −0
Original line number Diff line number Diff line
@@ -284,4 +284,22 @@ struct rtas_event_log_v6_hp { 
    } drc;

} QEMU_PACKED;



== ibm,lrdr-capacity ==



ibm,lrdr-capacity is a property in the /rtas device tree node that identifies

the dynamic reconfiguration capabilities of the guest. It consists of a triple

consisting of <phys>, <size> and <maxcpus>.



  <phys>, encoded in BE format represents the maximum address in bytes and

  hence the maximum memory that can be allocated to the guest.



  <size>, encoded in BE format represents the size increments in which

  memory can be hot-plugged to the guest.



  <maxcpus>, a BE-encoded integer, represents the maximum number of

  processors that the guest can have.



pseries guests use this property to note the maximum allowed CPUs for the

guest.



[1] http://thread.gmane.org/gmane.linux.ports.ppc.embedded/75350/focus=106867

hw/char/spapr_vty.c

+8 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void spapr_vty_realize(VIOsPAPRDevice *sdev, Error **errp) 
}



/* Forward declaration */

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

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

                                    target_ulong opcode, target_ulong *args)

{

    target_ulong reg = args[0];
@@ -101,7 +101,7 @@ static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



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

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

                                    target_ulong opcode, target_ulong *args)

{

    target_ulong reg = args[0];
@@ -193,7 +193,7 @@ VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus) 
        DeviceState *iter = kid->child;



        /* Only look at VTY devices */

        if (!object_dynamic_cast(OBJECT(iter), "spapr-vty")) {

        if (!object_dynamic_cast(OBJECT(iter), TYPE_VIO_SPAPR_VTY_DEVICE)) {

            continue;

        }
@@ -214,7 +214,7 @@ VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus) 
    return selected;

}



VIOsPAPRDevice *vty_lookup(sPAPREnvironment *spapr, target_ulong reg)

VIOsPAPRDevice *vty_lookup(sPAPRMachineState *spapr, target_ulong reg)

{

    VIOsPAPRDevice *sdev;
@@ -228,6 +228,10 @@ VIOsPAPRDevice *vty_lookup(sPAPREnvironment *spapr, target_ulong reg) 
        return spapr_vty_get_default(spapr->vio_bus);

    }



    if (!object_dynamic_cast(OBJECT(sdev), TYPE_VIO_SPAPR_VTY_DEVICE)) {

        return NULL;

    }



    return sdev;

}

hw/intc/xics.c

+10 −10
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ void xics_free(XICSState *icp, int irq, int num) 
 * Guest interfaces

 */



static target_ulong h_cppr(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                           target_ulong opcode, target_ulong *args)

{

    CPUState *cs = CPU(cpu);
@@ -816,7 +816,7 @@ static target_ulong h_cppr(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static target_ulong h_ipi(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                          target_ulong opcode, target_ulong *args)

{

    target_ulong server = get_cpu_index_by_dt_id(args[0]);
@@ -830,7 +830,7 @@ static target_ulong h_ipi(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static target_ulong h_xirr(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                           target_ulong opcode, target_ulong *args)

{

    CPUState *cs = CPU(cpu);
@@ -840,7 +840,7 @@ static target_ulong h_xirr(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                             target_ulong opcode, target_ulong *args)

{

    CPUState *cs = CPU(cpu);
@@ -852,7 +852,7 @@ static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static target_ulong h_eoi(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                          target_ulong opcode, target_ulong *args)

{

    CPUState *cs = CPU(cpu);
@@ -862,7 +862,7 @@ static target_ulong h_eoi(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPREnvironment *spapr,

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

                            target_ulong opcode, target_ulong *args)

{

    CPUState *cs = CPU(cpu);
@@ -874,7 +874,7 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    return H_SUCCESS;

}



static void rtas_set_xive(PowerPCCPU *cpu, sPAPREnvironment *spapr,

static void rtas_set_xive(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                          uint32_t token,

                          uint32_t nargs, target_ulong args,

                          uint32_t nret, target_ulong rets)
@@ -902,7 +902,7 @@ static void rtas_set_xive(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

}



static void rtas_get_xive(PowerPCCPU *cpu, sPAPREnvironment *spapr,

static void rtas_get_xive(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                          uint32_t token,

                          uint32_t nargs, target_ulong args,

                          uint32_t nret, target_ulong rets)
@@ -927,7 +927,7 @@ static void rtas_get_xive(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    rtas_st(rets, 2, ics->irqs[nr - ics->offset].priority);

}



static void rtas_int_off(PowerPCCPU *cpu, sPAPREnvironment *spapr,

static void rtas_int_off(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                         uint32_t token,

                         uint32_t nargs, target_ulong args,

                         uint32_t nret, target_ulong rets)
@@ -953,7 +953,7 @@ static void rtas_int_off(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

}



static void rtas_int_on(PowerPCCPU *cpu, sPAPREnvironment *spapr,

static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                        uint32_t token,

                        uint32_t nargs, target_ulong args,

                        uint32_t nret, target_ulong rets)

hw/intc/xics_kvm.c

+11 −1
Original line number Diff line number Diff line
@@ -331,6 +331,15 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) 
        abort();

    }



    /*

     * If we are reusing a parked vCPU fd corresponding to the CPU

     * which was hot-removed earlier we don't have to renable

     * KVM_CAP_IRQ_XICS capability again.

     */

    if (ss->cap_irq_xics_enabled) {

        return;

    }



    if (icpkvm->kernel_xics_fd != -1) {

        int ret;
@@ -343,6 +352,7 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) 
                    kvm_arch_vcpu_id(cs), strerror(errno));

            exit(1);

        }

        ss->cap_irq_xics_enabled = true;

    }

}
@@ -368,7 +378,7 @@ static void xics_kvm_set_nr_servers(XICSState *icp, uint32_t nr_servers, 
    }

}



static void rtas_dummy(PowerPCCPU *cpu, sPAPREnvironment *spapr,

static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr,

                       uint32_t token,

                       uint32_t nargs, target_ulong args,

                       uint32_t nret, target_ulong rets)

hw/misc/macio/macio.c

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ static void macio_common_realize(PCIDevice *d, Error **errp) 
    SysBusDevice *sysbus_dev;

    Error *err = NULL;



    d->config[0x3d] = 0x01; // interrupt on pin 1



    object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);