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

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160627' into staging 



ppc patch queue for 2016-06-27

Small queue this time.  Main reason for sending it is the pair of
patches to fix up the new cpu hotplug model used on Power to what
should be an actually usable state.  There's also a small BookE bugfix
and a XICS trivial cleanup.

# gpg: Signature made Mon 27 Jun 2016 06:28:37 BST
# 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: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.7-20160627:
  qapi: keep names in 'CpuInstanceProperties' in sync with struct CPUCore
  qapi: Report support for -device cpu hotplug in query-machines
  ppc/xics: Remove unused xics_set_irq_type()
  target-ppc: ppce500_spin.c uses SPR_PIR, should use SPR_BOOKE_PIR

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4b86bac2 27393c33

hmp.c

+8 −8
Original line number Diff line number Diff line
@@ -2457,17 +2457,17 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) 


        c = l->value->props;

        monitor_printf(mon, "  CPUInstance Properties:\n");

        if (c->has_node) {

            monitor_printf(mon, "    node: \"%" PRIu64 "\"\n", c->node);

        if (c->has_node_id) {

            monitor_printf(mon, "    node-id: \"%" PRIu64 "\"\n", c->node_id);

        }

        if (c->has_socket) {

            monitor_printf(mon, "    socket: \"%" PRIu64 "\"\n", c->socket);

        if (c->has_socket_id) {

            monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", c->socket_id);

        }

        if (c->has_core) {

            monitor_printf(mon, "    core: \"%" PRIu64 "\"\n", c->core);

        if (c->has_core_id) {

            monitor_printf(mon, "    core-id: \"%" PRIu64 "\"\n", c->core_id);

        }

        if (c->has_thread) {

            monitor_printf(mon, "    thread: \"%" PRIu64 "\"\n", c->thread);

        if (c->has_thread_id) {

            monitor_printf(mon, "    thread-id: \"%" PRIu64 "\"\n", c->thread_id);

        }



        l = l->next;

hw/intc/xics.c

+0 −11
Original line number Diff line number Diff line
@@ -694,17 +694,6 @@ static void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) 
        lsi ? XICS_FLAGS_IRQ_LSI : XICS_FLAGS_IRQ_MSI;

}



void xics_set_irq_type(XICSState *icp, int irq, bool lsi)

{

    int src = xics_find_source(icp, irq);

    ICSState *ics;



    assert(src >= 0);



    ics = &icp->ics[src];

    ics_set_irq_type(ics, irq - ics->offset, lsi);

}



#define ICS_IRQ_FREE(ics, srcno)   \

    (!((ics)->irqs[(srcno)].flags & (XICS_FLAGS_IRQ_MASK)))

hw/ppc/ppce500_spin.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void spin_kick(void *data) 
    hwaddr map_start;



    cpu_synchronize_state(cpu);

    stl_p(&curspin->pir, env->spr[SPR_PIR]);

    stl_p(&curspin->pir, env->spr[SPR_BOOKE_PIR]);

    env->nip = ldq_p(&curspin->addr) & (map_size - 1);

    env->gpr[3] = ldq_p(&curspin->r3);

    env->gpr[4] = 0;

hw/ppc/spapr.c

+2 −2
Original line number Diff line number Diff line
@@ -2367,8 +2367,8 @@ static HotpluggableCPUList *spapr_query_hotpluggable_cpus(MachineState *machine) 


        cpu_item->type = spapr_get_cpu_core_type(machine->cpu_model);

        cpu_item->vcpus_count = smp_threads;

        cpu_props->has_core = true;

        cpu_props->core = i * smt;

        cpu_props->has_core_id = true;

        cpu_props->core_id = i * smt;

        /* TODO: add 'has_node/node' here to describe

           to which node core belongs */

include/hw/cpu/core.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ typedef struct CPUCore { 
    int nr_threads;

} CPUCore;



/* Note: topology field names need to be kept in sync with

 * 'CpuInstanceProperties' */



#define CPU_CORE_PROP_CORE_ID "core-id"



#endif