lkml.org 
[lkml]   [2021]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: irq/msi] PCI/MSI: Let core code free MSI descriptors
    The following commit has been merged into the irq/msi branch of tip:

    Commit-ID: 9fb9eb4b59acc607e978288c96ac7efa917153d4
    Gitweb: https://git.kernel.org/tip/9fb9eb4b59acc607e978288c96ac7efa917153d4
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Mon, 06 Dec 2021 23:51:16 +01:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Thu, 16 Dec 2021 22:22:17 +01:00

    PCI/MSI: Let core code free MSI descriptors

    Set the domain info flag which tells the core code to free the MSI
    descriptors from msi_domain_free_irqs() and add an explicit call to the
    core function into the legacy code.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Michael Kelley <mikelley@microsoft.com>
    Tested-by: Nishanth Menon <nm@ti.com>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    Link: https://lore.kernel.org/r/20211206210748.089085131@linutronix.de

    ---
    drivers/pci/msi/irqdomain.c | 3 ++-
    drivers/pci/msi/legacy.c | 1 +
    drivers/pci/msi/msi.c | 14 --------------
    3 files changed, 3 insertions(+), 15 deletions(-)

    diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c
    index c81793a..3aab617 100644
    --- a/drivers/pci/msi/irqdomain.c
    +++ b/drivers/pci/msi/irqdomain.c
    @@ -171,7 +171,8 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,
    if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)
    pci_msi_domain_update_chip_ops(info);

    - info->flags |= MSI_FLAG_ACTIVATE_EARLY | MSI_FLAG_DEV_SYSFS;
    + info->flags |= MSI_FLAG_ACTIVATE_EARLY | MSI_FLAG_DEV_SYSFS |
    + MSI_FLAG_FREE_MSI_DESCS;
    if (IS_ENABLED(CONFIG_GENERIC_IRQ_RESERVATION_MODE))
    info->flags |= MSI_FLAG_MUST_REACTIVATE;

    diff --git a/drivers/pci/msi/legacy.c b/drivers/pci/msi/legacy.c
    index 773f351..91c20a3 100644
    --- a/drivers/pci/msi/legacy.c
    +++ b/drivers/pci/msi/legacy.c
    @@ -80,4 +80,5 @@ void pci_msi_legacy_teardown_msi_irqs(struct pci_dev *dev)
    {
    msi_device_destroy_sysfs(&dev->dev);
    arch_teardown_msi_irqs(dev);
    + msi_free_msi_descs(&dev->dev);
    }
    diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
    index 4ee47ee..95db9c3 100644
    --- a/drivers/pci/msi/msi.c
    +++ b/drivers/pci/msi/msi.c
    @@ -224,22 +224,8 @@ EXPORT_SYMBOL_GPL(pci_write_msi_msg);

    static void free_msi_irqs(struct pci_dev *dev)
    {
    - struct list_head *msi_list = dev_to_msi_list(&dev->dev);
    - struct msi_desc *entry, *tmp;
    - int i;
    -
    - for_each_pci_msi_entry(entry, dev)
    - if (entry->irq)
    - for (i = 0; i < entry->nvec_used; i++)
    - BUG_ON(irq_has_action(entry->irq + i));
    -
    pci_msi_teardown_msi_irqs(dev);

    - list_for_each_entry_safe(entry, tmp, msi_list, list) {
    - list_del(&entry->list);
    - free_msi_entry(entry);
    - }
    -
    if (dev->msix_base) {
    iounmap(dev->msix_base);
    dev->msix_base = NULL;
    \
     
     \ /
      Last update: 2021-12-16 22:42    [W:4.801 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site