Commit cc706a53 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by David Gibson
Browse files

ppc/xics: Make the ICSState a list 



Instead of an array of fixed sized blocks, use a list, as we will need
to have sources with variable number of interrupts. SPAPR only uses
a single entry. Native will create more. If performance becomes an
issue we can add some hashed lookup but for now this will do fine.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
[ move the initialization of list to xics_common_initfn,
  restore xirr_owner after migration and move restoring to
  icp_post_load]
Signed-off-by: default avatarNikunj A Dadhania <nikunj@linux.vnet.ibm.com>
[ clg: removed the icp_post_load() changes from nikunj patchset v3:
       http://patchwork.ozlabs.org/patch/646008/

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

hw/intc/trace-events

+3 −2
Original line number Diff line number Diff line
@@ -56,10 +56,11 @@ xics_set_irq_lsi(int srcno, int nr) "set_irq_lsi: srcno %d [irq %#x]" 
xics_ics_write_xive(int nr, int srcno, int server, uint8_t priority) "ics_write_xive: irq %#x [src %d] server %#x prio %#x"

xics_ics_reject(int nr, int srcno) "reject irq %#x [src %d]"

xics_ics_eoi(int nr) "ics_eoi: irq %#x"

xics_alloc(int src, int irq) "source#%d, irq %d"

xics_alloc_block(int src, int first, int num, bool lsi, int align) "source#%d, first irq %d, %d irqs, lsi=%d, alignnum %d"

xics_alloc(int irq) "irq %d"

xics_alloc_block(int first, int num, bool lsi, int align) "first irq %d, %d irqs, lsi=%d, alignnum %d"

xics_ics_free(int src, int irq, int num) "Source#%d, first irq %d, %d irqs"

xics_ics_free_warn(int src, int irq) "Source#%d, irq %d is already free"

xics_icp_post_load(uint32_t server_no, uint32_t xirr, uint64_t addr, uint8_t pend) "server_no %d, xirr %#x, xirr_owner 0x%" PRIx64 ", pending %d"



# hw/intc/s390_flic_kvm.c

flic_create_device(int err) "flic: create device failed %d"

hw/intc/xics.c

+49 −34
Original line number Diff line number Diff line
@@ -96,13 +96,16 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu) 
static void xics_common_reset(DeviceState *d)

{

    XICSState *xics = XICS_COMMON(d);

    ICSState *ics;

    int i;



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

        device_reset(DEVICE(&xics->ss[i]));

    }



    device_reset(DEVICE(xics->ics));

    QLIST_FOREACH(ics, &xics->ics, list) {

        device_reset(DEVICE(ics));

    }

}



