Commit 6449da45 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc/xics: move InterruptStatsProvider to the sPAPR machine 



It provides a better monitor output of the ICP and ICS objects, else
the objects are printed out of order.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent a7ff1212

hw/intc/xics.c

+2 −18
Original line number Diff line number Diff line
@@ -93,10 +93,8 @@ void xics_cpu_setup(XICSFabric *xi, PowerPCCPU *cpu) 
    }

}



static void icp_pic_print_info(InterruptStatsProvider *obj,

                           Monitor *mon)

void icp_pic_print_info(ICPState *icp, Monitor *mon)

{

    ICPState *icp = ICP(obj);

    int cpu_index = icp->cs ? icp->cs->cpu_index : -1;



    if (!icp->output) {
@@ -107,10 +105,8 @@ static void icp_pic_print_info(InterruptStatsProvider *obj, 
                   icp->pending_priority, icp->mfrr);

}



static void ics_simple_pic_print_info(InterruptStatsProvider *obj,

                                      Monitor *mon)

void ics_pic_print_info(ICSState *ics, Monitor *mon)

{

    ICSState *ics = ICS_SIMPLE(obj);

    uint32_t i;



    monitor_printf(mon, "ICS %4x..%4x %p\n",
@@ -369,12 +365,10 @@ static void icp_realize(DeviceState *dev, Error **errp) 
static void icp_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    InterruptStatsProviderClass *ic = INTERRUPT_STATS_PROVIDER_CLASS(klass);



    dc->reset = icp_reset;

    dc->vmsd = &vmstate_icp_server;

    dc->realize = icp_realize;

    ic->print_info = icp_pic_print_info;

}



static const TypeInfo icp_info = {
@@ -383,10 +377,6 @@ static const TypeInfo icp_info = { 
    .instance_size = sizeof(ICPState),

    .class_init = icp_class_init,

    .class_size = sizeof(ICPStateClass),

    .interfaces = (InterfaceInfo[]) {

        { TYPE_INTERRUPT_STATS_PROVIDER },

        { }

    },

};



/*
@@ -632,7 +622,6 @@ static void ics_simple_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *dc = DEVICE_CLASS(klass);

    ICSStateClass *isc = ICS_BASE_CLASS(klass);

    InterruptStatsProviderClass *ic = INTERRUPT_STATS_PROVIDER_CLASS(klass);



    isc->realize = ics_simple_realize;

    dc->props = ics_simple_properties;
@@ -641,7 +630,6 @@ static void ics_simple_class_init(ObjectClass *klass, void *data) 
    isc->reject = ics_simple_reject;

    isc->resend = ics_simple_resend;

    isc->eoi = ics_simple_eoi;

    ic->print_info = ics_simple_pic_print_info;

}



static const TypeInfo ics_simple_info = {
@@ -651,10 +639,6 @@ static const TypeInfo ics_simple_info = { 
    .class_init = ics_simple_class_init,

    .class_size = sizeof(ICSStateClass),

    .instance_init = ics_simple_initfn,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_INTERRUPT_STATS_PROVIDER },

        { }

    },

};



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

hw/ppc/spapr.c

+17 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "qemu/error-report.h"

#include "trace.h"

#include "hw/nmi.h"

#include "hw/intc/intc.h"



#include "hw/compat.h"

#include "qemu/cutils.h"
@@ -2988,6 +2989,19 @@ static ICPState *spapr_icp_get(XICSFabric *xi, int server) 
    return (server < spapr->nr_servers) ? &spapr->icps[server] : NULL;

}



static void spapr_pic_print_info(InterruptStatsProvider *obj,

                                 Monitor *mon)

{

    sPAPRMachineState *spapr = SPAPR_MACHINE(obj);

    int i;



    for (i = 0; i < spapr->nr_servers; i++) {

        icp_pic_print_info(&spapr->icps[i], mon);

    }



    ics_pic_print_info(spapr->ics, mon);

}



static void spapr_machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);
@@ -2997,6 +3011,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);

    PPCVirtualHypervisorClass *vhc = PPC_VIRTUAL_HYPERVISOR_CLASS(oc);

    XICSFabricClass *xic = XICS_FABRIC_CLASS(oc);

    InterruptStatsProviderClass *ispc = INTERRUPT_STATS_PROVIDER_CLASS(oc);



    mc->desc = "pSeries Logical Partition (PAPR compliant)";
@@ -3037,6 +3052,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    xic->ics_get = spapr_ics_get;

    xic->ics_resend = spapr_ics_resend;

    xic->icp_get = spapr_icp_get;

    ispc->print_info = spapr_pic_print_info;

}



static const TypeInfo spapr_machine_info = {
@@ -3054,6 +3070,7 @@ static const TypeInfo spapr_machine_info = { 
        { TYPE_HOTPLUG_HANDLER },

        { TYPE_PPC_VIRTUAL_HYPERVISOR },

        { TYPE_XICS_FABRIC },

        { TYPE_INTERRUPT_STATS_PROVIDER },

        { }

    },

};

include/hw/ppc/xics.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ void ics_simple_write_xive(ICSState *ics, int nr, int server, 
                           uint8_t priority, uint8_t saved_priority);



void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);

void icp_pic_print_info(ICPState *icp, Monitor *mon);

void ics_pic_print_info(ICSState *ics, Monitor *mon);



void ics_resend(ICSState *ics);

void icp_resend(ICPState *ss);