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

spapr_pci: add an extra 'nr_msis' argument to spapr_populate_pci_dt 



So that we don't have to call qdev_get_machine() to get the machine
class and the sPAPRIrq backend holding the number of MSIs.

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

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, 
    }



    QLIST_FOREACH(phb, &spapr->phbs, list) {

        ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);

        ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt, smc->irq->nr_msis);

        if (ret < 0) {

            error_report("couldn't setup PCI devices in fdt");

            exit(1);

hw/ppc/spapr_pci.c

+3 −6
Original line number Diff line number Diff line
@@ -2069,9 +2069,8 @@ static void spapr_phb_pci_enumerate(sPAPRPHBState *phb) 


}



int spapr_populate_pci_dt(sPAPRPHBState *phb,

                          uint32_t xics_phandle,

                          void *fdt)

int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t xics_phandle, void *fdt,

                          uint32_t nr_msis)

{

    int bus_off, i, j, ret;

    gchar *nodename;
@@ -2121,7 +2120,6 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, 
    sPAPRTCETable *tcet;

    PCIBus *bus = PCI_HOST_BRIDGE(phb)->bus;

    sPAPRFDT s_fdt;

    sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(qdev_get_machine());



    /* Start populating the FDT */

    nodename = g_strdup_printf("pci@%" PRIx64, phb->buid);
@@ -2139,8 +2137,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, 
    _FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof_ranges));

    _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg)));

    _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1));

    _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi",

                          smc->irq->nr_msis));

    _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", nr_msis));



    /* Dynamic DMA window */

    if (phb->ddw_enabled) {

include/hw/pci-host/spapr.h

+2 −3
Original line number Diff line number Diff line
@@ -113,9 +113,8 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin) 


PCIHostState *spapr_create_phb(sPAPRMachineState *spapr, int index);



int spapr_populate_pci_dt(sPAPRPHBState *phb,

                          uint32_t xics_phandle,

                          void *fdt);

int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t xics_phandle, void *fdt,

                          uint32_t nr_msis);



void spapr_pci_rtas_init(void);