static void xics_prop_get_nr_irqs(Object *obj, Visitor *v, const char *name,
@@ -134,7 +137,6 @@ static void xics_prop_set_nr_irqs(Object *obj, Visitor *v, const char *name, 
    }



    assert(info->set_nr_irqs);

    assert(xics->ics);

    info->set_nr_irqs(xics, value, errp);

}
@@ -174,6 +176,9 @@ static void xics_prop_set_nr_servers(Object *obj, Visitor *v, 


static void xics_common_initfn(Object *obj)

{

    XICSState *xics = XICS_COMMON(obj);



    QLIST_INIT(&xics->ics);

    object_property_add(obj, "nr_irqs", "int",

                        xics_prop_get_nr_irqs, xics_prop_set_nr_irqs,

                        NULL, NULL, NULL);
@@ -212,33 +217,35 @@ static void ics_reject(ICSState *ics, int nr); 
static void ics_resend(ICSState *ics);

static void ics_eoi(ICSState *ics, int nr);



static void icp_check_ipi(XICSState *xics, int server)

static void icp_check_ipi(ICPState *ss)

{

    ICPState *ss = xics->ss + server;



    if (XISR(ss) && (ss->pending_priority <= ss->mfrr)) {

        return;

    }



    trace_xics_icp_check_ipi(server, ss->mfrr);

    trace_xics_icp_check_ipi(ss->cs->cpu_index, ss->mfrr);



    if (XISR(ss)) {

        ics_reject(xics->ics, XISR(ss));

    if (XISR(ss) && ss->xirr_owner) {

        ics_reject(ss->xirr_owner, XISR(ss));

    }



    ss->xirr = (ss->xirr & ~XISR_MASK) | XICS_IPI;

    ss->pending_priority = ss->mfrr;

    ss->xirr_owner = NULL;

    qemu_irq_raise(ss->output);

}



static void icp_resend(XICSState *xics, int server)

{

    ICPState *ss = xics->ss + server;

    ICSState *ics;



    if (ss->mfrr < CPPR(ss)) {

        icp_check_ipi(xics, server);

        icp_check_ipi(ss);

    }

    QLIST_FOREACH(ics, &xics->ics, list) {

        ics_resend(ics);

    }

    ics_resend(xics->ics);

}



void icp_set_cppr(XICSState *xics, int server, uint8_t cppr)
@@ -256,7 +263,10 @@ void icp_set_cppr(XICSState *xics, int server, uint8_t cppr) 
            ss->xirr &= ~XISR_MASK; /* Clear XISR */

            ss->pending_priority = 0xff;

            qemu_irq_lower(ss->output);

            ics_reject(xics->ics, old_xisr);

            if (ss->xirr_owner) {

                ics_reject(ss->xirr_owner, old_xisr);

                ss->xirr_owner = NULL;

            }

        }

    } else {

        if (!XISR(ss)) {
@@ -271,7 +281,7 @@ void icp_set_mfrr(XICSState *xics, int server, uint8_t mfrr) 


    ss->mfrr = mfrr;

    if (mfrr < CPPR(ss)) {

        icp_check_ipi(xics, server);

        icp_check_ipi(ss);

    }

}
@@ -282,6 +292,7 @@ uint32_t icp_accept(ICPState *ss) 
    qemu_irq_lower(ss->output);

    ss->xirr = ss->pending_priority << 24;

    ss->pending_priority = 0xff;

    ss->xirr_owner = NULL;



    trace_xics_icp_accept(xirr, ss->xirr);
@@ -299,30 +310,40 @@ uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) 
void icp_eoi(XICSState *xics, int server, uint32_t xirr)

{

    ICPState *ss = xics->ss + server;

    ICSState *ics;

    uint32_t irq;



    /* Send EOI -> ICS */

    ss->xirr = (ss->xirr & ~CPPR_MASK) | (xirr & CPPR_MASK);

    trace_xics_icp_eoi(server, xirr, ss->xirr);

    ics_eoi(xics->ics, xirr & XISR_MASK);

    irq = xirr & XISR_MASK;

    QLIST_FOREACH(ics, &xics->ics, list) {

        if (ics_valid_irq(ics, irq)) {

            ics_eoi(ics, irq);

        }

    }

    if (!XISR(ss)) {

        icp_resend(xics, server);

    }

}



static void icp_irq(XICSState *xics, int server, int nr, uint8_t priority)

static void icp_irq(ICSState *ics, int server, int nr, uint8_t priority)

{

    XICSState *xics = ics->xics;

    ICPState *ss = xics->ss + server;



    trace_xics_icp_irq(server, nr, priority);



    if ((priority >= CPPR(ss))

        || (XISR(ss) && (ss->pending_priority <= priority))) {

        ics_reject(xics->ics, nr);

        ics_reject(ics, nr);

    } else {

        if (XISR(ss)) {

            ics_reject(xics->ics, XISR(ss));

        if (XISR(ss) && ss->xirr_owner) {

            ics_reject(ss->xirr_owner, XISR(ss));

            ss->xirr_owner = NULL;

        }

        ss->xirr = (ss->xirr & ~XISR_MASK) | (nr & XISR_MASK);

        ss->xirr_owner = ics;

        ss->pending_priority = priority;

        trace_xics_icp_raise(ss->xirr, ss->pending_priority);

        qemu_irq_raise(ss->output);
@@ -405,8 +426,7 @@ static void resend_msi(ICSState *ics, int srcno) 
    if (irq->status & XICS_STATUS_REJECTED) {

        irq->status &= ~XICS_STATUS_REJECTED;

        if (irq->priority != 0xff) {

            icp_irq(ics->xics, irq->server, srcno + ics->offset,

                    irq->priority);

            icp_irq(ics, irq->server, srcno + ics->offset, irq->priority);

        }

    }

}
@@ -419,7 +439,7 @@ static void resend_lsi(ICSState *ics, int srcno) 
        && (irq->status & XICS_STATUS_ASSERTED)

        && !(irq->status & XICS_STATUS_SENT)) {

        irq->status |= XICS_STATUS_SENT;

        icp_irq(ics->xics, irq->server, srcno + ics->offset, irq->priority);

        icp_irq(ics, irq->server, srcno + ics->offset, irq->priority);

    }

}
@@ -434,7 +454,7 @@ static void set_irq_msi(ICSState *ics, int srcno, int val) 
            irq->status |= XICS_STATUS_MASKED_PENDING;

            trace_xics_masked_pending();

        } else  {

            icp_irq(ics->xics, irq->server, srcno + ics->offset, irq->priority);

            icp_irq(ics, irq->server, srcno + ics->offset, irq->priority);

        }

    }

}
@@ -473,7 +493,7 @@ static void write_xive_msi(ICSState *ics, int srcno) 
    }



    irq->status &= ~XICS_STATUS_MASKED_PENDING;

    icp_irq(ics->xics, irq->server, srcno + ics->offset, irq->priority);

    icp_irq(ics, irq->server, srcno + ics->offset, irq->priority);

}



static void write_xive_lsi(ICSState *ics, int srcno)
@@ -662,28 +682,23 @@ static const TypeInfo ics_info = { 
/*

 * Exported functions

 */

int xics_find_source(XICSState *xics, int irq)

ICSState *xics_find_source(XICSState *xics, int irq)

{

    int sources = 1;

    int src;

    ICSState *ics;



    /* FIXME: implement multiple sources */

    for (src = 0; src < sources; ++src) {

        ICSState *ics = &xics->ics[src];

    QLIST_FOREACH(ics, &xics->ics, list) {

        if (ics_valid_irq(ics, irq)) {

            return src;

            return ics;

        }

    }



    return -1;

    return NULL;

}



qemu_irq xics_get_qirq(XICSState *xics, int irq)

{

    int src = xics_find_source(xics, irq);

    ICSState *ics = xics_find_source(xics, irq);



    if (src >= 0) {

        ICSState *ics = &xics->ics[src];

    if (ics) {

        return ics->qirqs[irq - ics->offset];

    }

hw/intc/xics_kvm.c

+19 −8
Original line number Diff line number Diff line
@@ -361,7 +361,13 @@ static void xics_kvm_cpu_setup(XICSState *xics, PowerPCCPU *cpu) 
static void xics_kvm_set_nr_irqs(XICSState *xics, uint32_t nr_irqs,

                                 Error **errp)

{

    xics->nr_irqs = xics->ics->nr_irqs = nr_irqs;

    ICSState *ics = QLIST_FIRST(&xics->ics);



    /* This needs to be deprecated ... */

    xics->nr_irqs = nr_irqs;

    if (ics) {

        ics->nr_irqs = nr_irqs;

    }

}



static void xics_kvm_set_nr_servers(XICSState *xics, uint32_t nr_servers,
@@ -394,6 +400,7 @@ static void xics_kvm_realize(DeviceState *dev, Error **errp) 
{

    KVMXICSState *xicskvm = XICS_SPAPR_KVM(dev);

    XICSState *xics = XICS_COMMON(dev);

    ICSState *ics;

    int i, rc;

    Error *error = NULL;

    struct kvm_create_device xics_create_device = {
@@ -445,11 +452,13 @@ static void xics_kvm_realize(DeviceState *dev, Error **errp) 


    xicskvm->kernel_xics_fd = xics_create_device.fd;



    object_property_set_bool(OBJECT(xics->ics), true, "realized", &error);

    QLIST_FOREACH(ics, &xics->ics, list) {

        object_property_set_bool(OBJECT(ics), true, "realized", &error);

        if (error) {

            error_propagate(errp, error);

            goto fail;

        }

    }



    assert(xics->nr_servers);

    for (i = 0; i < xics->nr_servers; i++) {
@@ -477,10 +486,12 @@ fail: 
static void xics_kvm_initfn(Object *obj)

{

    XICSState *xics = XICS_COMMON(obj);

    ICSState *ics;



    xics->ics = ICS(object_new(TYPE_KVM_ICS));

    object_property_add_child(obj, "ics", OBJECT(xics->ics), NULL);

    xics->ics->xics = xics;

    ics = ICS(object_new(TYPE_KVM_ICS));

    object_property_add_child(obj, "ics", OBJECT(ics), NULL);

    ics->xics = xics;

    QLIST_INSERT_HEAD(&xics->ics, ics, list);

}



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

hw/intc/xics_spapr.c

+57 −31
Original line number Diff line number Diff line
@@ -113,13 +113,17 @@ static void rtas_set_xive(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
                          uint32_t nargs, target_ulong args,

                          uint32_t nret, target_ulong rets)

{

    ICSState *ics = spapr->xics->ics;

    ICSState *ics = QLIST_FIRST(&spapr->xics->ics);

    uint32_t nr, server, priority;



    if ((nargs != 3) || (nret != 1)) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }

    if (!ics) {

        rtas_st(rets, 0, RTAS_OUT_HW_ERROR);

        return;

    }



    nr = rtas_ld(args, 0);

    server = xics_get_cpu_index_by_dt_id(rtas_ld(args, 1));
@@ -141,13 +145,17 @@ static void rtas_get_xive(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
                          uint32_t nargs, target_ulong args,

                          uint32_t nret, target_ulong rets)

{

    ICSState *ics = spapr->xics->ics;

    ICSState *ics = QLIST_FIRST(&spapr->xics->ics);

    uint32_t nr;



    if ((nargs != 1) || (nret != 3)) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }

    if (!ics) {

        rtas_st(rets, 0, RTAS_OUT_HW_ERROR);

        return;

    }



    nr = rtas_ld(args, 0);
@@ -166,13 +174,17 @@ static void rtas_int_off(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
                         uint32_t nargs, target_ulong args,

                         uint32_t nret, target_ulong rets)

{

    ICSState *ics = spapr->xics->ics;

    ICSState *ics = QLIST_FIRST(&spapr->xics->ics);

    uint32_t nr;



    if ((nargs != 1) || (nret != 1)) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }

    if (!ics) {

        rtas_st(rets, 0, RTAS_OUT_HW_ERROR);

        return;

    }



    nr = rtas_ld(args, 0);
@@ -192,13 +204,17 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
                        uint32_t nargs, target_ulong args,

                        uint32_t nret, target_ulong rets)

{

    ICSState *ics = spapr->xics->ics;

    ICSState *ics = QLIST_FIRST(&spapr->xics->ics);

    uint32_t nr;



    if ((nargs != 1) || (nret != 1)) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }

    if (!ics) {

        rtas_st(rets, 0, RTAS_OUT_HW_ERROR);

        return;

    }



    nr = rtas_ld(args, 0);
@@ -217,7 +233,13 @@ static void rtas_int_on(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
static void xics_spapr_set_nr_irqs(XICSState *xics, uint32_t nr_irqs,

                                   Error **errp)

{

    xics->nr_irqs = xics->ics->nr_irqs = nr_irqs;

    ICSState *ics = QLIST_FIRST(&xics->ics);



    /* This needs to be deprecated ... */

    xics->nr_irqs = nr_irqs;

    if (ics) {

        ics->nr_irqs = nr_irqs;

    }

}



static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers,
@@ -240,6 +262,7 @@ static void xics_spapr_set_nr_servers(XICSState *xics, uint32_t nr_servers, 
static void xics_spapr_realize(DeviceState *dev, Error **errp)

{

    XICSState *xics = XICS_SPAPR(dev);

    ICSState *ics;

    Error *error = NULL;

    int i;
@@ -261,11 +284,13 @@ static void xics_spapr_realize(DeviceState *dev, Error **errp) 
    spapr_register_hypercall(H_EOI, h_eoi);

    spapr_register_hypercall(H_IPOLL, h_ipoll);



    object_property_set_bool(OBJECT(xics->ics), true, "realized", &error);

    QLIST_FOREACH(ics, &xics->ics, list) {

        object_property_set_bool(OBJECT(ics), true, "realized", &error);

        if (error) {

            error_propagate(errp, error);

            return;

        }

    }



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

        object_property_set_bool(OBJECT(&xics->ss[i]), true, "realized",
@@ -280,10 +305,12 @@ static void xics_spapr_realize(DeviceState *dev, Error **errp) 
static void xics_spapr_initfn(Object *obj)

{

    XICSState *xics = XICS_SPAPR(obj);

    ICSState *ics;



    xics->ics = ICS(object_new(TYPE_ICS));

    object_property_add_child(obj, "ics", OBJECT(xics->ics), NULL);

    xics->ics->xics = xics;

    ics = ICS(object_new(TYPE_ICS));

    object_property_add_child(obj, "ics", OBJECT(ics), NULL);

    ics->xics = xics;

    QLIST_INSERT_HEAD(&xics->ics, ics, list);

}



static void xics_spapr_class_init(ObjectClass *oc, void *data)
@@ -329,14 +356,15 @@ static int ics_find_free_block(ICSState *ics, int num, int alignnum) 
    return -1;

}



int xics_spapr_alloc(XICSState *xics, int src, int irq_hint, bool lsi,

                     Error **errp)

int xics_spapr_alloc(XICSState *xics, int irq_hint, bool lsi, Error **errp)

{

    ICSState *ics = &xics->ics[src];

    ICSState *ics = QLIST_FIRST(&xics->ics);

    int irq;



    if (!ics) {

        return -1;

    }

    if (irq_hint) {

        assert(src == xics_find_source(xics, irq_hint));

        if (!ICS_IRQ_FREE(ics, irq_hint - ics->offset)) {

            error_setg(errp, "can't allocate IRQ %d: already in use", irq_hint);

            return -1;
@@ -352,7 +380,7 @@ int xics_spapr_alloc(XICSState *xics, int src, int irq_hint, bool lsi, 
    }



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

    trace_xics_alloc(src, irq);

    trace_xics_alloc(irq);



    return irq;

}
@@ -361,13 +389,16 @@ int xics_spapr_alloc(XICSState *xics, int src, int irq_hint, bool lsi, 
 * Allocate block of consecutive IRQs, and return the number of the first IRQ in

 * the block. If align==true, aligns the first IRQ number to num.

 */

int xics_spapr_alloc_block(XICSState *xics, int src, int num, bool lsi,

                           bool align, Error **errp)

int xics_spapr_alloc_block(XICSState *xics, int num, bool lsi, bool align,

                           Error **errp)

{

    ICSState *ics = QLIST_FIRST(&xics->ics);

    int i, first = -1;

    ICSState *ics = &xics->ics[src];



    assert(src == 0);

    if (!ics) {

        return -1;

    }



    /*

     * MSIMesage::data is used for storing VIRQ so

     * it has to be aligned to num to support multiple
@@ -394,7 +425,7 @@ int xics_spapr_alloc_block(XICSState *xics, int src, int num, bool lsi, 
    }

    first += ics->offset;



    trace_xics_alloc_block(src, first, num, lsi, align);

    trace_xics_alloc_block(first, num, lsi, align);



    return first;

}
@@ -405,7 +436,7 @@ static void ics_free(ICSState *ics, int srcno, int num) 


    for (i = srcno; i < srcno + num; ++i) {

        if (ICS_IRQ_FREE(ics, i)) {

            trace_xics_ics_free_warn(ics - ics->xics->ics, i + ics->offset);

            trace_xics_ics_free_warn(0, i + ics->offset);

        }

        memset(&ics->irqs[i], 0, sizeof(ICSIRQState));

    }
@@ -413,15 +444,10 @@ static void ics_free(ICSState *ics, int srcno, int num) 


void xics_spapr_free(XICSState *xics, int irq, int num)

{

    int src = xics_find_source(xics, irq);



    if (src >= 0) {

        ICSState *ics = &xics->ics[src];



        /* FIXME: implement multiple sources */

        assert(src == 0);

    ICSState *ics = xics_find_source(xics, irq);



        trace_xics_ics_free(ics - xics->ics, irq, num);

    if (ics) {

        trace_xics_ics_free(0, irq, num);

        ics_free(ics, irq - ics->offset, num);

    }

}

hw/ppc/spapr_events.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ out_no_events: 
void spapr_events_init(sPAPRMachineState *spapr)

{

    QTAILQ_INIT(&spapr->pending_events);

    spapr->check_exception_irq = xics_spapr_alloc(spapr->xics, 0, 0, false,

    spapr->check_exception_irq = xics_spapr_alloc(spapr->xics, 0, false,

                                            &error_fatal);

    spapr->epow_notifier.notify = spapr_powerdown_req;

    qemu_register_powerdown_notifier(&spapr->epow_notifier);