From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, Michael Ellerman <mpe@ellerman.id.au>, Andrew Cooper <amc96@cam.ac.uk>, Juergen Gross <jgross@suse.com>, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [patch 07/10] PCI/MSI: Make free related functions range based Date: Sat, 27 Nov 2021 02:25:08 +0100 (CET) [thread overview] Message-ID: <20211127000918.892733246@linutronix.de> (raw) In-Reply-To: 20211126233124.618283684@linutronix.de In preparation of runtime expandable PCI/MSI-X vectors convert the related free functions to take ranges instead of assuming a zero based vector space. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/pci/msi/irqdomain.c | 5 ++--- drivers/pci/msi/msi.c | 24 ++++++++++++++++-------- drivers/pci/msi/msi.h | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -19,14 +19,13 @@ int pci_msi_setup_msi_irqs(struct pci_de return pci_msi_legacy_setup_msi_irqs(dev, range->ndesc, type); } -void pci_msi_teardown_msi_irqs(struct pci_dev *dev) +void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range) { - struct msi_range range = { .first = 0, .last = UINT_MAX, }; struct irq_domain *domain; domain = dev_get_msi_domain(&dev->dev); if (domain && irq_domain_is_hierarchy(domain)) - msi_domain_free_irqs_descs_locked(domain, &dev->dev, &range); + msi_domain_free_irqs_descs_locked(domain, &dev->dev, range); else pci_msi_legacy_teardown_msi_irqs(dev); } --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -222,9 +222,12 @@ void pci_write_msi_msg(unsigned int irq, } EXPORT_SYMBOL_GPL(pci_write_msi_msg); -static void free_msi_irqs(struct pci_dev *dev) +static void free_msi_irqs(struct pci_dev *dev, struct msi_range *range, bool shutdown) { - pci_msi_teardown_msi_irqs(dev); + pci_msi_teardown_msi_irqs(dev, range); + + if (!shutdown) + return; if (dev->msix_base) { iounmap(dev->msix_base); @@ -443,7 +446,7 @@ static int msi_capability_init(struct pc err: pci_msi_unmask(entry, msi_multi_mask(entry)); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -538,7 +541,7 @@ static void msix_mask_all(void __iomem * static int msix_setup_interrupts(struct pci_dev *dev, void __iomem *base, struct msi_range *range, struct msix_entry *entries, - struct irq_affinity *affd) + struct irq_affinity *affd, bool expand) { struct irq_affinity_desc *masks = NULL; int ret; @@ -566,7 +569,8 @@ static int msix_setup_interrupts(struct goto out_unlock; out_free: - free_msi_irqs(dev); + free_msi_irqs(dev, range, !expand); + out_unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -614,7 +618,7 @@ static int msix_capability_init(struct p /* Ensure that all table entries are masked. */ msix_mask_all(base, tsize); - ret = msix_setup_interrupts(dev, base, &range, entries, affd); + ret = msix_setup_interrupts(dev, base, &range, entries, affd, false); if (ret) goto out_disable; @@ -728,12 +732,14 @@ static void pci_msi_shutdown(struct pci_ void pci_disable_msi(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = 0, }; + if (!pci_msi_enable || !dev || !dev->msi_enabled) return; msi_lock_descs(&dev->dev); pci_msi_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msi); @@ -817,12 +823,14 @@ static void pci_msix_shutdown(struct pci void pci_disable_msix(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = UINT_MAX, }; + if (!pci_msi_enable || !dev || !dev->msix_enabled) return; msi_lock_descs(&dev->dev); pci_msix_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msix); --- a/drivers/pci/msi/msi.h +++ b/drivers/pci/msi/msi.h @@ -6,7 +6,7 @@ #define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) extern int pci_msi_setup_msi_irqs(struct pci_dev *dev, struct msi_range *range, int type); -extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev); +extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range); #ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS extern int pci_msi_legacy_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, Michael Ellerman <mpe@ellerman.id.au>, Andrew Cooper <amc96@cam.ac.uk>, Juergen Gross <jgross@suse.com>, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [patch 07/10] PCI/MSI: Make free related functions range based Date: Sat, 27 Nov 2021 02:24:41 +0100 (CET) [thread overview] Message-ID: <20211127000918.892733246@linutronix.de> (raw) Message-ID: <20211127012441.KfEMiGddy2Xr8sUZ31N6GquAQBdisFepMH5Y1W9BW-s@z> (raw) In-Reply-To: 20211126233124.618283684@linutronix.de In preparation of runtime expandable PCI/MSI-X vectors convert the related free functions to take ranges instead of assuming a zero based vector space. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/pci/msi/irqdomain.c | 5 ++--- drivers/pci/msi/msi.c | 24 ++++++++++++++++-------- drivers/pci/msi/msi.h | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -19,14 +19,13 @@ int pci_msi_setup_msi_irqs(struct pci_de return pci_msi_legacy_setup_msi_irqs(dev, range->ndesc, type); } -void pci_msi_teardown_msi_irqs(struct pci_dev *dev) +void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range) { - struct msi_range range = { .first = 0, .last = UINT_MAX, }; struct irq_domain *domain; domain = dev_get_msi_domain(&dev->dev); if (domain && irq_domain_is_hierarchy(domain)) - msi_domain_free_irqs_descs_locked(domain, &dev->dev, &range); + msi_domain_free_irqs_descs_locked(domain, &dev->dev, range); else pci_msi_legacy_teardown_msi_irqs(dev); } --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -222,9 +222,12 @@ void pci_write_msi_msg(unsigned int irq, } EXPORT_SYMBOL_GPL(pci_write_msi_msg); -static void free_msi_irqs(struct pci_dev *dev) +static void free_msi_irqs(struct pci_dev *dev, struct msi_range *range, bool shutdown) { - pci_msi_teardown_msi_irqs(dev); + pci_msi_teardown_msi_irqs(dev, range); + + if (!shutdown) + return; if (dev->msix_base) { iounmap(dev->msix_base); @@ -443,7 +446,7 @@ static int msi_capability_init(struct pc err: pci_msi_unmask(entry, msi_multi_mask(entry)); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -538,7 +541,7 @@ static void msix_mask_all(void __iomem * static int msix_setup_interrupts(struct pci_dev *dev, void __iomem *base, struct msi_range *range, struct msix_entry *entries, - struct irq_affinity *affd) + struct irq_affinity *affd, bool expand) { struct irq_affinity_desc *masks = NULL; int ret; @@ -566,7 +569,8 @@ static int msix_setup_interrupts(struct goto out_unlock; out_free: - free_msi_irqs(dev); + free_msi_irqs(dev, range, !expand); + out_unlock: msi_unlock_descs(&dev->dev); kfree(masks); @@ -614,7 +618,7 @@ static int msix_capability_init(struct p /* Ensure that all table entries are masked. */ msix_mask_all(base, tsize); - ret = msix_setup_interrupts(dev, base, &range, entries, affd); + ret = msix_setup_interrupts(dev, base, &range, entries, affd, false); if (ret) goto out_disable; @@ -728,12 +732,14 @@ static void pci_msi_shutdown(struct pci_ void pci_disable_msi(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = 0, }; + if (!pci_msi_enable || !dev || !dev->msi_enabled) return; msi_lock_descs(&dev->dev); pci_msi_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msi); @@ -817,12 +823,14 @@ static void pci_msix_shutdown(struct pci void pci_disable_msix(struct pci_dev *dev) { + struct msi_range range = { .first = 0, .last = UINT_MAX, }; + if (!pci_msi_enable || !dev || !dev->msix_enabled) return; msi_lock_descs(&dev->dev); pci_msix_shutdown(dev); - free_msi_irqs(dev); + free_msi_irqs(dev, &range, true); msi_unlock_descs(&dev->dev); } EXPORT_SYMBOL(pci_disable_msix); --- a/drivers/pci/msi/msi.h +++ b/drivers/pci/msi/msi.h @@ -6,7 +6,7 @@ #define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) extern int pci_msi_setup_msi_irqs(struct pci_dev *dev, struct msi_range *range, int type); -extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev); +extern void pci_msi_teardown_msi_irqs(struct pci_dev *dev, struct msi_range *range); #ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS extern int pci_msi_legacy_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
next prev parent reply other threads:[~2021-11-27 1:34 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-27 1:24 [patch 00/10] genirq/msi, PCI/MSI: Support for dynamic MSI-X vector expansion - Part 4 Thomas Gleixner 2021-11-27 1:24 ` [patch 01/10] genirq/msi: Add range argument to alloc/free MSI domain ops Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 02/10] genirq/msi: Add range argument to msi_domain_alloc/free_descs_locked() Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 03/10] genirq/msi: Make MSI descriptor alloc/free ready for range allocations Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-28 15:57 ` Marc Zyngier 2021-11-28 19:17 ` Thomas Gleixner 2021-11-29 17:28 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 05/10] genirq/msi: Add domain info flag MSI_FLAG_CAN_EXPAND Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 06/10] PCI/MSI: Use range in allocation path Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 08/10] PCI/MSI: Provide pci_msi_domain_supports_expand() Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 10/10] x86/apic/msi: Support MSI-X vector expansion Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner 2021-11-27 1:24 ` [patch 00/10] genirq/msi, PCI/MSI: Support for dynamic MSI-X vector expansion - Part 4 Thomas Gleixner 2021-11-27 1:25 ` [patch 04/10] genirq/msi: Prepare MSI domain alloc/free for range irq allocation Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-11-27 1:25 ` Thomas Gleixner [this message] 2021-11-27 1:24 ` [patch 07/10] PCI/MSI: Make free related functions range based Thomas Gleixner 2021-11-27 1:25 ` [patch 09/10] PCI/MSI: Provide pci_msix_expand_vectors[_at]() Thomas Gleixner 2021-11-27 1:24 ` Thomas Gleixner 2021-12-02 1:08 ` Dey, Megha 2021-12-02 10:16 ` Thomas Gleixner 2021-12-02 19:21 ` Raj, Ashok 2021-12-02 20:40 ` Thomas Gleixner 2021-12-03 0:45 ` Raj, Ashok 2021-12-03 12:29 ` Thomas Gleixner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211127000918.892733246@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=amc96@cam.ac.uk \ --cc=ashok.raj@intel.com \ --cc=helgaas@kernel.org \ --cc=jgg@nvidia.com \ --cc=jgross@suse.com \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ --cc=mpe@ellerman.id.au \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).