Commit 078eb6b0 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr/pci: Consolidate de-allocation of MSIs 



When freeing MSIs, we need to:
- remove them from the machine's MSI bitmap
- remove them from the IC backend
- remove them from the PHB's MSI cache

This is currently open coded in two places in rtas_ibm_change_msi(),
and we're about to need this in spapr_phb_reset() as well. Instead of
duplicating this code again, make it a destroy function for the PHB's
MSI cache. Removing an MSI device from the cache will call the destroy
function internally.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <156415227855.1064338.5657793835271464648.stgit@bahia.lan>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 1e8f51e8

hw/ppc/spapr_pci.c

+15 −9
Original line number Diff line number Diff line
@@ -338,10 +338,6 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, SpaprMachineState *spapr, 
            return;

        }



        if (!smc->legacy_irq_allocation) {

            spapr_irq_msi_free(spapr, msi->first_irq, msi->num);

        }

        spapr_irq_free(spapr, msi->first_irq, msi->num);

        if (msi_present(pdev)) {

            spapr_msi_setmsg(pdev, 0, false, 0, 0);

        }
@@ -411,10 +407,6 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, SpaprMachineState *spapr, 


    /* Release previous MSIs */

    if (msi) {

        if (!smc->legacy_irq_allocation) {

            spapr_irq_msi_free(spapr, msi->first_irq, msi->num);

        }

        spapr_irq_free(spapr, msi->first_irq, msi->num);

        g_hash_table_remove(phb->msi, &config_addr);

    }
@@ -1808,6 +1800,19 @@ static void spapr_phb_unrealize(DeviceState *dev, Error **errp) 
    memory_region_del_subregion(get_system_memory(), &sphb->mem32window);

}



static void spapr_phb_destroy_msi(gpointer opaque)

{

    SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

    SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);

    spapr_pci_msi *msi = opaque;



    if (!smc->legacy_irq_allocation) {

        spapr_irq_msi_free(spapr, msi->first_irq, msi->num);

    }

    spapr_irq_free(spapr, msi->first_irq, msi->num);

    g_free(msi);

}



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

{

    /* We don't use SPAPR_MACHINE() in order to exit gracefully if the user
@@ -2019,7 +2024,8 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) 
                                    spapr_tce_get_iommu(tcet));

    }



    sphb->msi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);

    sphb->msi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free,

                                      spapr_phb_destroy_msi);

    return;



unrealize: