[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v4 10/10] vpci/msix: Add function to clean MSIX resources
When init_msix() fails, it needs to clean all MSIX resources. So, add a new function to do that. Signed-off-by: Jiqian Chen <Jiqian.Chen@xxxxxxx> --- cc: "Roger Pau Monné" <roger.pau@xxxxxxxxxx> --- v3->v4 changes: * Change function name from fini_msix() to cleanup_msix(). * Change to use XFREE to free vpci->msix. * In cleanup function, change the sequence of check and remove action according to init_msix(). v2->v3 changes: * Remove unnecessary clean operations in fini_msix(). v1->v2 changes: new patch. Best regards, Jiqian Chen. --- xen/drivers/vpci/msix.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index f8ce89b8b32f..b80491ed32bf 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -655,6 +655,27 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) return 0; } +static void cleanup_msix(struct pci_dev *pdev) +{ + struct vpci *vpci = pdev->vpci; + unsigned int msix_pos = pdev->msix_pos; + + if ( !msix_pos ) + return; + + vpci_remove_registers(vpci, msix_control_reg(msix_pos), 2); + + if ( !vpci->msix ) + return; + + for ( unsigned int i = 0; i < ARRAY_SIZE(vpci->msix->table); i++ ) + if ( vpci->msix->table[i] ) + iounmap(vpci->msix->table[i]); + + list_del(&vpci->msix->next); + XFREE(vpci->msix); +} + static int cf_check init_msix(struct pci_dev *pdev) { struct domain *d = pdev->domain; @@ -709,7 +730,7 @@ static int cf_check init_msix(struct pci_dev *pdev) return rc; } -REGISTER_VPCI_LEGACY_CAP(PCI_CAP_ID_MSIX, init_msix, NULL); +REGISTER_VPCI_LEGACY_CAP(PCI_CAP_ID_MSIX, init_msix, cleanup_msix); /* * Local variables: -- 2.34.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |