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

spapr: introduce a spapr_irq_init() routine 



Initialize the MSI bitmap from it as this will be necessary for the
sPAPR IRQ backend for XIVE.

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

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ static void spapr_machine_init(MachineState *machine) 
    spapr_set_vsmt_mode(spapr, &error_fatal);



    /* Set up Interrupt Controller before we create the VCPUs */

    smc->irq->init(spapr, &error_fatal);

    spapr_irq_init(spapr, &error_fatal);



    /* Set up containers for ibm,client-architecture-support negotiated options

     */

hw/ppc/spapr_irq.c

+11 −5
Original line number Diff line number Diff line
@@ -97,11 +97,6 @@ static void spapr_irq_init_xics(sPAPRMachineState *spapr, Error **errp) 
    int nr_irqs = smc->irq->nr_irqs;

    Error *local_err = NULL;



    /* Initialize the MSI IRQ allocator. */

    if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {

        spapr_irq_msi_init(spapr, smc->irq->nr_msis);

    }



    if (kvm_enabled()) {

        if (machine_kernel_irqchip_allowed(machine) &&

            !xics_kvm_init(spapr, &local_err)) {
@@ -213,6 +208,17 @@ sPAPRIrq spapr_irq_xics = { 
/*

 * sPAPR IRQ frontend routines for devices

 */

void spapr_irq_init(sPAPRMachineState *spapr, Error **errp)

{

    sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);



    /* Initialize the MSI IRQ allocator. */

    if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {

        spapr_irq_msi_init(spapr, smc->irq->nr_msis);

    }



    smc->irq->init(spapr, errp);

}



int spapr_irq_claim(sPAPRMachineState *spapr, int irq, bool lsi, Error **errp)

{

include/hw/ppc/spapr_irq.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ typedef struct sPAPRIrq { 
extern sPAPRIrq spapr_irq_xics;

extern sPAPRIrq spapr_irq_xics_legacy;



void spapr_irq_init(sPAPRMachineState *spapr, Error **errp);

int spapr_irq_claim(sPAPRMachineState *spapr, int irq, bool lsi, Error **errp);

void spapr_irq_free(sPAPRMachineState *spapr, int irq, int num);

qemu_irq spapr_qirq(sPAPRMachineState *spapr, int irq);