Re: [Xen-devel] [PATCH 05/10] vpci/msi: add teardown cleanup

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Fri, Jun 29, 2018 at 11:52:49AM +0100, Wei Liu wrote:
> On Wed, Jun 20, 2018 at 04:42:29PM +0200, Roger Pau Monne wrote:
> > So that interrupts are properly freed.
> > 
> > Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> > ---
> > Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> > Cc: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
> > Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> > Cc: Jan Beulich <jbeulich@xxxxxxxx>
> > Cc: Julien Grall <julien.grall@xxxxxxx>
> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> > Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> > Cc: Tim Deegan <tim@xxxxxxx>
> > Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> > ---
> >  xen/drivers/vpci/msi.c | 23 ++++++++++++++++++++++-
> >  1 file changed, 22 insertions(+), 1 deletion(-)
> > 
> > diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c
> > index 5bb505c864..e8cd1238df 100644
> > --- a/xen/drivers/vpci/msi.c
> > +++ b/xen/drivers/vpci/msi.c
> > @@ -266,7 +266,28 @@ static int init_msi(struct pci_dev *pdev)
> >  
> >      return 0;
> >  }
> > -REGISTER_VPCI_INIT(init_msi, NULL, VPCI_PRIORITY_LOW);
> > +
> > +static void teardown_msi(struct pci_dev *pdev)
> > +{
> > +    unsigned int pos = pci_find_cap_offset(pdev->seg, pdev->bus,
> > +                                           PCI_SLOT(pdev->devfn),
> > +                                           PCI_FUNC(pdev->devfn),
> > +                                           PCI_CAP_ID_MSI);
> > +    struct vpci_msi *msi = pdev->vpci->msi;
> > +    uint16_t control;
> > +
> > +    if ( !msi || !msi->enabled )
> > +        return;
> > +
> > +    control = pci_conf_read16(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn),
> > +                              PCI_FUNC(pdev->devfn), msi_control_reg(pos));
> > +    pci_conf_write16(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn),
> > +                     PCI_FUNC(pdev->devfn), msi_control_reg(pos),
> > +                     (control & ~PCI_MSI_FLAGS_ENABLE));
> > +
> > +    vpci_msi_arch_disable(msi, pdev);
> 
> Missing xfree(msi)?

It's done in vpci_remove_device, but as said in the previous patch I
can move it here since it will be clearer.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel